diff -r 81f6e7778135 -r 84c05018e079 javap/src/main/java/org/apidesign/javap/ClassData.java
--- a/javap/src/main/java/org/apidesign/javap/ClassData.java	Thu Dec 06 21:31:09 2012 +0100
+++ b/javap/src/main/java/org/apidesign/javap/ClassData.java	Wed Dec 12 18:18:07 2012 +0100
@@ -554,14 +554,14 @@
             return in.toString();
         }
         case CONSTANT_CLASS:
-            String jn = javaName(getClassName(cpx));
+            String jn = getClassName(cpx);
             if (textual) {
                 if (refs != null) {
                     refs[0] = jn;
                 }
                 return jn;
             }
-            return jn;
+            return javaName(jn);
         case CONSTANT_STRING:
             String sv = stringValue(((CPX)x).cpx, textual);
             if (textual) {