diff --git a/packages/strapi-plugin-content-type-builder/admin/src/containers/App/actions.js b/packages/strapi-plugin-content-type-builder/admin/src/containers/App/actions.js
index a9018edcbb..3065067174 100644
--- a/packages/strapi-plugin-content-type-builder/admin/src/containers/App/actions.js
+++ b/packages/strapi-plugin-content-type-builder/admin/src/containers/App/actions.js
@@ -138,7 +138,7 @@ export function getDataSucceeded({ allModels, models }, connections) {
 }
 
 export function onChangeExistingContentTypeMainInfos({ target }) {
-  const value = target.name === 'name' ? camelCase(target.value.trim()).toLowerCase() : target.value.trim();
+  const value = target.name === 'name' ? camelCase(target.value.trim()).toLowerCase() : target.value;
 
   return {
     type: ON_CHANGE_EXISTING_CONTENT_TYPE_MAIN_INFOS,
@@ -148,7 +148,7 @@ export function onChangeExistingContentTypeMainInfos({ target }) {
 }
 
 export function onChangeNewContentTypeMainInfos({ target }) {
-  const value = target.name === 'name' ? camelCase(target.value.trim()).toLowerCase() : target.value.trim();
+  const value = target.name === 'name' ? camelCase(target.value.trim()).toLowerCase() : target.value;
 
   return {
     type: ON_CHANGE_NEW_CONTENT_TYPE_MAIN_INFOS,
@@ -307,7 +307,7 @@ export function updateTempContentType() {
 export const buildModelAttributes = attributes => {
   const formattedAttributes = attributes.reduce((acc, current) => {
     if (current.params.type === 'enumeration') {
-      acc[current.name] = Object.assign(current.params, { enum: current.params.enum.join(',') });
+      acc[current.name] = Object.assign(current.params, { enum: current.params.enum.join('\n') });
     } else if (current.params.nature === 'oneWay') {
       acc[current.name] = Object.assign(current.params, { key: '-' });
     } else {
@@ -338,7 +338,7 @@ export const formatModelAttributes = attributes =>
           acc2.params.pluginValue = value;
           acc2.params.plugin = true;
         } else if (curr === 'enum') {
-          acc2.params.enum = value.split(',');
+          acc2.params.enum = value.split('\n');
         } else {
           acc2.params[curr] = value;
         }
diff --git a/packages/strapi-plugin-content-type-builder/admin/src/containers/App/tests/actions.test.js b/packages/strapi-plugin-content-type-builder/admin/src/containers/App/tests/actions.test.js
index 454816482a..ede61ef50a 100644
--- a/packages/strapi-plugin-content-type-builder/admin/src/containers/App/tests/actions.test.js
+++ b/packages/strapi-plugin-content-type-builder/admin/src/containers/App/tests/actions.test.js
@@ -110,7 +110,7 @@ describe('Content Type Builder Action utils', () => {
         },
         test: {
           type: 'enumeration',
-          enum: 'test,test1',
+          enum: 'test\ntest1',
         },
         otherTest: {
           columnName: '',
@@ -220,7 +220,7 @@ describe('Content Type Builder Action utils', () => {
         },
         otherTest: {
           type: 'enumeration',
-          enum: 'test,test1',
+          enum: 'test\ntest1',
         },
       };
 
@@ -448,7 +448,7 @@ describe('App actions', () => {
       const e = {
         target: {
           name: 'test',
-          value: 'testWith spaces and stuff ',
+          value: 'testWith spaces and stuff',
         },
       };
       const expected = {
@@ -482,7 +482,7 @@ describe('App actions', () => {
       const e = {
         target: {
           name: 'test',
-          value: 'testWith spaces and stuff ',
+          value: 'testWith spaces and stuff',
         },
       };
       const expected = {
diff --git a/packages/strapi-plugin-content-type-builder/admin/src/translations/ar.json b/packages/strapi-plugin-content-type-builder/admin/src/translations/ar.json
index 3cc9e9d47f..b2021f29fd 100644
--- a/packages/strapi-plugin-content-type-builder/admin/src/translations/ar.json
+++ b/packages/strapi-plugin-content-type-builder/admin/src/translations/ar.json
@@ -41,7 +41,7 @@
   "form.attribute.item.enumeration.graphql.description": "يسمح لك بتجاوز الاسم الذي تم إنشاؤه افتراضيًا لـ GraphQL",
   "form.attribute.item.enumeration.name": "أسم",
   "form.attribute.item.enumeration.placeholder": "مثال: صباح,قمر,احداث",
-  "form.attribute.item.enumeration.rules": "قيم ( مقسمة بإستخدام الفاصلة )",
+  "form.attribute.item.enumeration.rules": "Values (one line per value)",
   "form.attribute.item.json.name": "الأسم",
   "form.attribute.item.maximum": "اقصى قيمة",
   "form.attribute.item.maximumLength": "أقصى طول",
@@ -155,4 +155,4 @@
   "table.contentType.head.name": "اسم",
   "table.contentType.title.plural": "أنواع المحتوى متاحة",
   "table.contentType.title.singular": "نوع المحتوى متاح"
-}
\ No newline at end of file
+}
diff --git a/packages/strapi-plugin-content-type-builder/admin/src/translations/de.json b/packages/strapi-plugin-content-type-builder/admin/src/translations/de.json
index 83039399a2..6c4c818399 100644
--- a/packages/strapi-plugin-content-type-builder/admin/src/translations/de.json
+++ b/packages/strapi-plugin-content-type-builder/admin/src/translations/de.json
@@ -41,7 +41,7 @@
   "form.attribute.item.enumeration.graphql.description": "Ermöglicht dir, den standardmäßig generierten Namen für GraphQL zu überschreiben",
   "form.attribute.item.enumeration.name": "Name",
   "form.attribute.item.enumeration.placeholder": "Ex: Morgen, Mittag, Abend",
-  "form.attribute.item.enumeration.rules": "Werte (trenne sie mit einem Komma)",
+  "form.attribute.item.enumeration.rules": "Values (one line per value)",
   "form.attribute.item.json.name": "Name",
   "form.attribute.item.maximum": "Maximalwert",
   "form.attribute.item.maximumLength": "Maximallänge",
@@ -154,4 +154,4 @@
   "table.contentType.head.name": "Name",
   "table.contentType.title.plural": "Inhaltstypen sind verfügbar",
   "table.contentType.title.singular": "Inhaltstyp ist verfügbar"
-}
\ No newline at end of file
+}
diff --git a/packages/strapi-plugin-content-type-builder/admin/src/translations/en.json b/packages/strapi-plugin-content-type-builder/admin/src/translations/en.json
index 326ad45b0b..ede9711ac7 100644
--- a/packages/strapi-plugin-content-type-builder/admin/src/translations/en.json
+++ b/packages/strapi-plugin-content-type-builder/admin/src/translations/en.json
@@ -42,7 +42,7 @@
   "form.attribute.item.enumeration.graphql.description": "Allows you to override the default generated name for GraphQL",
   "form.attribute.item.enumeration.name": "Name",
   "form.attribute.item.enumeration.placeholder": "Ex: morning,noon,evening",
-  "form.attribute.item.enumeration.rules": "Values (separate them with a comma)",
+  "form.attribute.item.enumeration.rules": "Values (one line per value)",
   "form.attribute.item.json.name": "Name",
   "form.attribute.item.maximum": "Maximum value",
   "form.attribute.item.maximumLength": "Maximum length",
diff --git a/packages/strapi-plugin-content-type-builder/admin/src/translations/es.json b/packages/strapi-plugin-content-type-builder/admin/src/translations/es.json
index 9519ecf69f..91652f7c34 100644
--- a/packages/strapi-plugin-content-type-builder/admin/src/translations/es.json
+++ b/packages/strapi-plugin-content-type-builder/admin/src/translations/es.json
@@ -41,7 +41,7 @@
   "form.attribute.item.enumeration.graphql.description": "Le permite redefinir el nombre generado por defecto para GraphQL",
   "form.attribute.item.enumeration.name": "Nombre",
   "form.attribute.item.enumeration.placeholder": "Ej: mañana, mediodía, noche",
-  "form.attribute.item.enumeration.rules": "Valores (separados con una coma)",
+  "form.attribute.item.enumeration.rules": "Values (one line per value)",
   "form.attribute.item.json.name": "Nombre",
   "form.attribute.item.maximum": "Valor máximo",
   "form.attribute.item.maximumLength": "Longitud máxima",
@@ -154,4 +154,4 @@
   "table.contentType.head.name": "Nombre",
   "table.contentType.title.plural": "Tipos de Contenido disponibles",
   "table.contentType.title.singular": "Tipo de contenido está disponible"
-}
\ No newline at end of file
+}
diff --git a/packages/strapi-plugin-content-type-builder/admin/src/translations/fr.json b/packages/strapi-plugin-content-type-builder/admin/src/translations/fr.json
index 53d23bdb27..18ac8a8774 100644
--- a/packages/strapi-plugin-content-type-builder/admin/src/translations/fr.json
+++ b/packages/strapi-plugin-content-type-builder/admin/src/translations/fr.json
@@ -41,7 +41,7 @@
   "form.attribute.item.enumeration.graphql.description": "Vous permet de remplacer le nom généré par défaut pour GraphQL",
   "form.attribute.item.enumeration.name": "Nom",
   "form.attribute.item.enumeration.placeholder": "Ex : matin,midi,soir",
-  "form.attribute.item.enumeration.rules": "Valeurs (les séparer par une virgule)",
+  "form.attribute.item.enumeration.rules": "Valeurs (les séparer par une nouvelle ligne)",
   "form.attribute.item.json.name": "Nom",
   "form.attribute.item.maximum": "Valeur maximum",
   "form.attribute.item.maximumLength": "Taille maximum",
diff --git a/packages/strapi-plugin-content-type-builder/admin/src/translations/it.json b/packages/strapi-plugin-content-type-builder/admin/src/translations/it.json
index 7192efca4e..262bf5de56 100644
--- a/packages/strapi-plugin-content-type-builder/admin/src/translations/it.json
+++ b/packages/strapi-plugin-content-type-builder/admin/src/translations/it.json
@@ -41,7 +41,7 @@
   "form.attribute.item.enumeration.graphql.description": "Consente di ignorare l'impostazione predefinita generata nome per GraphQL",
   "form.attribute.item.enumeration.name": "Nome",
   "form.attribute.item.enumeration.placeholder": "Ex: mattina,mezzogiorno,sera",
-  "form.attribute.item.enumeration.rules": "Valori (separati da una virgola)",
+  "form.attribute.item.enumeration.rules": "Values (one line per value)",
   "form.attribute.item.json.name": "Nome",
   "form.attribute.item.maximum": "Valore massimo",
   "form.attribute.item.maximumLength": "Lunghezza massima",
@@ -154,4 +154,4 @@
   "table.contentType.head.name": "Nome",
   "table.contentType.title.plural": "I Tipi di contenuto sono disponibili",
   "table.contentType.title.singular": "Il Tipo di contenuto è disponibile"
-}
\ No newline at end of file
+}
diff --git a/packages/strapi-plugin-content-type-builder/admin/src/translations/ja.json b/packages/strapi-plugin-content-type-builder/admin/src/translations/ja.json
index c367f42025..ab1ef0b862 100644
--- a/packages/strapi-plugin-content-type-builder/admin/src/translations/ja.json
+++ b/packages/strapi-plugin-content-type-builder/admin/src/translations/ja.json
@@ -41,7 +41,7 @@
   "form.attribute.item.enumeration.graphql.description": "GraphQLの既定の生成名をオーバーライドできます",
   "form.attribute.item.enumeration.name": "名前",
   "form.attribute.item.enumeration.placeholder": "例：朝、正午、夕方",
-  "form.attribute.item.enumeration.rules": "値 (カンマ区切り)",
+  "form.attribute.item.enumeration.rules": "Values (one line per value)",
   "form.attribute.item.json.name": "名前",
   "form.attribute.item.maximum": "最大値",
   "form.attribute.item.maximumLength": "最大長",
@@ -154,4 +154,4 @@
   "table.contentType.head.name": "名前",
   "table.contentType.title.plural": "個のコンテンツタイプが利用できます。",
   "table.contentType.title.singular": "コンテンツタイプは利用可能です"
-}
\ No newline at end of file
+}
diff --git a/packages/strapi-plugin-content-type-builder/admin/src/translations/ko.json b/packages/strapi-plugin-content-type-builder/admin/src/translations/ko.json
index c33cb2afbb..ca5fbf3adb 100644
--- a/packages/strapi-plugin-content-type-builder/admin/src/translations/ko.json
+++ b/packages/strapi-plugin-content-type-builder/admin/src/translations/ko.json
@@ -41,7 +41,7 @@
   "form.attribute.item.enumeration.graphql.description": "기본 생성된 이름을 GraphQL에서 사용합니다.",
   "form.attribute.item.enumeration.name": "이름",
   "form.attribute.item.enumeration.placeholder": "Ex: morning,noon,evening",
-  "form.attribute.item.enumeration.rules": "값 (쉼표로 구분)",
+  "form.attribute.item.enumeration.rules": "Values (one line per value)",
   "form.attribute.item.json.name": "이름",
   "form.attribute.item.maximum": "최대 값",
   "form.attribute.item.maximumLength": "최대 길이",
@@ -154,4 +154,4 @@
   "table.contentType.head.name": "이름",
   "table.contentType.title.plural": "개의 콘텐츠 타입이 있습니다.",
   "table.contentType.title.singular": "개의 콘텐츠 타입이 있습니다."
-}
\ No newline at end of file
+}
diff --git a/packages/strapi-plugin-content-type-builder/admin/src/translations/nl.json b/packages/strapi-plugin-content-type-builder/admin/src/translations/nl.json
index b3aa6855b7..0a9498b613 100644
--- a/packages/strapi-plugin-content-type-builder/admin/src/translations/nl.json
+++ b/packages/strapi-plugin-content-type-builder/admin/src/translations/nl.json
@@ -41,7 +41,7 @@
   "form.attribute.item.enumeration.graphql.description": "Zorgt ervoor dat je de standaard gegenereerde naam voor GraphQL kan overschrijven",
   "form.attribute.item.enumeration.name": "Naam",
   "form.attribute.item.enumeration.placeholder": "Bijv.: ochtend,middag,avond",
-  "form.attribute.item.enumeration.rules": "Waardes (onderscheid ze met een komma)",
+  "form.attribute.item.enumeration.rules": "Values (one line per value)",
   "form.attribute.item.json.name": "Naam",
   "form.attribute.item.maximum": "Maximale waarde",
   "form.attribute.item.maximumLength": "Maximale lengte",
@@ -154,4 +154,4 @@
   "table.contentType.head.name": "Naam",
   "table.contentType.title.plural": "Content Types zijn beschikbaar",
   "table.contentType.title.singular": "Content Type is beschikbaar"
-}
\ No newline at end of file
+}
diff --git a/packages/strapi-plugin-content-type-builder/admin/src/translations/pl.json b/packages/strapi-plugin-content-type-builder/admin/src/translations/pl.json
index b072eb8084..83fd8492e8 100644
--- a/packages/strapi-plugin-content-type-builder/admin/src/translations/pl.json
+++ b/packages/strapi-plugin-content-type-builder/admin/src/translations/pl.json
@@ -41,7 +41,7 @@
   "form.attribute.item.enumeration.graphql.description": "Pozwalaj na nadpisanie domyślnie wygenerowanej nazwy dla GraphQL.",
   "form.attribute.item.enumeration.name": "Nazwa",
   "form.attribute.item.enumeration.placeholder": "Przykład: rano,południe,wieczór",
-  "form.attribute.item.enumeration.rules": "Wartości (oddzielone przecinkiem)",
+  "form.attribute.item.enumeration.rules": "Values (one line per value)",
   "form.attribute.item.json.name": "Nazwa",
   "form.attribute.item.maximum": "Maksymalna wartość",
   "form.attribute.item.maximumLength": "Maksymalna długość",
diff --git a/packages/strapi-plugin-content-type-builder/admin/src/translations/pt-BR.json b/packages/strapi-plugin-content-type-builder/admin/src/translations/pt-BR.json
index 8194f27b76..968a1abe7e 100644
--- a/packages/strapi-plugin-content-type-builder/admin/src/translations/pt-BR.json
+++ b/packages/strapi-plugin-content-type-builder/admin/src/translations/pt-BR.json
@@ -41,7 +41,7 @@
   "form.attribute.item.enumeration.graphql.description": "Permite à si a substituição do nome predefinido para o GraphQL",
   "form.attribute.item.enumeration.name": "Nome",
   "form.attribute.item.enumeration.placeholder": "Ex: manhã,tarde,noite",
-  "form.attribute.item.enumeration.rules": "Valores (separe-os com uma vírgula)",
+  "form.attribute.item.enumeration.rules": "Values (one line per value)",
   "form.attribute.item.json.name": "Nome",
   "form.attribute.item.maximum": "Valor máximo",
   "form.attribute.item.maximumLength": "Tamanho máximo",
@@ -154,4 +154,4 @@
   "table.contentType.head.name": "Nome",
   "table.contentType.title.plural": "Tipos de Conteúdos estão disponíveis",
   "table.contentType.title.singular": "Tipo de Conteúdo está disponível"
-}
\ No newline at end of file
+}
diff --git a/packages/strapi-plugin-content-type-builder/admin/src/translations/pt.json b/packages/strapi-plugin-content-type-builder/admin/src/translations/pt.json
index 53364233f2..7b057d6d2b 100644
--- a/packages/strapi-plugin-content-type-builder/admin/src/translations/pt.json
+++ b/packages/strapi-plugin-content-type-builder/admin/src/translations/pt.json
@@ -41,7 +41,7 @@
   "form.attribute.item.enumeration.graphql.description": "Permite à si a substituição do nome predefinido para o GraphQL",
   "form.attribute.item.enumeration.name": "Nome",
   "form.attribute.item.enumeration.placeholder": "Ex: manhã,tarde,noite",
