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 3e54522bf5b..574604a0113 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
@@ -33,7 +33,7 @@
     },
     "target": {
       "description": "For supervised ML Models, the value to estimate.",
-      "$ref": "../../entity/data/mlmodel.json#/definitions/featureName"
+      "$ref": "../../type/basic.json#/definitions/entityName"
     },
     "mlHyperParameters": {
       "description": "Hyper Parameters used to train the ML Model.",
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 001bba33634..925597f55df 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
@@ -35,22 +35,6 @@
         "boolean"
       ]
     },
-    "featureName": {
-      "description": "Local name (not fully qualified name) of the ML Feature.",
-      "$ref": "../../type/basic.json#/definitions/entityName"
-    },
-    "featureSourceName": {
-      "description": "Local name (not fully qualified name) of a ML Feature source.",
-      "$ref": "../../type/basic.json#/definitions/entityName"
-    },
-    "fullyQualifiedFeatureSourceName": {
-      "description": "Fully qualified name of the ML Feature Source that includes `serviceName.[databaseName].tableName/fileName/apiName.columnName[.nestedColumnName]`.",
-      "$ref": "../../type/basic.json#/definitions/fullyQualifiedEntityName"
-    },
-    "fullyQualifiedFeatureName": {
-      "description": "Fully qualified name of the ML Feature that includes `modelName.featureName`.",
-      "$ref": "../../type/basic.json#/definitions/fullyQualifiedEntityName"
-    },
     "featureSource": {
       "type": "object",
       "javaType": "org.openmetadata.catalog.type.MlFeatureSource",
@@ -58,7 +42,7 @@
       "additionalProperties": false,
       "properties": {
         "name": {
-          "$ref": "#/definitions/featureSourceName"
+          "$ref": "../../type/basic.json#/definitions/entityName"
         },
         "dataType": {
           "description": "Data type of the source (int, date etc.).",
@@ -69,7 +53,7 @@
           "type": "string"
         },
         "fullyQualifiedName": {
-          "$ref": "#/definitions/fullyQualifiedFeatureSourceName"
+          "$ref": "../../type/basic.json#/definitions/fullyQualifiedEntityName"
         },
         "dataSource": {
           "description": "Description of the Data Source (e.g., a Table).",
@@ -92,7 +76,7 @@
       "additionalProperties": false,
       "properties": {
         "name": {
-          "$ref": "#/definitions/featureName"
+          "$ref": "../../type/basic.json#/definitions/entityName"
         },
         "dataType": {
           "description": "Data type of the column (numerical vs. categorical).",
@@ -103,7 +87,7 @@
           "type": "string"
         },
         "fullyQualifiedName": {
-          "$ref": "#/definitions/fullyQualifiedFeatureName"
+          "$ref": "../../type/basic.json#/definitions/fullyQualifiedEntityName"
         },
         "featureSources": {
           "description": "Columns used to create the ML Feature.",
@@ -209,7 +193,7 @@
     },
     "target": {
       "description": "For supervised ML Models, the value to estimate.",
-      "$ref": "#/definitions/featureName"
+      "$ref": "../../type/basic.json#/definitions/entityName"
     },
     "dashboard": {
       "description": "Performance Dashboard URL to track metric evolution.",
diff --git a/ingestion-core/src/metadata/_version.py b/ingestion-core/src/metadata/_version.py
index 79cb30c0592..c94d8ac4e36 100644
--- a/ingestion-core/src/metadata/_version.py
+++ b/ingestion-core/src/metadata/_version.py
@@ -7,5 +7,5 @@ Provides metadata version information.
 
 from incremental import Version
 
-__version__ = Version("metadata", 0, 9, 0, dev=6)
+__version__ = Version("metadata", 0, 9, 0, dev=7)
 __all__ = ["__version__"]