--- old/src/jdk.incubator.jpackage/macosx/classes/jdk/incubator/jpackage/internal/MacAppStoreBundler.java	2020-03-23 12:55:54.124273000 -0400
+++ new/src/jdk.incubator.jpackage/macosx/classes/jdk/incubator/jpackage/internal/MacAppStoreBundler.java	2020-03-23 12:55:52.332316700 -0400
@@ -41,9 +41,9 @@
 
     private static final String TEMPLATE_BUNDLE_ICON_HIDPI = "java.icns";
     private final static String DEFAULT_ENTITLEMENTS =
-            "MacAppStore.entitlements";
+            "Mac.entitlements";
     private final static String DEFAULT_INHERIT_ENTITLEMENTS =
-            "MacAppStore_Inherit.entitlements";
+            "Mac_Inherit.entitlements";
 
     public static final BundlerParamInfo<String> MAC_APP_STORE_APP_SIGNING_KEY =
             new StandardBundlerParam<>(
@@ -94,13 +94,22 @@
             },
             (s, p) -> s);
 
-    public static final StandardBundlerParam<File> MAC_APP_STORE_ENTITLEMENTS  =
+/*
+    public static final StandardBundlerParam<File> MAC_ENTITLEMENTS  =
             new StandardBundlerParam<>(
-            Arguments.CLIOptions.MAC_APP_STORE_ENTITLEMENTS.getId(),
+            Arguments.CLIOptions.MAC_ENTITLEMENTS.getId(),
             File.class,
             params -> null,
             (s, p) -> new File(s));
 
+    public static final StandardBundlerParam<File> MAC_INHERIT_ENTITLEMENTS  =
+            new StandardBundlerParam<>(
+            Arguments.CLIOptions.MAC_INHERIT_ENTITLEMENTS.getId(),
+            File.class,
+            params -> null,
+            (s, p) -> new File(s));
+*/
+
     public static final BundlerParamInfo<String> INSTALLER_SUFFIX =
             new StandardBundlerParam<> (
             "mac.app-store.installerName.suffix",
@@ -203,14 +212,15 @@
             throws IOException {
         createResource(DEFAULT_ENTITLEMENTS, params)
                 .setCategory(
-                        I18N.getString("resource.mac-app-store-entitlements"))
-                .setExternal(MAC_APP_STORE_ENTITLEMENTS.fetchFrom(params))
+                        I18N.getString("resource.mac-entitlements"))
+                // .setExternal(MAC_ENTITLEMENTS.fetchFrom(params))
                 .saveToFile(getConfig_Entitlements(params));
 
         createResource(DEFAULT_INHERIT_ENTITLEMENTS, params)
                 .setCategory(I18N.getString(
-                        "resource.mac-app-store-inherit-entitlements"))
-                .saveToFile(getConfig_Entitlements(params));
+                        "resource.mac-inherit-entitlements"))
+                // .setExternal(MAC_INHERIT_ENTITLEMENTS.fetchFrom(params))
+                .saveToFile(getConfig_Inherit_Entitlements(params));
     }
 
     ///////////////////////////////////////////////////////////////////////