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 9b1c5db7e..3e3c4f3d2 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
@@ -125,7 +125,7 @@ public class DataRepositorySymbolProvider extends AbstractSymbolProvider {
 			}
 
 			if (Constants.REPOSITORY_TYPE.equals(simplifiedType)) {
-				String beanName = getBeanName(typeDeclaration);
+				String beanName = BeanUtils.getBeanName(typeDeclaration);
 
 				String domainType = null;
 				if (resolvedInterface.isParameterizedType()) {
@@ -155,9 +155,4 @@ public class DataRepositorySymbolProvider extends AbstractSymbolProvider {
 		}
 	}
 
-	private static String getBeanName(TypeDeclaration typeDeclaration) {
-		String beanName = typeDeclaration.getName().toString();
-		return BeanUtils.getBeanNameFromType(beanName);
-	}
-
 }