diff --git a/specification/ai/Azure.AI.Projects/indexes/models.tsp b/specification/ai/Azure.AI.Projects/indexes/models.tsp
index a4f289fd4a44..7bc38e7cb683 100644
--- a/specification/ai/Azure.AI.Projects/indexes/models.tsp
+++ b/specification/ai/Azure.AI.Projects/indexes/models.tsp
@@ -15,11 +15,11 @@ using Azure.Core.Traits;
 namespace Azure.AI.Projects;
 
 @doc("Index resource Definition")
-@discriminator("indexType")
+@discriminator("type")
 @Rest.resource("indexes")
 model Index {
   @doc("Type of index")
-  indexType: IndexType;
+  type: IndexType;
 
   ...AssetBase;
 }
@@ -27,10 +27,10 @@ model Index {
 @doc("Azure AI Search Index Definition")
 model AzureAISearchIndex extends Index {
   @doc("Type of index")
-  indexType: IndexType.azureSearch;
+  type: IndexType.azureSearch;
 
-  @doc("Connection id to Azure AI Search")
-  connectionId: string;
+  @doc("Name of connection to Azure AI Search")
+  connectionName: string;
 
   @doc("Name of index in Azure AI Search resource to attach")
   indexName: string;
@@ -39,7 +39,7 @@ model AzureAISearchIndex extends Index {
 @doc("Managed Azure AI Search Index Definition")
 model ManagedAzureAISearchIndex extends Index {
   @doc("Type of index")
-  indexType: IndexType.managedAzureSearch;
+  type: IndexType.managedAzureSearch;
 
   @doc("Vector store id of managed index")
   vectorStoreId: string;
@@ -48,10 +48,10 @@ model ManagedAzureAISearchIndex extends Index {
 @doc("CosmosDB Vector Store Index Definition")
 model CosmosDBIndex extends Index {
   @doc("Type of index")
-  indexType: IndexType.cosmosDB;
+  type: IndexType.cosmosDB;
 
-  @doc("Connection id to CosmosDB")
-  connectionId: string;
+  @doc("Name of connection to CosmosDB")
+  connectionName: string;
 
   @doc("Name of the CosmosDB Database")
   databaseName: string;
@@ -65,11 +65,8 @@ model CosmosDBIndex extends Index {
 
 @doc("Embedding configuration class")
 model EmbeddingConfiguration {
-  @doc("Connection id to embedding model")
-  connectionId?: string;
-
-  @doc("Deployment name of embedding model")
-  deploymentName: string;
+  @doc("Deployment name of embedding model. It can point to a model deployment either in the parent AIServices or a connection.")
+  modelDeploymentName: string;
 
   @doc("Embedding field")
   embeddingField: string;
diff --git a/specification/ai/data-plane/Azure.AI.Projects/preview/2025-05-01-preview/azure-ai-projects-1dp.json b/specification/ai/data-plane/Azure.AI.Projects/preview/2025-05-01-preview/azure-ai-projects-1dp.json
index ffbd0747b3b6..04c32f288cc2 100644
--- a/specification/ai/data-plane/Azure.AI.Projects/preview/2025-05-01-preview/azure-ai-projects-1dp.json
+++ b/specification/ai/data-plane/Azure.AI.Projects/preview/2025-05-01-preview/azure-ai-projects-1dp.json
@@ -9524,9 +9524,9 @@
       "type": "object",
       "description": "Azure AI Search Index Definition",
       "properties": {
-        "connectionId": {
+        "connectionName": {
           "type": "string",
-          "description": "Connection id to Azure AI Search"
+          "description": "Name of connection to Azure AI Search"
         },
         "indexName": {
           "type": "string",
@@ -9534,7 +9534,7 @@
         }
       },
       "required": [
-        "connectionId",
+        "connectionName",
         "indexName"
       ],
       "allOf": [
@@ -9674,9 +9674,9 @@
       "type": "object",
       "description": "CosmosDB Vector Store Index Definition",
       "properties": {
-        "connectionId": {
+        "connectionName": {
           "type": "string",
-          "description": "Connection id to CosmosDB"
+          "description": "Name of connection to CosmosDB"
         },
         "databaseName": {
           "type": "string",
@@ -9692,7 +9692,7 @@
         }
       },
       "required": [
-        "connectionId",
+        "connectionName",
         "databaseName",
         "containerName",
         "embeddingConfiguration"
@@ -9903,13 +9903,9 @@
       "type": "object",
       "description": "Embedding configuration class",
       "properties": {
-        "connectionId": {
-          "type": "string",
-          "description": "Connection id to embedding model"
-        },
-        "deploymentName": {
+        "modelDeploymentName": {
           "type": "string",
-          "description": "Deployment name of embedding model"
+          "description": "Deployment name of embedding model. It can point to a model deployment either in the parent AIServices or a connection."
         },
         "embeddingField": {
           "type": "string",
@@ -9917,7 +9913,7 @@
         }
       },
       "required": [
-        "deploymentName",
+        "modelDeploymentName",
         "embeddingField"
       ]
     },
@@ -10089,7 +10085,7 @@
       "type": "object",
       "description": "Index resource Definition",
       "properties": {
-        "indexType": {
+        "type": {
           "$ref": "#/definitions/IndexType",
           "description": "Type of index"
         },
@@ -10134,9 +10130,9 @@
           "readOnly": true
         }
       },
-      "discriminator": "indexType",
+      "discriminator": "type",
       "required": [
-        "indexType",
+        "type",
         "name",
         "version"
       ]