diff --git a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/autowired/AutowiredHoverProvider.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/autowired/AutowiredHoverProvider.java
index b632b3869..3ecfc0562 100644
--- a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/autowired/AutowiredHoverProvider.java
+++ b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/autowired/AutowiredHoverProvider.java
@@ -308,7 +308,7 @@ public class AutowiredHoverProvider implements HoverProvider {
 	}
 
 	private String getId(String beanTypeName) {
-		return BeanUtils.getBeanName(beanTypeName);
+		return BeanUtils.getBeanNameFromType(beanTypeName);
 	}
 
 	@Override
diff --git a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/beans/BeanUtils.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/beans/BeanUtils.java
index 723c84fee..7954b5dcf 100644
--- a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/beans/BeanUtils.java
+++ b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/beans/BeanUtils.java
@@ -14,16 +14,16 @@ import org.springframework.ide.vscode.commons.util.StringUtil;
 
 public class BeanUtils {
 
-	public static String getBeanName(String beanName) {
-		if (StringUtil.hasText(beanName) && beanName.length() > 0 && Character.isUpperCase(beanName.charAt(0))) {
+	public static String getBeanNameFromType(String typeName) {
+		if (StringUtil.hasText(typeName) && typeName.length() > 0 && Character.isUpperCase(typeName.charAt(0))) {
 			// PT 162740382 - Special case: If more than one character is upper case, do not
 			// convert bean name to starting lower case. only convert if name has one character
 			// or the second character in the name is not upper case
-			if (beanName.length() == 1 || !Character.isUpperCase(beanName.charAt(1))) {
-				beanName = Character.toLowerCase(beanName.charAt(0)) + beanName.substring(1);
+			if (typeName.length() == 1 || !Character.isUpperCase(typeName.charAt(1))) {
+				typeName = Character.toLowerCase(typeName.charAt(0)) + typeName.substring(1);
 			}
 		}
-		return beanName;
+		return typeName;
 	}
 
 }
diff --git a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/beans/ComponentSymbolProvider.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/beans/ComponentSymbolProvider.java
index 5dc829e30..66e221afc 100644
--- a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/beans/ComponentSymbolProvider.java
+++ b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/beans/ComponentSymbolProvider.java
@@ -95,7 +95,7 @@ public class ComponentSymbolProvider implements SymbolProvider {
 			TypeDeclaration type = (TypeDeclaration) parent;
 
 			String beanName = type.getName().toString();
-			return BeanUtils.getBeanName(beanName);
+			return BeanUtils.getBeanNameFromType(beanName);
 		}
 		return null;
 	}
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 c6d75a929..b641a02b3 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
@@ -129,7 +129,7 @@ public class DataRepositorySymbolProvider implements SymbolProvider {
 
 	private static String getBeanName(TypeDeclaration typeDeclaration) {
 		String beanName = typeDeclaration.getName().toString();
-		return BeanUtils.getBeanName(beanName);
+		return BeanUtils.getBeanNameFromType(beanName);
 	}
 
 	@Override
diff --git a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/livehover/ComponentInjectionsHoverProvider.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/livehover/ComponentInjectionsHoverProvider.java
index dcd8965f6..8cc525b56 100644
--- a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/livehover/ComponentInjectionsHoverProvider.java
+++ b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/livehover/ComponentInjectionsHoverProvider.java
@@ -83,7 +83,7 @@ public class ComponentInjectionsHoverProvider extends AbstractInjectedIntoHoverP
 				return getBeanType(beanType).toString();
 			}
 
-			return BeanUtils.getBeanName(typeName);
+			return BeanUtils.getBeanNameFromType(typeName);
 		});
 	}
 
diff --git a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/utils/FunctionUtils.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/utils/FunctionUtils.java
index ffb2a12af..5fb16b9f2 100644
--- a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/utils/FunctionUtils.java
+++ b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/utils/FunctionUtils.java
@@ -85,7 +85,7 @@ public class FunctionUtils {
 
 	protected static String getBeanName(TypeDeclaration typeDeclaration) {
 		String beanName = typeDeclaration.getName().toString();
-		return BeanUtils.getBeanName(beanName);
+		return BeanUtils.getBeanNameFromType(beanName);
 	}
 
 	protected static boolean isAbstractClass(TypeDeclaration typeDeclaration, ITypeBinding resolvedType) {