diff --git a/src/Umbraco.Web.UI.Client/src/core/mocks/data/data-type.data.ts b/src/Umbraco.Web.UI.Client/src/core/mocks/data/data-type.data.ts
index cba74783f3..48bcf79f9c 100644
--- a/src/Umbraco.Web.UI.Client/src/core/mocks/data/data-type.data.ts
+++ b/src/Umbraco.Web.UI.Client/src/core/mocks/data/data-type.data.ts
@@ -9,7 +9,7 @@ export const data: Array<DataTypeDetails> = [
 		type: 'data-type',
 		icon: 'umb:autofill',
 		hasChildren: false,
-		key: 'dt-1',
+		key: 'dt-textBox',
 		isContainer: false,
 		parentKey: null,
 		isFolder: false,
@@ -27,7 +27,7 @@ export const data: Array<DataTypeDetails> = [
 		type: 'data-type',
 		icon: 'umb:autofill',
 		hasChildren: false,
-		key: 'dt-2',
+		key: 'dt-textArea',
 		isContainer: false,
 		parentKey: null,
 		isFolder: false,
@@ -49,7 +49,7 @@ export const data: Array<DataTypeDetails> = [
 		type: 'data-type',
 		icon: 'umb:autofill',
 		hasChildren: false,
-		key: 'dt-3',
+		key: 'dt-custom',
 		isContainer: false,
 		parentKey: null,
 		isFolder: false,
@@ -57,19 +57,6 @@ export const data: Array<DataTypeDetails> = [
 		propertyEditorUIAlias: 'My.PropertyEditorUI.Custom',
 		data: [],
 	},
-	{
-		name: 'Content Picker (DataType)',
-		type: 'data-type',
-		icon: 'umb:autofill',
-		hasChildren: false,
-		key: 'dt-5',
-		isContainer: false,
-		parentKey: null,
-		isFolder: false,
-		propertyEditorModelAlias: 'Umbraco.ContentPicker',
-		propertyEditorUIAlias: 'Umb.PropertyEditorUI.ContentPicker',
-		data: [],
-	},
 	{
 		name: 'Color Picker',
 		type: 'data-type',
@@ -161,19 +148,6 @@ export const data: Array<DataTypeDetails> = [
 		propertyEditorUIAlias: 'Umb.PropertyEditorUI.Email',
 		data: [],
 	},
-	{
-		name: 'Text Box',
-		type: 'data-type',
-		icon: 'umb:autofill',
-		hasChildren: false,
-		key: 'dt-textBox',
-		isContainer: false,
-		parentKey: null,
-		isFolder: false,
-		propertyEditorModelAlias: 'Umbraco.TextBox',
-		propertyEditorUIAlias: 'Umb.PropertyEditorUI.TextBox',
-		data: [],
-	},
 	{
 		name: 'Multiple Text String',
 		type: 'data-type',
@@ -200,19 +174,6 @@ export const data: Array<DataTypeDetails> = [
 		propertyEditorUIAlias: 'Umb.PropertyEditorUI.Dropdown',
 		data: [],
 	},
-	{
-		name: 'Text Area',
-		type: 'data-type',
-		icon: 'umb:autofill',
-		hasChildren: false,
-		key: 'dt-textArea',
-		isContainer: false,
-		parentKey: null,
-		isFolder: false,
-		propertyEditorModelAlias: 'Umbraco.TextArea',
-		propertyEditorUIAlias: 'Umb.PropertyEditorUI.TextArea',
-		data: [],
-	},
 ];
 
 // Temp mocked database
diff --git a/src/Umbraco.Web.UI.Client/src/core/mocks/data/document.data.ts b/src/Umbraco.Web.UI.Client/src/core/mocks/data/document.data.ts
index 9c62b7e793..71a1b2ca0f 100644
--- a/src/Umbraco.Web.UI.Client/src/core/mocks/data/document.data.ts
+++ b/src/Umbraco.Web.UI.Client/src/core/mocks/data/document.data.ts
@@ -100,13 +100,13 @@ export const data: Array<DocumentDetails> = [
 				alias: 'myHeadline',
 				label: 'Headline',
 				description: 'Text string property',
-				dataTypeKey: 'dt-1',
+				dataTypeKey: 'dt-textBox',
 			},
 			{
 				alias: 'myDescription',
 				label: 'Description',
 				description: 'Textarea property',
-				dataTypeKey: 'dt-2',
+				dataTypeKey: 'dt-textArea',
 			},
 		],
 		data: [
@@ -157,25 +157,25 @@ export const data: Array<DocumentDetails> = [
 				alias: 'myHeadline',
 				label: 'Text string label',
 				description: 'this is a text string property',
-				dataTypeKey: 'dt-1',
+				dataTypeKey: 'dt-textBox',
 			},
 			{
 				alias: 'myDescription',
 				label: 'Textarea label',
 				description: 'This is the a textarea property',
-				dataTypeKey: 'dt-2',
+				dataTypeKey: 'dt-textArea',
 			},
 			{
 				alias: 'myExternalEditor',
 				label: 'My JS Property Editor',
 				description: 'This is the a external property',
-				dataTypeKey: 'dt-3',
+				dataTypeKey: 'dt-custom',
 			},
 			{
 				alias: 'myContentPicker',
 				label: 'Content Picker',
 				description: 'This is a content picker',
-				dataTypeKey: 'dt-5',
+				dataTypeKey: 'dt-contentPicker',
 			},
 		],
 		data: [
@@ -221,7 +221,7 @@ export const data: Array<DocumentDetails> = [
 				alias: 'myDescription',
 				label: 'Description',
 				description: 'Textarea property',
-				dataTypeKey: 'dt-2',
+				dataTypeKey: 'dt-textArea',
 			},
 		],
 		data: [
@@ -250,7 +250,7 @@ export const data: Array<DocumentDetails> = [
 				alias: 'myDescription',
 				label: 'Description',
 				description: 'Textarea property',
-				dataTypeKey: 'dt-2',
+				dataTypeKey: 'dt-textArea',
 			},
 		],
 		data: [],
diff --git a/src/Umbraco.Web.UI.Client/src/core/mocks/data/media.data.ts b/src/Umbraco.Web.UI.Client/src/core/mocks/data/media.data.ts
index 9371316ceb..956dbe7da8 100644
--- a/src/Umbraco.Web.UI.Client/src/core/mocks/data/media.data.ts
+++ b/src/Umbraco.Web.UI.Client/src/core/mocks/data/media.data.ts
@@ -19,7 +19,7 @@ export const data: Array<MediaDetails> = [
 				alias: 'myMediaHeadline',
 				label: 'Media Headline',
 				description: 'Text string property',
-				dataTypeKey: 'dt-1',
+				dataTypeKey: 'dt-textBox',
 			},
 		],
 		data: [
@@ -45,7 +45,7 @@ export const data: Array<MediaDetails> = [
 				alias: 'myMediaDescription',
 				label: 'Description',
 				description: 'Textarea property',
-				dataTypeKey: 'dt-2',
+				dataTypeKey: 'dt-textArea',
 			},
 		],
 		data: [
@@ -85,7 +85,7 @@ export const data: Array<MediaDetails> = [
 				alias: 'myMediaDescription',
 				label: 'Description',
 				description: 'Textarea property',
-				dataTypeKey: 'dt-2',
+				dataTypeKey: 'dt-textArea',
 			},
 		],
 		data: [