-  "form.attribute.item.enumeration.rules": "Valores (separe-os com uma vírgula)",
+  "form.attribute.item.enumeration.rules": "Values (one line per value)",
   "form.attribute.item.json.name": "Nome",
   "form.attribute.item.maximum": "Valor máximo",
   "form.attribute.item.maximumLength": "Comprimento máximo",
@@ -154,4 +154,4 @@
   "table.contentType.head.name": "Nome",
   "table.contentType.title.plural": "Tipos de Conteúdos estão disponíveis",
   "table.contentType.title.singular": "Tipo de Conteúdo está disponível"
-}
\ No newline at end of file
+}
diff --git a/packages/strapi-plugin-content-type-builder/admin/src/translations/ru.json b/packages/strapi-plugin-content-type-builder/admin/src/translations/ru.json
index e09e895d63..d5420afe78 100644
--- a/packages/strapi-plugin-content-type-builder/admin/src/translations/ru.json
+++ b/packages/strapi-plugin-content-type-builder/admin/src/translations/ru.json
@@ -41,7 +41,7 @@
   "form.attribute.item.enumeration.graphql.description": "Позволяет переопределить название поля в GraphQL, сгенерированное по умолчанию",
   "form.attribute.item.enumeration.name": "Название",
   "form.attribute.item.enumeration.placeholder": "Например: morning,noon,evening",
