diff --git a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/data/DataRepositorySymbolProvider.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/data/DataRepositorySymbolProvider.java
index d0032cd8e..c49ff5b0e 100644
--- a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/data/DataRepositorySymbolProvider.java
+++ b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/data/DataRepositorySymbolProvider.java
@@ -207,10 +207,9 @@ public class DataRepositorySymbolProvider implements SymbolProvider {
 		symbolLabel.append(beanName);
 		symbolLabel.append('\'');
 
-		markerString = markerString != null && markerString.length() > 0 ? " (" + markerString + ") " : " ";
+		markerString = markerString != null && markerString.length() > 0 ? " Repository(" + markerString + ")" : "";
 		symbolLabel.append(markerString);
 
-		symbolLabel.append(beanType);
 		return symbolLabel.toString();
 	}
 
diff --git a/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/data/test/DataRepositorySymbolProviderTest.java b/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/data/test/DataRepositorySymbolProviderTest.java
index f630c0c83..328cbf88b 100644
--- a/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/data/test/DataRepositorySymbolProviderTest.java
+++ b/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/data/test/DataRepositorySymbolProviderTest.java
@@ -69,7 +69,7 @@ public class DataRepositorySymbolProviderTest {
         String docUri = directory.toPath().resolve("src/main/java/org/test/CustomerRepository.java").toUri().toString();
         List<? extends WorkspaceSymbol> symbols = indexer.getSymbols(docUri);
         assertEquals(1, symbols.size());
-        assertTrue(containsSymbol(symbols, "@+ 'customerRepository' (Customer) Repository<Customer,Long>", docUri, 6, 17, 6, 35));
+        assertTrue(containsSymbol(symbols, "@+ 'customerRepository' Repository(Customer)", docUri, 6, 17, 6, 35));
     }
 
     @Test
@@ -87,7 +87,7 @@ public class DataRepositorySymbolProviderTest {
         String docUri = directory.toPath().resolve("src/main/java/org/test/CustomerRepository.java").toUri().toString();
         List<? extends DocumentSymbol> symbols = indexer.getDocumentSymbolsFromMetamodelIndex(docUri);
         assertEquals(1, symbols.size());
-        assertTrue(containsDocumentSymbol(symbols, "@+ 'customerRepository' (Customer) Repository<Customer,Long>", docUri, 6, 17, 6, 35));
+        assertTrue(containsDocumentSymbol(symbols, "@+ 'customerRepository' Repository(Customer)", docUri, 6, 17, 6, 35));
         
         DocumentSymbol documentSymbol = symbols.get(0);
         List<DocumentSymbol> children = documentSymbol.getChildren();
@@ -102,7 +102,7 @@ public class DataRepositorySymbolProviderTest {
         String docUri = directory.toPath().resolve("src/main/java/org/test/CustomerRepositoryWithQuery.java").toUri().toString();
         List<? extends DocumentSymbol> symbols = indexer.getDocumentSymbolsFromMetamodelIndex(docUri);
         assertEquals(1, symbols.size());
-        assertTrue(containsDocumentSymbol(symbols, "@+ 'customerRepositoryWithQuery' (Customer) Repository<Customer,Long>", docUri, 7, 17, 7, 44));
+        assertTrue(containsDocumentSymbol(symbols, "@+ 'customerRepositoryWithQuery' Repository(Customer)", docUri, 7, 17, 7, 44));
         
         DocumentSymbol documentSymbol = symbols.get(0);
         List<DocumentSymbol> children = documentSymbol.getChildren();