diff -r 2c33418a6d57 -r 83b611b88ac8 jdk/test/java/lang/Class/forName/modules/TestLayer.java
--- a/jdk/test/java/lang/Class/forName/modules/TestLayer.java	Thu Apr 06 17:01:03 2017 +0000
+++ b/jdk/test/java/lang/Class/forName/modules/TestLayer.java	Fri Apr 07 08:05:54 2017 +0000
@@ -23,9 +23,7 @@
 
 import java.lang.module.Configuration;
 import java.lang.module.ModuleFinder;
-import java.lang.reflect.Layer;
 import java.lang.reflect.Method;
-import java.lang.reflect.Module;
 import java.net.URL;
 import java.net.URLClassLoader;
 import java.nio.file.Path;
@@ -45,13 +43,13 @@
 
         ModuleFinder finder = ModuleFinder.of(MODS_DIR);
 
-        Configuration parent = Layer.boot().configuration();
+        Configuration parent = ModuleLayer.boot().configuration();
         Configuration cf = parent.resolveAndBind(ModuleFinder.of(),
                                                  finder,
                                                  modules);
 
         ClassLoader scl = ClassLoader.getSystemClassLoader();
-        Layer layer = Layer.boot().defineModulesWithManyLoaders(cf, scl);
+        ModuleLayer layer = ModuleLayer.boot().defineModulesWithManyLoaders(cf, scl);
 
         Module m1 = layer.findModule("m1").get();
         Module m2 = layer.findModule("m2").get();