diff --git a/libs/apps/generator/generator.go b/libs/apps/generator/generator.go
index 02a3afbc77..185fd1e811 100644
--- a/libs/apps/generator/generator.go
+++ b/libs/apps/generator/generator.go
@@ -290,7 +290,7 @@ var appResourceSpecs = map[string]appResourceSpec{
 	},
 	"serving_endpoint": {
 		yamlKey:    "serving_endpoint",
-		varFields:  [][2]string{{"id", "name"}},
+		varFields:  [][2]string{{"name", "name"}},
 		permission: "CAN_QUERY",
 	},
 	"experiment": {
diff --git a/libs/apps/generator/generator_test.go b/libs/apps/generator/generator_test.go
index a3a7946fbc..9bd0b99917 100644
--- a/libs/apps/generator/generator_test.go
+++ b/libs/apps/generator/generator_test.go
@@ -392,7 +392,7 @@ func TestGenerateResourceYAMLAllTypes(t *testing.T) {
 			expectContains: []string{
 				"- name: endpoint",
 				"serving_endpoint:",
-				"name: ${var.endpoint_id}",
+				"name: ${var.endpoint_name}",
 				"permission: CAN_QUERY",
 			},
 		},
diff --git a/libs/apps/prompt/listers.go b/libs/apps/prompt/listers.go
index 5ccf818e01..2757539479 100644
--- a/libs/apps/prompt/listers.go
+++ b/libs/apps/prompt/listers.go
@@ -382,7 +382,7 @@ func ListServingEndpoints(ctx context.Context) (*PagedFetcher, error) {
 		if name == "" {
 			name = e.Id
 		}
-		return ListItem{ID: e.Id, Label: name}
+		return ListItem{ID: e.Name, Label: name}
 	}
 	items, hasMore, err := collectN(ctx, iter, pageSize, mapFn)
 	if err != nil {