diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/DOMCompletionProposalComputer.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/DOMCompletionProposalComputer.java
index 2936d79b89f..1b907199e98 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/DOMCompletionProposalComputer.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/DOMCompletionProposalComputer.java
@@ -703,7 +703,7 @@ public class DOMCompletionProposalComputer extends ParsingBasedProposalComputer
 
 		// Get all variables declared in the translation unit.
 		final Set<IBinding> declaredVariables = new HashSet<>();
-		ast.accept(new NameVisitor() {
+		ast.accept(new ASTVisitor(true) {
 	        @Override
 			public int visit(IASTName name) {
 	        	if (getNodeOffset(name) >= statementOffset)
@@ -715,7 +715,7 @@ public class DOMCompletionProposalComputer extends ParsingBasedProposalComputer
 						declaredVariables.add(binding);
 					}
 	        	}
-	            return PROCESS_CONTINUE;
+	            return PROCESS_SKIP; // Do non visit internals of qualified names.
 	        }
 		});
 
@@ -954,10 +954,4 @@ public class DOMCompletionProposalComputer extends ParsingBasedProposalComputer
 	private static IPreferenceStore getPreferenceStore() {
 		return CUIPlugin.getDefault().getPreferenceStore();
 	}
-
-    private static abstract class NameVisitor extends ASTVisitor {
-    	NameVisitor() {
-            shouldVisitNames = true;
-    	}
-    }
 }