--- old/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/InterfaceFactory.java	2016-05-12 04:24:28.734334578 +0300
+++ new/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/InterfaceFactory.java	2016-05-12 04:24:28.646334579 +0300
@@ -37,7 +37,7 @@
 import jdk.test.lib.jittester.types.TypeKlass;
 import jdk.test.lib.jittester.utils.PseudoRandom;
 
-class InterfaceFactory extends Factory {
+class InterfaceFactory extends Factory<Interface> {
     private final String name;
     private final int memberFunctionsLimit;
     private final int memberFunctionsArgLimit;
@@ -52,7 +52,7 @@
     }
 
     @Override
-    public IRNode produce() throws ProductionFailedException {
+    public Interface produce() throws ProductionFailedException {
         TypeKlass thisKlass;
         // Do we want to inherit something?
         if (!ProductionParams.disableInheritance.value()) {
@@ -76,7 +76,7 @@
             parent.addChild(name);
             for (Symbol symbol : SymbolTable.getAllCombined(parent, FunctionInfo.class)) {
                 FunctionInfo functionInfo = (FunctionInfo) symbol.deepCopy();
-                functionInfo.klass = thisKlass;
+                functionInfo.owner = thisKlass;
                 functionInfo.argTypes.get(0).type = thisKlass;
                 SymbolTable.add(functionInfo);
             }