-  "form.attribute.item.enumeration.rules": "Значения (через запятую)",
+  "form.attribute.item.enumeration.rules": "Values (one line per value)",
   "form.attribute.item.json.name": "Название",
   "form.attribute.item.maximum": "Максимальное значение",
   "form.attribute.item.maximumLength": "Максимальная длина",
diff --git a/packages/strapi-plugin-content-type-builder/admin/src/translations/tr.json b/packages/strapi-plugin-content-type-builder/admin/src/translations/tr.json
index fff448251b..e797a0da0e 100644
--- a/packages/strapi-plugin-content-type-builder/admin/src/translations/tr.json
+++ b/packages/strapi-plugin-content-type-builder/admin/src/translations/tr.json
@@ -41,7 +41,7 @@
   "form.attribute.item.enumeration.graphql.description": "GraphQL için varsayılan oluşturulan adı geçersiz kılmanıza izin verir.",
   "form.attribute.item.enumeration.name": "İsim",
   "form.attribute.item.enumeration.placeholder": "Örn: sabah, öğlen, akşam",
-  "form.attribute.item.enumeration.rules": "Değerler (virgülle ayırın)",
+  "form.attribute.item.enumeration.rules": "Values (one line per value)",
   "form.attribute.item.json.name": "İsim",
   "form.attribute.item.maximum": "En yüksek değer",
   "form.attribute.item.maximumLength": "En yüksek uzunluk",
