--- old/modules/javafx.base/src/main/java/com/sun/javafx/property/MethodHelper.java	2017-05-03 15:01:43.521586109 -0700
+++ new/modules/javafx.base/src/main/java/com/sun/javafx/property/MethodHelper.java	2017-05-03 15:01:43.397586107 -0700
@@ -61,7 +61,7 @@
             if (!module.isExported(packageName)) {
                 if (!module.isOpen(packageName, thisModule)) {
                     throw new IllegalAccessException(
-                            "class " + MethodHelper.class.getName()
+                            "module " + thisModule.getName()
                             + " cannot access class " + clazz.getName()
                             + " (in module " + module.getName()
                             + ") because module " + module.getName()
--- old/modules/javafx.base/src/main/java/com/sun/javafx/reflect/MethodUtil.java	2017-05-03 15:01:43.913586116 -0700
+++ new/modules/javafx.base/src/main/java/com/sun/javafx/reflect/MethodUtil.java	2017-05-03 15:01:43.797586114 -0700
@@ -89,13 +89,15 @@
         super();
     }
 
-    public static Method getMethod(Class<?> cls, String name, Class<?>[] args)
+    /*public*/
+    static Method getMethod(Class<?> cls, String name, Class<?>[] args)
         throws NoSuchMethodException {
         ReflectUtil.checkPackageAccess(cls);
         return cls.getMethod(name, args);
     }
 
-    public static Method[] getMethods(Class<?> cls) {
+    /*public*/
+    static Method[] getMethods(Class<?> cls) {
         ReflectUtil.checkPackageAccess(cls);
         return cls.getMethods();
     }
@@ -106,7 +108,8 @@
      * Class.getMethods() and walking towards Object until
      * we're done.
      */
-     public static Method[] getPublicMethods(Class<?> cls) {
+    /*public*/
+    static Method[] getPublicMethods(Class<?> cls) {
         // compatibility for update release
         if (System.getSecurityManager() == null) {
             return cls.getMethods();
--- old/modules/javafx.fxml/src/main/java/com/sun/javafx/fxml/MethodHelper.java	2017-05-03 15:01:44.309586124 -0700
+++ new/modules/javafx.fxml/src/main/java/com/sun/javafx/fxml/MethodHelper.java	2017-05-03 15:01:44.193586122 -0700
@@ -61,7 +61,7 @@
             if (!module.isExported(packageName)) {
                 if (!module.isOpen(packageName, thisModule)) {
                     throw new IllegalAccessException(
-                            "class " + MethodHelper.class.getName()
+                            "module " + thisModule.getName()
                             + " cannot access class " + clazz.getName()
                             + " (in module " + module.getName()
                             + ") because module " + module.getName()
--- old/modules/javafx.web/src/main/java/com/sun/webkit/MethodHelper.java	2017-05-03 15:01:44.709586132 -0700
+++ new/modules/javafx.web/src/main/java/com/sun/webkit/MethodHelper.java	2017-05-03 15:01:44.589586129 -0700
@@ -61,7 +61,7 @@
             if (!module.isExported(packageName)) {
                 if (!module.isOpen(packageName, thisModule)) {
                     throw new IllegalAccessException(
-                            "class " + MethodHelper.class.getName()
+                            "module " + thisModule.getName()
                             + " cannot access class " + clazz.getName()
                             + " (in module " + module.getName()
                             + ") because module " + module.getName()