diff --git a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/internal/core/SafeStringInterner.java b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/internal/core/SafeStringInterner.java
index a7aeb8c3cd0..29349fe812a 100644
--- a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/internal/core/SafeStringInterner.java
+++ b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/internal/core/SafeStringInterner.java
@@ -55,10 +55,6 @@ public class SafeStringInterner {
 	
 	/**
 	 * Returns a new version of the map such that all string keys and values are interned.
-	 * 
-	 * @param <T>
-	 * @param <M>
-	 * @param map
 	 * @return The map, after modification.
 	 */
 	@SuppressWarnings("unchecked")
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/IndexToASTNameHelper.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/IndexToASTNameHelper.java
index 88b961e1c6b..ae56eb1905d 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/IndexToASTNameHelper.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/IndexToASTNameHelper.java
@@ -141,10 +141,10 @@ class BindingToAstNameMatcher extends ASTVisitor {
 	}
 
 	private boolean isEquivalent(IASTName candidate) {
-		return CharArrayUtils.equals(candidate.getLookupKey(), toFindName) && bindingToFind.equals(index.adaptBinding(candidate.resolveBinding()));
+		return CharArrayUtils.equals(candidate.getSimpleID(), toFindName) && bindingToFind.equals(index.adaptBinding(candidate.resolveBinding()));
 	}
 
 	public List<IASTName> getMatches() {
 		return results;
 	}
-};
+}