2 files changed, 10 insertions, 10 deletions
diff --git a/openecomp-be/tools/install/database/schemaTemplates/composition/component.ftl b/openecomp-be/tools/install/database/schemaTemplates/composition/component.ftl
index e2953b83d0..1c0cb4eb8a 100644
--- a/openecomp-be/tools/install/database/schemaTemplates/composition/component.ftl
+++ b/openecomp-be/tools/install/database/schemaTemplates/composition/component.ftl
@@ -16,16 +16,7 @@
       ],
       "default": "${component.displayName}"</#if>
     },
-    "vfcCode": {
-      "type": "string"
-    },
-"nfcCode": {
-"type": "string"
-},
-"nfcFunction": {
-"type": "string"
-},
-"description": {
+    "description": {
       "type": "string"
     }
   },
diff --git a/openecomp-be/tools/install/database/schemaTemplates/questionnaire/component.ftl b/openecomp-be/tools/install/database/schemaTemplates/questionnaire/component.ftl
index 6b00c37061..f99d7fa9e0 100644
--- a/openecomp-be/tools/install/database/schemaTemplates/questionnaire/component.ftl
+++ b/openecomp-be/tools/install/database/schemaTemplates/questionnaire/component.ftl
@@ -5,6 +5,15 @@
     "general": {
       "type": "object",
       "properties": {
+        <#if !manual>
+        "nfcNamingCode": {
+          "type": "string",
+          "maxLength": 1000<#if componentDisplayName??>,
+          "default": "${componentDisplayName}"</#if>
+        },</#if>
+        "nfcFunction": {
+          "type": "string"
+        },
         "hypervisor": {
           "type": "object",
           "properties": {