diff --git a/headless-services/commons/commons-lsp-extensions/src/main/java/org/springframework/ide/vscode/commons/protocol/spring/SpringModelLanguageClient.java b/headless-services/commons/commons-lsp-extensions/src/main/java/org/springframework/ide/vscode/commons/protocol/spring/SpringModelLanguageClient.java
index a1b8cdb5f..089649e77 100644
--- a/headless-services/commons/commons-lsp-extensions/src/main/java/org/springframework/ide/vscode/commons/protocol/spring/SpringModelLanguageClient.java
+++ b/headless-services/commons/commons-lsp-extensions/src/main/java/org/springframework/ide/vscode/commons/protocol/spring/SpringModelLanguageClient.java
@@ -15,7 +15,7 @@ import org.eclipse.lsp4j.services.LanguageClient;
 
 public interface SpringModelLanguageClient extends LanguageClient {
 	
-	@JsonNotification("spring/model/updated")
-	void modelUpdated();
+	@JsonNotification("spring/index/updated")
+	void indexUpdated();
 
 }
diff --git a/headless-services/commons/commons-lsp-extensions/src/main/java/org/springframework/ide/vscode/commons/protocol/spring/SpringModelService.java b/headless-services/commons/commons-lsp-extensions/src/main/java/org/springframework/ide/vscode/commons/protocol/spring/SpringModelService.java
index df893cf0a..40100b860 100644
--- a/headless-services/commons/commons-lsp-extensions/src/main/java/org/springframework/ide/vscode/commons/protocol/spring/SpringModelService.java
+++ b/headless-services/commons/commons-lsp-extensions/src/main/java/org/springframework/ide/vscode/commons/protocol/spring/SpringModelService.java
@@ -16,7 +16,7 @@ import java.util.concurrent.CompletableFuture;
 import org.eclipse.lsp4j.jsonrpc.services.JsonRequest;
 import org.eclipse.lsp4j.jsonrpc.services.JsonSegment;
 
-@JsonSegment("spring")
+@JsonSegment("spring/index")
 public interface SpringModelService {
 
 	@JsonRequest
diff --git a/vscode-extensions/vscode-spring-boot/lib/apiManager.ts b/vscode-extensions/vscode-spring-boot/lib/apiManager.ts
index 7702b86cc..d1c26c977 100644
--- a/vscode-extensions/vscode-spring-boot/lib/apiManager.ts
+++ b/vscode-extensions/vscode-spring-boot/lib/apiManager.ts
@@ -63,7 +63,7 @@ export class ApiManager {
 
         client.onNotification(SpringModelUpdatedNotification.type, () => this.onSpringModelUpdateEmitter.fire());
 
-        const beansRequestType = new RequestType<BeansParams, Bean[], void>('spring/beans');
+        const beansRequestType = new RequestType<BeansParams, Bean[], void>('spring/index/beans');
         const beans = (params: BeansParams) => {
             return client.sendRequest(beansRequestType, params);
         }
diff --git a/vscode-extensions/vscode-spring-boot/lib/notification.ts b/vscode-extensions/vscode-spring-boot/lib/notification.ts
index 3194d8363..cd73b2546 100644
--- a/vscode-extensions/vscode-spring-boot/lib/notification.ts
+++ b/vscode-extensions/vscode-spring-boot/lib/notification.ts
@@ -39,5 +39,5 @@ export namespace LiveProcessMemoryMetricsUpdatedNotification {
 }
 
 export namespace SpringModelUpdatedNotification {
-	export const type = new NotificationType<void>('spring/model/updated');
+	export const type = new NotificationType<void>('spring/index/updated');
 }
\ No newline at end of file