@@ -154,4 +154,4 @@
   "table.contentType.head.name": "İsim",
   "table.contentType.title.plural": "İçerik Türleri kullanılabilir",
   "table.contentType.title.singular": "İçerik Türü kullanılabilir"
-}
\ No newline at end of file
+}
diff --git a/packages/strapi-plugin-content-type-builder/admin/src/translations/zh-Hans.json b/packages/strapi-plugin-content-type-builder/admin/src/translations/zh-Hans.json
index 94e2676832..cc585102de 100644
--- a/packages/strapi-plugin-content-type-builder/admin/src/translations/zh-Hans.json
+++ b/packages/strapi-plugin-content-type-builder/admin/src/translations/zh-Hans.json
@@ -40,7 +40,7 @@
   "form.attribute.item.enumeration.graphql.description": "Allows you to override the default generated name for GraphQL",
   "form.attribute.item.enumeration.name": "Name",
   "form.attribute.item.enumeration.placeholder": "Ex: morning,noon,evening",
-  "form.attribute.item.enumeration.rules": "Values (separate them with a comma)",
+  "form.attribute.item.enumeration.rules": "Values (one line per value)",
   "form.attribute.item.json.name": "Name",
   "form.attribute.item.maximum": "最大值",
   "form.attribute.item.maximumLength": "最大长度",
