diff --git a/app/components/component-xpub-formbuilder/CHANGELOG.md b/app/components/component-formbuilder/CHANGELOG.md
similarity index 100%
rename from app/components/component-xpub-formbuilder/CHANGELOG.md
rename to app/components/component-formbuilder/CHANGELOG.md
diff --git a/app/components/component-xpub-formbuilder/README.md b/app/components/component-formbuilder/README.md
similarity index 100%
rename from app/components/component-xpub-formbuilder/README.md
rename to app/components/component-formbuilder/README.md
diff --git a/app/components/component-xpub-formbuilder/package.json b/app/components/component-formbuilder/package.json
similarity index 100%
rename from app/components/component-xpub-formbuilder/package.json
rename to app/components/component-formbuilder/package.json
diff --git a/app/components/component-xpub-formbuilder/src/components/ComponentProperties.jsx b/app/components/component-formbuilder/src/components/ComponentProperties.jsx
similarity index 100%
rename from app/components/component-xpub-formbuilder/src/components/ComponentProperties.jsx
rename to app/components/component-formbuilder/src/components/ComponentProperties.jsx
diff --git a/app/components/component-xpub-formbuilder/src/components/FormBuilder.jsx b/app/components/component-formbuilder/src/components/FormBuilder.jsx
similarity index 100%
rename from app/components/component-xpub-formbuilder/src/components/FormBuilder.jsx
rename to app/components/component-formbuilder/src/components/FormBuilder.jsx
diff --git a/app/components/component-xpub-formbuilder/src/components/FormBuilderLayout.jsx b/app/components/component-formbuilder/src/components/FormBuilderLayout.jsx
similarity index 100%
rename from app/components/component-xpub-formbuilder/src/components/FormBuilderLayout.jsx
rename to app/components/component-formbuilder/src/components/FormBuilderLayout.jsx
diff --git a/app/components/component-xpub-formbuilder/src/components/FormBuilderLayout.md b/app/components/component-formbuilder/src/components/FormBuilderLayout.md
similarity index 100%
rename from app/components/component-xpub-formbuilder/src/components/FormBuilderLayout.md
rename to app/components/component-formbuilder/src/components/FormBuilderLayout.md
diff --git a/app/components/component-xpub-formbuilder/src/components/FormBuilderPage.js b/app/components/component-formbuilder/src/components/FormBuilderPage.js
similarity index 100%
rename from app/components/component-xpub-formbuilder/src/components/FormBuilderPage.js
rename to app/components/component-formbuilder/src/components/FormBuilderPage.js
diff --git a/app/components/component-xpub-formbuilder/src/components/FormProperties.jsx b/app/components/component-formbuilder/src/components/FormProperties.jsx
similarity index 100%
rename from app/components/component-xpub-formbuilder/src/components/FormProperties.jsx
rename to app/components/component-formbuilder/src/components/FormProperties.jsx
diff --git a/app/components/component-xpub-formbuilder/src/components/atoms/Columns.js b/app/components/component-formbuilder/src/components/atoms/Columns.js
similarity index 100%
rename from app/components/component-xpub-formbuilder/src/components/atoms/Columns.js
rename to app/components/component-formbuilder/src/components/atoms/Columns.js
diff --git a/app/components/component-xpub-formbuilder/src/components/builderComponents/AbstractField.js b/app/components/component-formbuilder/src/components/builderComponents/AbstractField.js
similarity index 100%
rename from app/components/component-xpub-formbuilder/src/components/builderComponents/AbstractField.js
rename to app/components/component-formbuilder/src/components/builderComponents/AbstractField.js
diff --git a/app/components/component-xpub-formbuilder/src/components/builderComponents/CheckBox.js b/app/components/component-formbuilder/src/components/builderComponents/CheckBox.js
similarity index 100%
rename from app/components/component-xpub-formbuilder/src/components/builderComponents/CheckBox.js
rename to app/components/component-formbuilder/src/components/builderComponents/CheckBox.js
diff --git a/app/components/component-xpub-formbuilder/src/components/builderComponents/Menu.js b/app/components/component-formbuilder/src/components/builderComponents/Menu.js
similarity index 100%
rename from app/components/component-xpub-formbuilder/src/components/builderComponents/Menu.js
rename to app/components/component-formbuilder/src/components/builderComponents/Menu.js
diff --git a/app/components/component-xpub-formbuilder/src/components/builderComponents/OptionsField.js b/app/components/component-formbuilder/src/components/builderComponents/OptionsField.js
similarity index 100%
rename from app/components/component-xpub-formbuilder/src/components/builderComponents/OptionsField.js
rename to app/components/component-formbuilder/src/components/builderComponents/OptionsField.js
diff --git a/app/components/component-xpub-formbuilder/src/components/builderComponents/RadioBox.js b/app/components/component-formbuilder/src/components/builderComponents/RadioBox.js
similarity index 100%
rename from app/components/component-xpub-formbuilder/src/components/builderComponents/RadioBox.js
rename to app/components/component-formbuilder/src/components/builderComponents/RadioBox.js
diff --git a/app/components/component-xpub-formbuilder/src/components/builderComponents/TextArea.js b/app/components/component-formbuilder/src/components/builderComponents/TextArea.js
similarity index 100%
rename from app/components/component-xpub-formbuilder/src/components/builderComponents/TextArea.js
rename to app/components/component-formbuilder/src/components/builderComponents/TextArea.js
diff --git a/app/components/component-xpub-formbuilder/src/components/builderComponents/TextField.js b/app/components/component-formbuilder/src/components/builderComponents/TextField.js
similarity index 100%
rename from app/components/component-xpub-formbuilder/src/components/builderComponents/TextField.js
rename to app/components/component-formbuilder/src/components/builderComponents/TextField.js
diff --git a/app/components/component-xpub-formbuilder/src/components/builderComponents/index.js b/app/components/component-formbuilder/src/components/builderComponents/index.js
similarity index 100%
rename from app/components/component-xpub-formbuilder/src/components/builderComponents/index.js
rename to app/components/component-formbuilder/src/components/builderComponents/index.js
diff --git a/app/components/component-xpub-formbuilder/src/components/config/Elements.js b/app/components/component-formbuilder/src/components/config/Elements.js
similarity index 92%
rename from app/components/component-xpub-formbuilder/src/components/config/Elements.js
rename to app/components/component-formbuilder/src/components/config/Elements.js
index 33f7ee7b331c0c1472873d00013738053183f3c1..90e59aaf1d13e4fe59f466c688a8803a2cad66a2 100644
--- a/app/components/component-xpub-formbuilder/src/components/config/Elements.js
+++ b/app/components/component-formbuilder/src/components/config/Elements.js
@@ -77,6 +77,7 @@ const elements = {
     title: textfield,
     name: textfield,
     description: editorfield,
+    shortDescription: textfield,
     order: orderfield,
     validate,
   },
