diff --git a/org.eclipse.jdt.core.javac/src/org/eclipse/jdt/core/dom/JavacConverter.java b/org.eclipse.jdt.core.javac/src/org/eclipse/jdt/core/dom/JavacConverter.java
index dfe22c0fb24..47150ea8436 100644
--- a/org.eclipse.jdt.core.javac/src/org/eclipse/jdt/core/dom/JavacConverter.java
+++ b/org.eclipse.jdt.core.javac/src/org/eclipse/jdt/core/dom/JavacConverter.java
@@ -424,11 +424,9 @@ private AbstractTypeDeclaration convertClassDecl(JCClassDecl javacClassDecl, AST
 					Iterator<JCExpression> it = javacClassDecl.getImplementsClause().iterator();
 					while(it.hasNext()) {
 						JCExpression next = it.next();
-						if( next instanceof JCFieldAccess jcfa ) {
-							String pack = jcfa.selected == null ? null : jcfa.selected.toString();
-							typeDeclaration.superInterfaces().add(convert(jcfa.name, pack));
-						} else if( next instanceof JCIdent jcid ) {
-							typeDeclaration.superInterfaces().add(convert(jcid.name, null));
+						Name m = toName(next);
+						if( m != null ) {
+							typeDeclaration.superInterfaces().add(m);
 						}
 					}
 				}