diff --git a/src/Umbraco.Web.UI.Client/src/mocks/data/data-type/data-type.data.ts b/src/Umbraco.Web.UI.Client/src/mocks/data/data-type/data-type.data.ts
index 509838185f..51ddde3466 100644
--- a/src/Umbraco.Web.UI.Client/src/mocks/data/data-type/data-type.data.ts
+++ b/src/Umbraco.Web.UI.Client/src/mocks/data/data-type/data-type.data.ts
@@ -988,7 +988,7 @@ export const data: Array<UmbMockDataTypeModel> = [
 		id: 'dt-integer',
 		parent: null,
 		editorAlias: 'Umbraco.Integer',
-		editorUiAlias: 'Umb.PropertyEditorUi.Number',
+		editorUiAlias: 'Umb.PropertyEditorUi.Integer',
 		hasChildren: false,
 		isFolder: false,
 		isDeletable: true,
diff --git a/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/property-editors/block-grid-editor/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/property-editors/block-grid-editor/manifests.ts
index b35ca6977e..26879650f8 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/property-editors/block-grid-editor/manifests.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/property-editors/block-grid-editor/manifests.ts
@@ -43,7 +43,7 @@ export const manifests: Array<ManifestTypes> = [
 						alias: 'gridColumns',
 						label: 'Grid Columns',
 						description: 'Set the number of columns for the layout. (defaults to 12)',
-						propertyEditorUiAlias: 'Umb.PropertyEditorUi.Number',
+						propertyEditorUiAlias: 'Umb.PropertyEditorUi.Integer',
 						config: [{ alias: 'min', value: 0 }],
 					},
 					{
diff --git a/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/workspace/views/block-grid-type-workspace-view-areas.element.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/workspace/views/block-grid-type-workspace-view-areas.element.ts
index e45dc873bc..e2b39bb072 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/workspace/views/block-grid-type-workspace-view-areas.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/workspace/views/block-grid-type-workspace-view-areas.element.ts
@@ -32,7 +32,7 @@ export class UmbBlockGridTypeWorkspaceViewAreasElement extends UmbLitElement imp
 				<umb-property
 					label=${this.localize.term('blockEditor_areasLayoutColumns')}
 					alias="areaGridColumns"
-					property-editor-ui-alias="Umb.PropertyEditorUi.Number"></umb-property>
+					property-editor-ui-alias="Umb.PropertyEditorUi.Integer"></umb-property>
 				<umb-property
 					label=${this.localize.term('blockEditor_areasConfigurations')}
 					alias="areas"
diff --git a/src/Umbraco.Web.UI.Client/src/packages/multi-url-picker/property-editor/Umbraco.MultiUrlPicker.ts b/src/Umbraco.Web.UI.Client/src/packages/multi-url-picker/property-editor/Umbraco.MultiUrlPicker.ts
index 79fa35a944..52fe80b3f4 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/multi-url-picker/property-editor/Umbraco.MultiUrlPicker.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/multi-url-picker/property-editor/Umbraco.MultiUrlPicker.ts
@@ -12,14 +12,14 @@ export const manifest: ManifestPropertyEditorSchema = {
 					alias: 'minNumber',
 					label: 'Minimum number of items',
 					description: '',
-					propertyEditorUiAlias: 'Umb.PropertyEditorUi.Number',
+					propertyEditorUiAlias: 'Umb.PropertyEditorUi.Integer',
 					config: [{ alias: 'min', value: 0 }],
 				},
 				{
 					alias: 'maxNumber',
 					label: 'Maximum number of items',
 					description: '',
-					propertyEditorUiAlias: 'Umb.PropertyEditorUi.Number',
+					propertyEditorUiAlias: 'Umb.PropertyEditorUi.Integer',
 					config: [{ alias: 'min', value: 0 }],
 				},
 				{
diff --git a/src/Umbraco.Web.UI.Client/src/packages/property-editors/collection/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/property-editors/collection/manifests.ts
index 7dfe94e083..24090aae4d 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/property-editors/collection/manifests.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/property-editors/collection/manifests.ts
@@ -38,7 +38,7 @@ const propertyEditorUiManifest: ManifestPropertyEditorUi = {
 					alias: 'pageSize',
 					label: 'Page Size',
 					description: 'Number of items per page.',
-					propertyEditorUiAlias: 'Umb.PropertyEditorUi.Number',
+					propertyEditorUiAlias: 'Umb.PropertyEditorUi.Integer',
 					config: [{ alias: 'min', value: 0 }],
 				},
 				{
diff --git a/src/Umbraco.Web.UI.Client/src/packages/property-editors/content-picker/Umbraco.MultiNodeTreePicker.ts b/src/Umbraco.Web.UI.Client/src/packages/property-editors/content-picker/Umbraco.MultiNodeTreePicker.ts
index f9532ea5eb..ade0ee9020 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/property-editors/content-picker/Umbraco.MultiNodeTreePicker.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/property-editors/content-picker/Umbraco.MultiNodeTreePicker.ts
@@ -12,14 +12,14 @@ export const manifest: ManifestPropertyEditorSchema = {
 					alias: 'minNumber',
 					label: 'Minimum number of items',
 					description: '',
-					propertyEditorUiAlias: 'Umb.PropertyEditorUi.Number',
+					propertyEditorUiAlias: 'Umb.PropertyEditorUi.Integer',
 					config: [{ alias: 'min', value: 0 }],
 				},
 				{
 					alias: 'maxNumber',
 					label: 'Maximum number of items',
 					description: '',
-					propertyEditorUiAlias: 'Umb.PropertyEditorUi.Number',
+					propertyEditorUiAlias: 'Umb.PropertyEditorUi.Integer',
 					config: [{ alias: 'min', value: 0 }],
 				},
 				{
diff --git a/src/Umbraco.Web.UI.Client/src/packages/property-editors/multiple-text-string/Umbraco.MultipleTextString.ts b/src/Umbraco.Web.UI.Client/src/packages/property-editors/multiple-text-string/Umbraco.MultipleTextString.ts
index 1ed2760498..506619172d 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/property-editors/multiple-text-string/Umbraco.MultipleTextString.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/property-editors/multiple-text-string/Umbraco.MultipleTextString.ts
@@ -13,14 +13,14 @@ export const manifests: Array<ManifestTypes> = [
 						alias: 'min',
 						label: 'Minimum',
 						description: 'Enter the minimum amount of text boxes to be displayed',
-						propertyEditorUiAlias: 'Umb.PropertyEditorUi.Number',
+						propertyEditorUiAlias: 'Umb.PropertyEditorUi.Integer',
 						config: [{ alias: 'min', value: 0 }],
 					},
 					{
 						alias: 'max',
 						label: 'Maximum',
 						description: 'Enter the maximum amount of text boxes to be displayed, enter 0 for unlimited',
-						propertyEditorUiAlias: 'Umb.PropertyEditorUi.Number',
+						propertyEditorUiAlias: 'Umb.PropertyEditorUi.Integer',
 						config: [{ alias: 'min', value: 0 }],
 					},
 				],
diff --git a/src/Umbraco.Web.UI.Client/src/packages/property-editors/number/Umbraco.Integer.ts b/src/Umbraco.Web.UI.Client/src/packages/property-editors/number/Umbraco.Integer.ts
index f075828ebf..c90a46342b 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/property-editors/number/Umbraco.Integer.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/property-editors/number/Umbraco.Integer.ts
@@ -6,26 +6,26 @@ export const manifests: Array<ManifestTypes> = [
 		name: 'Integer',
 		alias: 'Umbraco.Integer',
 		meta: {
-			defaultPropertyEditorUiAlias: 'Umb.PropertyEditorUi.Number',
+			defaultPropertyEditorUiAlias: 'Umb.PropertyEditorUi.Integer',
 			settings: {
 				properties: [
 					{
 						alias: 'min',
 						label: 'Minimum',
 						description: 'Enter the minimum amount of number to be entered',
-						propertyEditorUiAlias: 'Umb.PropertyEditorUi.Number',
+						propertyEditorUiAlias: 'Umb.PropertyEditorUi.Integer',
 					},
 					{
 						alias: 'max',
 						label: 'Maximum',
 						description: 'Enter the maximum amount of number to be entered',
-						propertyEditorUiAlias: 'Umb.PropertyEditorUi.Number',
+						propertyEditorUiAlias: 'Umb.PropertyEditorUi.Integer',
 					},
 					{
 						alias: 'step',
 						label: 'Step size',
 						description: 'Enter the intervals amount between each step of number to be entered',
-						propertyEditorUiAlias: 'Umb.PropertyEditorUi.Number',
+						propertyEditorUiAlias: 'Umb.PropertyEditorUi.Integer',
 					},
 				],
 			},
diff --git a/src/Umbraco.Web.UI.Client/src/packages/property-editors/number/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/property-editors/number/manifests.ts
index 65f8286c36..e64c47d910 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/property-editors/number/manifests.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/property-editors/number/manifests.ts
@@ -26,11 +26,11 @@ export const manifests: Array<ManifestTypes> = [
 	},
 	{
 		type: 'propertyEditorUi',
-		alias: 'Umb.PropertyEditorUi.Number',
-		name: 'Number Property Editor UI',
+		alias: 'Umb.PropertyEditorUi.Integer',
+		name: 'Numeric Property Editor UI',
 		element: () => import('./property-editor-ui-number.element.js'),
 		meta: {
-			label: 'Number',
+			label: 'Numeric',
 			icon: 'icon-autofill',
 			group: 'common',
 			propertyEditorSchemaAlias: 'Umbraco.Integer',
diff --git a/src/Umbraco.Web.UI.Client/src/packages/property-editors/slider/Umbraco.Slider.ts b/src/Umbraco.Web.UI.Client/src/packages/property-editors/slider/Umbraco.Slider.ts
index 6cc16c3322..5a363f63be 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/property-editors/slider/Umbraco.Slider.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/property-editors/slider/Umbraco.Slider.ts
@@ -12,13 +12,13 @@ export const manifest: ManifestPropertyEditorSchema = {
 					alias: 'minVal',
 					label: 'Minimum value',
 					description: '',
-					propertyEditorUiAlias: 'Umb.PropertyEditorUi.Number',
+					propertyEditorUiAlias: 'Umb.PropertyEditorUi.Integer',
 				},
 				{
 					alias: 'maxVal',
 					label: 'Maximum value',
 					description: '',
-					propertyEditorUiAlias: 'Umb.PropertyEditorUi.Number',
+					propertyEditorUiAlias: 'Umb.PropertyEditorUi.Integer',
 				},
 			],
 			defaultData: [
diff --git a/src/Umbraco.Web.UI.Client/src/packages/property-editors/slider/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/property-editors/slider/manifests.ts
index 5d03f0f233..52a4dfe8d4 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/property-editors/slider/manifests.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/property-editors/slider/manifests.ts
@@ -24,19 +24,19 @@ export const manifests: Array<ManifestTypes> = [
 						alias: 'initVal1',
 						label: 'Initial value',
 						description: '',
-						propertyEditorUiAlias: 'Umb.PropertyEditorUi.Number',
+						propertyEditorUiAlias: 'Umb.PropertyEditorUi.Integer',
 					},
 					{
 						alias: 'initVal2',
 						label: 'Initial value 2',
 						description: 'Used when range is enabled',
-						propertyEditorUiAlias: 'Umb.PropertyEditorUi.Number',
+						propertyEditorUiAlias: 'Umb.PropertyEditorUi.Integer',
 					},
 					{
 						alias: 'step',
 						label: 'Step increments',
 						description: '',
-						propertyEditorUiAlias: 'Umb.PropertyEditorUi.Number',
+						propertyEditorUiAlias: 'Umb.PropertyEditorUi.Integer',
 					},
 				],
 				defaultData: [
diff --git a/src/Umbraco.Web.UI.Client/src/packages/property-editors/text-box/Umbraco.TextBox.ts b/src/Umbraco.Web.UI.Client/src/packages/property-editors/text-box/Umbraco.TextBox.ts
index 7c0470461a..e92a35bc55 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/property-editors/text-box/Umbraco.TextBox.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/property-editors/text-box/Umbraco.TextBox.ts
@@ -12,7 +12,7 @@ export const manifest: ManifestPropertyEditorSchema = {
 					alias: 'maxChars',
 					label: 'Maximum allowed characters',
 					description: 'If empty, 512 character limit',
-					propertyEditorUiAlias: 'Umb.PropertyEditorUi.Number',
+					propertyEditorUiAlias: 'Umb.PropertyEditorUi.Integer',
 				},
 			],
 			defaultData: [
diff --git a/src/Umbraco.Web.UI.Client/src/packages/property-editors/textarea/Umbraco.TextArea.ts b/src/Umbraco.Web.UI.Client/src/packages/property-editors/textarea/Umbraco.TextArea.ts
index fc854d8377..e0e35aeca6 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/property-editors/textarea/Umbraco.TextArea.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/property-editors/textarea/Umbraco.TextArea.ts
@@ -12,7 +12,7 @@ export const manifest: ManifestPropertyEditorSchema = {
 					alias: 'maxChars',
 					label: 'Maximum allowed characters',
 					description: 'If empty - no character limit',
-					propertyEditorUiAlias: 'Umb.PropertyEditorUi.Number',
+					propertyEditorUiAlias: 'Umb.PropertyEditorUi.Integer',
 					config: [{ alias: 'min', value: 0 }],
 				},
 			],
diff --git a/src/Umbraco.Web.UI.Client/src/packages/property-editors/textarea/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/property-editors/textarea/manifests.ts
index 321fc1f55a..46a05cb0d3 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/property-editors/textarea/manifests.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/property-editors/textarea/manifests.ts
@@ -18,21 +18,21 @@ export const manifests: Array<ManifestTypes> = [
 						alias: 'rows',
 						label: 'Number of rows',
 						description: 'If empty or zero, the textarea is set to auto-height',
-						propertyEditorUiAlias: 'Umb.PropertyEditorUi.Number',
+						propertyEditorUiAlias: 'Umb.PropertyEditorUi.Integer',
 					config: [{ alias: 'min', value: 0 }],
 					},
 					{
 						alias: 'minHeight',
 						label: 'Min height (pixels)',
 						description: 'Sets the minimum height of the textarea',
-						propertyEditorUiAlias: 'Umb.PropertyEditorUi.Number',
+						propertyEditorUiAlias: 'Umb.PropertyEditorUi.Integer',
 					config: [{ alias: 'min', value: 0 }],
 					},
 					{
 						alias: 'maxHeight',
 						label: 'Max height (pixels)',
 						description: 'Sets the maximum height of the textarea',
-						propertyEditorUiAlias: 'Umb.PropertyEditorUi.Number',
+						propertyEditorUiAlias: 'Umb.PropertyEditorUi.Integer',
 					config: [{ alias: 'min', value: 0 }],
 					},
 				],