--- old/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/Context.java	2017-02-07 13:14:56.129923664 +0000
+++ new/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/Context.java	2017-02-07 13:14:56.025916522 +0000
@@ -1372,7 +1372,7 @@
         };
 
         final Configuration cf = parent.configuration()
-                .resolveRequires(finder, ModuleFinder.of(), Set.of(mn));
+                .resolve(finder, ModuleFinder.of(), Set.of(mn));
 
         final PrivilegedAction<Layer> pa = () -> parent.defineModules(cf, name -> loader);
         final Layer layer = AccessController.doPrivileged(pa, GET_LOADER_ACC_CTXT);
@@ -1798,7 +1798,7 @@
 
         final Layer boot = Layer.boot();
         final Configuration conf = boot.configuration().
-            resolveRequires(mf, ModuleFinder.of(), rootMods);
+            resolve(mf, ModuleFinder.of(), rootMods);
         final String firstMod = rootMods.iterator().next();
         return boot.defineModulesWithOneLoader(conf, cl).findLoader(firstMod);
     }
--- old/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ScriptLoader.java	2017-02-07 13:14:56.529951135 +0000
+++ new/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ScriptLoader.java	2017-02-07 13:14:56.429944267 +0000
@@ -29,6 +29,7 @@
 import java.lang.reflect.Module;
 import java.security.CodeSource;
 import java.util.Objects;
+import java.util.Set;
 
 /**
  * Responsible for loading script generated classes.
@@ -69,12 +70,12 @@
     private Module createModule(final String moduleName) {
         final Module structMod = context.getStructLoader().getModule();
         final ModuleDescriptor.Builder builder =
-            ModuleDescriptor.module(moduleName)
+            ModuleDescriptor.newModule(moduleName)
                     .requires("java.base")
                     .requires("java.logging")
                     .requires(NASHORN_MODULE.getName())
                     .requires(structMod.getName())
-                    .contains(SCRIPTS_PKG);
+                    .packages(Set.of(SCRIPTS_PKG));
 
         if (Context.javaSqlFound) {
             builder.requires("java.sql");
--- old/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/StructureLoader.java	2017-02-07 13:14:56.900976613 +0000
+++ new/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/StructureLoader.java	2017-02-07 13:14:56.795969402 +0000
@@ -33,6 +33,7 @@
 import java.lang.module.ModuleDescriptor;
 import java.lang.reflect.Module;
 import java.security.ProtectionDomain;
+import java.util.Set;
 import jdk.nashorn.internal.codegen.ObjectClassGenerator;
 
 /**
@@ -63,10 +64,10 @@
 
     private Module createModule(final String moduleName) {
         final ModuleDescriptor descriptor
-                = ModuleDescriptor.module(moduleName)
+                = ModuleDescriptor.newModule(moduleName)
                     .requires("java.base")
                     .requires(NASHORN_MODULE.getName())
-                    .contains(SCRIPTS_PKG)
+                    .packages(Set.of(SCRIPTS_PKG))
                     .build();
 
         final Module mod = Context.createModuleTrusted(descriptor, this);