@@ -152,4 +152,4 @@
   "table.contentType.head.name": "名称",
   "table.contentType.title.plural": "Content Types 是可用的",
   "table.contentType.title.singular": "Content Type 是可用的"
-}
\ No newline at end of file
+}
diff --git a/packages/strapi-plugin-content-type-builder/admin/src/translations/zh.json b/packages/strapi-plugin-content-type-builder/admin/src/translations/zh.json
index b0a0a38dc3..7b0ff23392 100644
--- a/packages/strapi-plugin-content-type-builder/admin/src/translations/zh.json
+++ b/packages/strapi-plugin-content-type-builder/admin/src/translations/zh.json
@@ -41,7 +41,7 @@
   "form.attribute.item.enumeration.graphql.description": "可以讓您覆寫 GraphQL 的預設名稱",
   "form.attribute.item.enumeration.name": "名稱",
   "form.attribute.item.enumeration.placeholder": "例: morning,noon,evening",
-  "form.attribute.item.enumeration.rules": "選項(以半形逗號分隔)",
+  "form.attribute.item.enumeration.rules": "Values (one line per value)",
   "form.attribute.item.json.name": "名稱",
   "form.attribute.item.maximum": "最大數值",
   "form.attribute.item.maximumLength": "最大長度",
@@ -154,4 +154,4 @@
   "table.contentType.head.name": "名稱",
   "table.contentType.title.plural": "筆資料結構",
   "table.contentType.title.singular": "筆資料結構"
-}
\ No newline at end of file
+}