--- a/hotspot/test/compiler/linkage/CallSites.jasm	Tue Jul 12 08:42:46 2016 +0000
+++ b/hotspot/test/compiler/linkage/CallSites.jasm	Tue Jul 12 18:24:48 2016 +0300
@@ -21,34 +21,34 @@
  * questions.
  *
  */
-super class I
+super class compiler/linkage/I
 version 52:0
 {
 
 }
 
 
-super class CallSites
+super class compiler/linkage/CallSites
 version 52:0
 {
 
     // Non-existent methods.
 
     // I.m1()V vs I.m1(I)V
-    public static Method testI1:"(LI;)V"
+    public static Method testI1:"(Lcompiler/linkage/I;)V"
         stack 1 locals 1
     {
         aload_0;
-        invokeinterface InterfaceMethod I."m1":"()V", 1; // throws NSME
+        invokeinterface InterfaceMethod compiler/linkage/I."m1":"()V", 1; // throws NSME
         return;
     }
 
     // X.m1()V vs X.m1(I)V
-    public static Method testX1:"(LX;)V"
+    public static Method testX1:"(Lcompiler/linkage/X;)V"
         stack 1 locals 1
     {
         aload_0;
-        invokevirtual Method X."m1":"()V"; // throws NSME
+        invokevirtual Method compiler/linkage/X."m1":"()V"; // throws NSME
         return;
     }
 
@@ -58,7 +58,7 @@
         stack 1 locals 0
     {
         iconst_0;
-        invokestatic InterfaceMethod I."m1":"(I)V"; // throws ICCE
+        invokestatic InterfaceMethod compiler/linkage/I."m1":"(I)V"; // throws ICCE
         return;
     }
 
@@ -66,25 +66,25 @@
         stack 1 locals 0
     {
         iconst_0;
-        invokestatic Method X."m1":"(I)V"; // throws ICCE
+        invokestatic Method compiler/linkage/X."m1":"(I)V"; // throws ICCE
         return;
     }
 
     // Virtual invocation of static methods.
 
-    public static Method testI3:"(LI;)V"
+    public static Method testI3:"(Lcompiler/linkage/I;)V"
         stack 1 locals 1
     {
         aload_0;
-        invokeinterface InterfaceMethod I."s1":"()V", 1; // throws ICCE
+        invokeinterface InterfaceMethod compiler/linkage/I."s1":"()V", 1; // throws ICCE
         return;
     }
 
-    public static Method testX3:"(LX;)V"
+    public static Method testX3:"(Lcompiler/linkage/X;)V"
         stack 1 locals 1
     {
         aload_0;
-        invokevirtual Method X."s1":"()V";  // throws ICCE
+        invokevirtual Method compiler/linkage/X."s1":"()V";  // throws ICCE
         return;
     }