@@ -85,6 +86,7 @@ const elements = {
     title: textfield,
     name: textfield,
     order: orderfield,
+    shortDescription: textfield,
     validate,
   },
   AbstractEditor: {
@@ -95,6 +97,7 @@ const elements = {
     description: editorfield,
     order: orderfield,
     validate,
+    shortDescription: textfield,
   },
   TextField: {
     id: textfield,
@@ -102,6 +105,7 @@ const elements = {
     name: textfield,
     placeholder: textfield,
     description: editorfield,
+    shortDescription: textfield,
     order: orderfield,
     validate,
     parse: {
@@ -144,6 +148,7 @@ const elements = {
     description: editorfield,
     options: optionfield,
     order: orderfield,
+    shortDescription: textfield,
     validate,
   },
   Menu: {
@@ -154,6 +159,7 @@ const elements = {
     description: editorfield,
     options: optionfield,
     order: orderfield,
+    shortDescription: textfield,
     validate,
   },
   RadioGroup: {
@@ -165,6 +171,7 @@ const elements = {
     order: orderfield,
     inline: radiofield,
     sectioncss: textarea,
+    shortDescription: textfield,
     validate,
   },
 }
diff --git a/app/components/component-xpub-formbuilder/src/components/index.js b/app/components/component-formbuilder/src/components/index.js
similarity index 100%
rename from app/components/component-xpub-formbuilder/src/components/index.js
rename to app/components/component-formbuilder/src/components/index.js
diff --git a/app/components/component-xpub-formbuilder/src/components/molecules/Page.js b/app/components/component-formbuilder/src/components/molecules/Page.js
similarity index 100%
rename from app/components/component-xpub-formbuilder/src/components/molecules/Page.js
rename to app/components/component-formbuilder/src/components/molecules/Page.js
diff --git a/app/components/component-xpub-formbuilder/src/components/styles/index.js b/app/components/component-formbuilder/src/components/styles/index.js
similarity index 100%
rename from app/components/component-xpub-formbuilder/src/components/styles/index.js
rename to app/components/component-formbuilder/src/components/styles/index.js
diff --git a/app/components/component-xpub-formbuilder/src/index.js b/app/components/component-formbuilder/src/index.js
similarity index 100%
rename from app/components/component-xpub-formbuilder/src/index.js
rename to app/components/component-formbuilder/src/index.js
diff --git a/app/components/component-xpub-formbuilder/src/redux/FormBuilder.js b/app/components/component-formbuilder/src/redux/FormBuilder.js
similarity index 100%
rename from app/components/component-xpub-formbuilder/src/redux/FormBuilder.js
rename to app/components/component-formbuilder/src/redux/FormBuilder.js
diff --git a/app/components/component-xpub-formbuilder/src/server/formRequestBackend.js b/app/components/component-formbuilder/src/server/formRequestBackend.js
similarity index 100%
rename from app/components/component-xpub-formbuilder/src/server/formRequestBackend.js
rename to app/components/component-formbuilder/src/server/formRequestBackend.js
diff --git a/app/components/component-xpub-formbuilder/src/server/util.js b/app/components/component-formbuilder/src/server/util.js
similarity index 100%
rename from app/components/component-xpub-formbuilder/src/server/util.js
rename to app/components/component-formbuilder/src/server/util.js
diff --git a/app/components/component-xpub-formbuilder/src/test/FormBuilder.test.js b/app/components/component-formbuilder/src/test/FormBuilder.test.js
similarity index 100%
rename from app/components/component-xpub-formbuilder/src/test/FormBuilder.test.js
rename to app/components/component-formbuilder/src/test/FormBuilder.test.js
diff --git a/app/components/component-xpub-formbuilder/src/test/FormBuilderLayout.test.js b/app/components/component-formbuilder/src/test/FormBuilderLayout.test.js
similarity index 100%
rename from app/components/component-xpub-formbuilder/src/test/FormBuilderLayout.test.js
rename to app/components/component-formbuilder/src/test/FormBuilderLayout.test.js
diff --git a/app/components/component-xpub-formbuilder/src/test/FormBuilderPage.integration.test.js b/app/components/component-formbuilder/src/test/FormBuilderPage.integration.test.js
similarity index 100%
rename from app/components/component-xpub-formbuilder/src/test/FormBuilderPage.integration.test.js
rename to app/components/component-formbuilder/src/test/FormBuilderPage.integration.test.js
diff --git a/app/components/component-xpub-formbuilder/src/test/config/noforms.json b/app/components/component-formbuilder/src/test/config/noforms.json
similarity index 100%
rename from app/components/component-xpub-formbuilder/src/test/config/noforms.json
rename to app/components/component-formbuilder/src/test/config/noforms.json
diff --git a/app/components/component-xpub-formbuilder/src/test/config/test.json b/app/components/component-formbuilder/src/test/config/test.json
similarity index 100%
rename from app/components/component-xpub-formbuilder/src/test/config/test.json
rename to app/components/component-formbuilder/src/test/config/test.json
diff --git a/app/components/component-xpub-formbuilder/src/test/config/testnoelements.json b/app/components/component-formbuilder/src/test/config/testnoelements.json
similarity index 100%
rename from app/components/component-xpub-formbuilder/src/test/config/testnoelements.json
rename to app/components/component-formbuilder/src/test/config/testnoelements.json
diff --git a/app/components/component-xpub-formbuilder/src/test/util.js b/app/components/component-formbuilder/src/test/util.js
similarity index 100%
rename from app/components/component-xpub-formbuilder/src/test/util.js
rename to app/components/component-formbuilder/src/test/util.js