diff --git a/catalog-rest-service/src/main/resources/json/schema/api/data/createChart.json b/catalog-rest-service/src/main/resources/json/schema/api/data/createChart.json
index dd60ceef609..5d510684647 100644
--- a/catalog-rest-service/src/main/resources/json/schema/api/data/createChart.json
+++ b/catalog-rest-service/src/main/resources/json/schema/api/data/createChart.json
@@ -7,9 +7,7 @@
   "properties": {
     "name": {
       "description": "Name that identifies this Chart.",
-      "type": "string",
-      "minLength": 1,
-      "maxLength": 128
+      "$ref": "../../type/basic.json#/definitions/entityName"
     },
     "displayName": {
       "description": "Display Name that identifies this Chart. It could be title or label from the source services",
diff --git a/catalog-rest-service/src/main/resources/json/schema/api/data/createDashboard.json b/catalog-rest-service/src/main/resources/json/schema/api/data/createDashboard.json
index c1772839ac0..de6e34a7406 100644
--- a/catalog-rest-service/src/main/resources/json/schema/api/data/createDashboard.json
+++ b/catalog-rest-service/src/main/resources/json/schema/api/data/createDashboard.json
@@ -7,9 +7,7 @@
   "properties": {
     "name": {
       "description": "Name that identifies this dashboard.",
-      "type": "string",
-      "minLength": 1,
-      "maxLength": 128
+      "$ref": "../../type/basic.json#/definitions/entityName"
     },
     "displayName": {
       "description": "Display Name that identifies this Dashboard. It could be title or label from the source services",
diff --git a/catalog-rest-service/src/main/resources/json/schema/api/data/createMlModel.json b/catalog-rest-service/src/main/resources/json/schema/api/data/createMlModel.json
index 574604a0113..3cf83f7c221 100644
--- a/catalog-rest-service/src/main/resources/json/schema/api/data/createMlModel.json
+++ b/catalog-rest-service/src/main/resources/json/schema/api/data/createMlModel.json
@@ -7,9 +7,7 @@
   "properties": {
     "name": {
       "description": "Name that identifies this ML model.",
-      "type": "string",
-      "minLength": 1,
-      "maxLength": 128
+      "$ref": "../../type/basic.json#/definitions/entityName"
     },
     "displayName": {
       "description": "Display Name that identifies this ML model. It could be title or label from the source services",
diff --git a/catalog-rest-service/src/main/resources/json/schema/api/data/createPipeline.json b/catalog-rest-service/src/main/resources/json/schema/api/data/createPipeline.json
index 58565c8181a..2c0dac16eee 100644
--- a/catalog-rest-service/src/main/resources/json/schema/api/data/createPipeline.json
+++ b/catalog-rest-service/src/main/resources/json/schema/api/data/createPipeline.json
@@ -8,9 +8,7 @@
   "properties": {
     "name": {
       "description": "Name that identifies this pipeline instance uniquely.",
-      "type": "string",
-      "minLength": 1,
-      "maxLength": 128
+      "$ref": "../../type/basic.json#/definitions/entityName"
     },
     "displayName": {
       "description": "Display Name that identifies this Pipeline. It could be title or label from the source services.",
diff --git a/catalog-rest-service/src/main/resources/json/schema/api/events/createWebhook.json b/catalog-rest-service/src/main/resources/json/schema/api/events/createWebhook.json
index badc53915c0..2875f86049d 100644
--- a/catalog-rest-service/src/main/resources/json/schema/api/events/createWebhook.json
+++ b/catalog-rest-service/src/main/resources/json/schema/api/events/createWebhook.json
@@ -7,9 +7,7 @@
   "properties": {
     "name": {
       "description": "Unique name of the application receiving webhook events.",
-      "type": "string",
-      "minLength": 1,
-      "maxLength": 128
+      "$ref": "../../type/basic.json#/definitions/entityName"
     },
     "description": {
       "description": "Description of the application",
diff --git a/catalog-rest-service/src/main/resources/json/schema/api/operations/pipelines/createAirflowPipeline.json b/catalog-rest-service/src/main/resources/json/schema/api/operations/pipelines/createAirflowPipeline.json
index a7004f28880..859471e0851 100644
--- a/catalog-rest-service/src/main/resources/json/schema/api/operations/pipelines/createAirflowPipeline.json
+++ b/catalog-rest-service/src/main/resources/json/schema/api/operations/pipelines/createAirflowPipeline.json
@@ -7,9 +7,7 @@
   "properties": {
     "name": {
       "description": "Name that identifies this pipeline instance uniquely.",
-      "type": "string",
-      "minLength": 1,
-      "maxLength": 128
+      "$ref": "../../../type/basic.json#/definitions/entityName"
     },
     "displayName": {
       "description": "Display Name that identifies this pipeline.",
diff --git a/catalog-rest-service/src/main/resources/json/schema/api/tests/createCustomMetric.json b/catalog-rest-service/src/main/resources/json/schema/api/tests/createCustomMetric.json
index 11b04c49cbe..6b79263ede4 100644
--- a/catalog-rest-service/src/main/resources/json/schema/api/tests/createCustomMetric.json
+++ b/catalog-rest-service/src/main/resources/json/schema/api/tests/createCustomMetric.json
@@ -11,9 +11,7 @@
     },
     "name": {
       "description": "Name that identifies this Custom Metric.",
-      "type": "string",
-      "minLength": 1,
-      "maxLength": 128
+      "$ref": "../../type/basic.json#/definitions/entityName"
     },
     "columnName": {
       "description": "Name of the column in a table.",
diff --git a/catalog-rest-service/src/main/resources/json/schema/entity/bots.json b/catalog-rest-service/src/main/resources/json/schema/entity/bots.json
index a900fe12b77..881e08526f8 100644
--- a/catalog-rest-service/src/main/resources/json/schema/entity/bots.json
+++ b/catalog-rest-service/src/main/resources/json/schema/entity/bots.json
@@ -12,9 +12,7 @@
     },
     "name": {
       "description": "Name of the bot.",
-      "type": "string",
-      "minLength": 1,
-      "maxLength": 128
+      "$ref": "../type/basic.json#/definitions/entityName"
     },
     "displayName": {
       "description": "Name used for display purposes. Example 'FirstName LastName'.",
diff --git a/catalog-rest-service/src/main/resources/json/schema/entity/data/chart.json b/catalog-rest-service/src/main/resources/json/schema/entity/data/chart.json
index da7423e4dd7..7c9924eba19 100644
--- a/catalog-rest-service/src/main/resources/json/schema/entity/data/chart.json
+++ b/catalog-rest-service/src/main/resources/json/schema/entity/data/chart.json
@@ -62,9 +62,7 @@
     },
     "name": {
       "description": "Name that identifies this Chart.",
-      "type": "string",
-      "minLength": 1,
-      "maxLength": 128
+      "$ref": "../../type/basic.json#/definitions/entityName"
     },
     "displayName": {
       "description": "Display Name that identifies this Chart. It could be title or label from the source services.",
diff --git a/catalog-rest-service/src/main/resources/json/schema/entity/data/dashboard.json b/catalog-rest-service/src/main/resources/json/schema/entity/data/dashboard.json
index 37e73a25b4a..698f5b81f8c 100644
--- a/catalog-rest-service/src/main/resources/json/schema/entity/data/dashboard.json
+++ b/catalog-rest-service/src/main/resources/json/schema/entity/data/dashboard.json
@@ -12,9 +12,7 @@
     },
     "name": {
       "description": "Name that identifies this dashboard.",
-      "type": "string",
-      "minLength": 1,
-      "maxLength": 128
+      "$ref": "../../type/basic.json#/definitions/entityName"
     },
     "displayName": {
       "description": "Display Name that identifies this Dashboard. It could be title or label from the source services.",
diff --git a/catalog-rest-service/src/main/resources/json/schema/entity/data/database.json b/catalog-rest-service/src/main/resources/json/schema/entity/data/database.json
index 2aaffa4dc0a..ee7d876a2f5 100644
--- a/catalog-rest-service/src/main/resources/json/schema/entity/data/database.json
+++ b/catalog-rest-service/src/main/resources/json/schema/entity/data/database.json
@@ -8,9 +8,7 @@
   "definitions": {
     "databaseName": {
       "description": "Name that identifies the database.",
-      "type": "string",
-      "minLength": 1,
-      "maxLength": 128
+      "$ref": "../../type/basic.json#/definitions/entityName"
     }
   },
   "properties": {
diff --git a/catalog-rest-service/src/main/resources/json/schema/entity/data/glossary.json b/catalog-rest-service/src/main/resources/json/schema/entity/data/glossary.json
index 83307f26a08..d5c721b649a 100644
--- a/catalog-rest-service/src/main/resources/json/schema/entity/data/glossary.json
+++ b/catalog-rest-service/src/main/resources/json/schema/entity/data/glossary.json
@@ -7,9 +7,7 @@
   "definitions": {
     "name": {
       "description": "Name that identifies a glossary term.",
-      "type": "string",
-      "minLength": 1,
-      "maxLength": 128
+      "$ref": "../../type/basic.json#/definitions/entityName"
     }
   },
   "properties": {
diff --git a/catalog-rest-service/src/main/resources/json/schema/entity/data/glossaryTerm.json b/catalog-rest-service/src/main/resources/json/schema/entity/data/glossaryTerm.json
index 8452f3efd0b..d1cf930a297 100644
--- a/catalog-rest-service/src/main/resources/json/schema/entity/data/glossaryTerm.json
+++ b/catalog-rest-service/src/main/resources/json/schema/entity/data/glossaryTerm.json
@@ -7,9 +7,7 @@
   "definitions": {
     "name": {
       "description": "Name that identifies a glossary term.",
-      "type": "string",
-      "minLength": 1,
-      "maxLength": 128
+      "$ref": "../../type/basic.json#/definitions/entityName"
     },
     "termReference": {
       "type": "object",
diff --git a/catalog-rest-service/src/main/resources/json/schema/entity/data/location.json b/catalog-rest-service/src/main/resources/json/schema/entity/data/location.json
index 93cb32fb5d3..0475e273d97 100644
--- a/catalog-rest-service/src/main/resources/json/schema/entity/data/location.json
+++ b/catalog-rest-service/src/main/resources/json/schema/entity/data/location.json
@@ -8,9 +8,7 @@
   "definitions": {
     "locationName": {
       "description": "Local name (not fully qualified name) of a location.",
-      "type": "string",
-      "minLength": 1,
-      "maxLength": 128
+      "$ref": "../../type/basic.json#/definitions/entityName"
     },
     "locationType": {
       "javaType": "org.openmetadata.catalog.type.LocationType",
diff --git a/catalog-rest-service/src/main/resources/json/schema/entity/data/metrics.json b/catalog-rest-service/src/main/resources/json/schema/entity/data/metrics.json
index 034561e3188..dca324d34cf 100644
--- a/catalog-rest-service/src/main/resources/json/schema/entity/data/metrics.json
+++ b/catalog-rest-service/src/main/resources/json/schema/entity/data/metrics.json
@@ -12,9 +12,7 @@
     },
     "name": {
       "description": "Name that identifies this metrics instance uniquely.",
-      "type": "string",
-      "minLength": 1,
-      "maxLength": 128
+      "$ref": "../../type/basic.json#/definitions/entityName"
     },
     "fullyQualifiedName": {
       "description": "A unique name that identifies a metric in the format 'ServiceName.MetricName'.",
diff --git a/catalog-rest-service/src/main/resources/json/schema/entity/data/mlmodel.json b/catalog-rest-service/src/main/resources/json/schema/entity/data/mlmodel.json
index 925597f55df..66cab81b806 100644
--- a/catalog-rest-service/src/main/resources/json/schema/entity/data/mlmodel.json
+++ b/catalog-rest-service/src/main/resources/json/schema/entity/data/mlmodel.json
@@ -155,9 +155,7 @@
     },
     "name": {
       "description": "Name that identifies this ML Model.",
-      "type": "string",
-      "minLength": 1,
-      "maxLength": 128
+      "$ref": "../../type/basic.json#/definitions/entityName"
     },
     "fullyQualifiedName": {
       "description": "A unique name that identifies an ML Model.",
diff --git a/catalog-rest-service/src/main/resources/json/schema/entity/data/pipeline.json b/catalog-rest-service/src/main/resources/json/schema/entity/data/pipeline.json
index d3e78a9473d..459f1d3692e 100644
--- a/catalog-rest-service/src/main/resources/json/schema/entity/data/pipeline.json
+++ b/catalog-rest-service/src/main/resources/json/schema/entity/data/pipeline.json
@@ -130,9 +130,7 @@
     },
     "name": {
       "description": "Name that identifies this pipeline instance uniquely.",
-      "type": "string",
-      "minLength": 1,
-      "maxLength": 128
+      "$ref": "../../type/basic.json#/definitions/entityName"
     },
     "displayName": {
       "description": "Display Name that identifies this Pipeline. It could be title or label from the source services.",
diff --git a/catalog-rest-service/src/main/resources/json/schema/entity/data/report.json b/catalog-rest-service/src/main/resources/json/schema/entity/data/report.json
index e32ee1b2090..6c0f644c5a1 100644
--- a/catalog-rest-service/src/main/resources/json/schema/entity/data/report.json
+++ b/catalog-rest-service/src/main/resources/json/schema/entity/data/report.json
@@ -12,9 +12,7 @@
     },
     "name": {
       "description": "Name that identifies this report instance uniquely.",
-      "type": "string",
-      "minLength": 1,
-      "maxLength": 128
+      "$ref": "../../type/basic.json#/definitions/entityName"
     },
     "fullyQualifiedName": {
       "description": "A unique name that identifies a report in the format 'ServiceName.ReportName'.",
diff --git a/catalog-rest-service/src/main/resources/json/schema/entity/data/table.json b/catalog-rest-service/src/main/resources/json/schema/entity/data/table.json
index 26c0fead0b4..e13d4481d04 100644
--- a/catalog-rest-service/src/main/resources/json/schema/entity/data/table.json
+++ b/catalog-rest-service/src/main/resources/json/schema/entity/data/table.json
@@ -118,9 +118,7 @@
     },
     "tableName": {
       "description": "Local name (not fully qualified name) of a table. Dots will be escaped automatically.",
-      "type": "string",
-      "minLength": 1,
-      "maxLength": 128
+      "$ref": "../../type/basic.json#/definitions/entityName"
     },
     "fullyQualifiedColumnName": {
       "description": "Fully qualified name of the column that includes `serviceName.databaseName.tableName.columnName[.nestedColumnName]`. When columnName is null for dataType struct fields, `field_#` where `#` is field index is used. For map dataType, for key the field name `key` is used and for the value field `value` is used.",
diff --git a/catalog-rest-service/src/main/resources/json/schema/entity/data/topic.json b/catalog-rest-service/src/main/resources/json/schema/entity/data/topic.json
index 47f26137cc9..93a63d0285e 100644
--- a/catalog-rest-service/src/main/resources/json/schema/entity/data/topic.json
+++ b/catalog-rest-service/src/main/resources/json/schema/entity/data/topic.json
@@ -7,10 +7,7 @@
   "definitions": {
     "topicName": {
       "description": "Name that identifies a topic.",
-      "type": "string",
-      "javaType": "org.openmetadata.catalog.type.topic.TopicName",
-      "minLength": 1,
-      "maxLength": 128
+      "$ref": "../../type/basic.json#/definitions/entityName"
     },
     "schemaType": {
       "description": "Schema type used for the message.",
diff --git a/catalog-rest-service/src/main/resources/json/schema/entity/events/webhook.json b/catalog-rest-service/src/main/resources/json/schema/entity/events/webhook.json
index 84252ec43d8..d7b31aa2605 100644
--- a/catalog-rest-service/src/main/resources/json/schema/entity/events/webhook.json
+++ b/catalog-rest-service/src/main/resources/json/schema/entity/events/webhook.json
@@ -12,9 +12,7 @@
     },
     "name": {
       "description": "Unique name of the application receiving webhook events.",
-      "type": "string",
-      "minLength": 1,
-      "maxLength": 128
+      "$ref": "../../type/basic.json#/definitions/entityName"
     },
     "displayName": {
       "description": "Display Name that identifies this webhook.",
diff --git a/catalog-rest-service/src/main/resources/json/schema/entity/policies/policy.json b/catalog-rest-service/src/main/resources/json/schema/entity/policies/policy.json
index 02f340f64f0..fa1d3ffd69a 100644
--- a/catalog-rest-service/src/main/resources/json/schema/entity/policies/policy.json
+++ b/catalog-rest-service/src/main/resources/json/schema/entity/policies/policy.json
@@ -7,9 +7,7 @@
   "definitions": {
     "policyName": {
       "description": "Name that identifies this Policy.",
-      "type": "string",
-      "minLength": 1,
-      "maxLength": 128
+      "$ref": "../../type/basic.json#/definitions/entityName"
     },
     "policyType": {
       "javaType": "org.openmetadata.catalog.type.PolicyType",
diff --git a/catalog-rest-service/src/main/resources/json/schema/entity/teams/role.json b/catalog-rest-service/src/main/resources/json/schema/entity/teams/role.json
index ac7faa1aeeb..5ed1b2e897d 100644
--- a/catalog-rest-service/src/main/resources/json/schema/entity/teams/role.json
+++ b/catalog-rest-service/src/main/resources/json/schema/entity/teams/role.json
@@ -7,9 +7,7 @@
   "definitions": {
     "roleName": {
       "description": "A unique name for the role.",
-      "type": "string",
-      "minLength": 1,
-      "maxLength": 128
+      "$ref": "../../type/basic.json#/definitions/entityName"
     }
   },
   "properties": {
diff --git a/catalog-rest-service/src/main/resources/json/schema/entity/teams/team.json b/catalog-rest-service/src/main/resources/json/schema/entity/teams/team.json
index 1985c4ecc75..9198e607b32 100644
--- a/catalog-rest-service/src/main/resources/json/schema/entity/teams/team.json
+++ b/catalog-rest-service/src/main/resources/json/schema/entity/teams/team.json
@@ -7,9 +7,7 @@
   "definitions": {
     "teamName": {
       "description": "A unique name of the team typically the team ID from an identity provider. Example - group Id from LDAP.",
-      "type": "string",
-      "minLength": 1,
-      "maxLength": 128
+      "$ref": "../../type/basic.json#/definitions/entityName"
     }
   },
   "properties": {
diff --git a/catalog-rest-service/src/main/resources/json/schema/entity/teams/user.json b/catalog-rest-service/src/main/resources/json/schema/entity/teams/user.json
index 32aa9caeeb6..4e15611cda8 100644
--- a/catalog-rest-service/src/main/resources/json/schema/entity/teams/user.json
+++ b/catalog-rest-service/src/main/resources/json/schema/entity/teams/user.json
@@ -8,9 +8,7 @@
   "definitions": {
     "userName": {
       "description": "A unique name of the user, typically the user ID from an identity provider. Example - uid from LDAP.",
-      "type": "string",
-      "minLength": 1,
-      "maxLength": 128
+      "$ref": "../../type/basic.json#/definitions/entityName"
     }
   },
 
diff --git a/catalog-rest-service/src/main/resources/json/schema/operations/pipelines/airflowPipeline.json b/catalog-rest-service/src/main/resources/json/schema/operations/pipelines/airflowPipeline.json
index cb7295fde4b..326747ff670 100644
--- a/catalog-rest-service/src/main/resources/json/schema/operations/pipelines/airflowPipeline.json
+++ b/catalog-rest-service/src/main/resources/json/schema/operations/pipelines/airflowPipeline.json
@@ -58,9 +58,7 @@
     },
     "name": {
       "description": "Name that identifies this pipeline instance uniquely.",
-      "type": "string",
-      "minLength": 1,
-      "maxLength": 128
+      "$ref": "../../type/basic.json#/definitions/entityName"
     },
     "displayName": {
       "description": "Display Name that identifies this Pipeline.",
diff --git a/catalog-rest-service/src/main/resources/json/schema/tests/columnTest.json b/catalog-rest-service/src/main/resources/json/schema/tests/columnTest.json
index 53fdd02669b..65c34ef57fa 100644
--- a/catalog-rest-service/src/main/resources/json/schema/tests/columnTest.json
+++ b/catalog-rest-service/src/main/resources/json/schema/tests/columnTest.json
@@ -58,9 +58,7 @@
     },
     "name": {
       "description": "Name that identifies this test case. Name passed by client will be  overridden by  auto generating based on table/column name and test name",
-      "type": "string",
-      "minLength": 1,
-      "maxLength": 128
+      "$ref": "../type/basic.json#/definitions/entityName"
     },
     "description": {
       "description": "Description of the testcase.",
diff --git a/catalog-rest-service/src/main/resources/json/schema/tests/customMetric.json b/catalog-rest-service/src/main/resources/json/schema/tests/customMetric.json
index ba469a69978..12b2cbf68e5 100644
--- a/catalog-rest-service/src/main/resources/json/schema/tests/customMetric.json
+++ b/catalog-rest-service/src/main/resources/json/schema/tests/customMetric.json
@@ -12,9 +12,7 @@
     },
     "name": {
       "description": "Name that identifies this Custom Metric.",
-      "type": "string",
-      "minLength": 1,
-      "maxLength": 128
+      "$ref": "../type/basic.json#/definitions/entityName"
     },
     "description": {
       "description": "Description of the Metric.",
diff --git a/catalog-rest-service/src/main/resources/json/schema/tests/table/tableColumnCountToEqual.json b/catalog-rest-service/src/main/resources/json/schema/tests/table/tableColumnCountToEqual.json
index 8b82c4b9f7f..10b55f224d7 100644
--- a/catalog-rest-service/src/main/resources/json/schema/tests/table/tableColumnCountToEqual.json
+++ b/catalog-rest-service/src/main/resources/json/schema/tests/table/tableColumnCountToEqual.json
@@ -2,7 +2,7 @@
   "$id": "https://open-metadata.org/schema/tests/tableColumnCountToEqual.json",
   "$schema": "http://json-schema.org/draft-07/schema#",
   "title": "TableColumnCountToEqual",
-  "description": "This scheam defines the test TableColumnCountToEqual. Test the number of columns equal to a value.",
+  "description": "This schema defines the test TableColumnCountToEqual. Test the number of columns equal to a value.",
   "type": "object",
   "javaType": "org.openmetadata.catalog.tests.table.TableColumnCountToEqual",
   "properties": {
diff --git a/catalog-rest-service/src/main/resources/json/schema/tests/table/tableRowCountToBeBetween.json b/catalog-rest-service/src/main/resources/json/schema/tests/table/tableRowCountToBeBetween.json
index dc732a2df54..6553cb2ada6 100644
--- a/catalog-rest-service/src/main/resources/json/schema/tests/table/tableRowCountToBeBetween.json
+++ b/catalog-rest-service/src/main/resources/json/schema/tests/table/tableRowCountToBeBetween.json
@@ -2,7 +2,7 @@
   "$id": "https://open-metadata.org/schema/tests/tableRowCountToBeBetween.json",
   "$schema": "http://json-schema.org/draft-07/schema#",
   "title": "TableRowCountToBeBetween",
-  "description": "This scheam defines the test TableRowCountToBeBetween. Test the number of rows to between to two values.",
+  "description": "This schema defines the test TableRowCountToBeBetween. Test the number of rows to between to two values.",
   "type": "object",
   "javaType": "org.openmetadata.catalog.tests.table.TableRowCountToBeBetween",
   "properties": {
diff --git a/catalog-rest-service/src/main/resources/json/schema/tests/tableTest.json b/catalog-rest-service/src/main/resources/json/schema/tests/tableTest.json
index 6b242bd76b6..92a51c03b36 100644
--- a/catalog-rest-service/src/main/resources/json/schema/tests/tableTest.json
+++ b/catalog-rest-service/src/main/resources/json/schema/tests/tableTest.json
@@ -42,9 +42,7 @@
     },
     "name": {
       "description": "Name that identifies this test case.",
-      "type": "string",
-      "minLength": 1,
-      "maxLength": 128
+      "$ref": "../type/basic.json#/definitions/entityName"
     },
     "description": {
       "description": "Description of the testcase.",