diff --git a/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/NMProperties.json b/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/NMProperties.json
index 57703ab83..94928ce5b 100644
--- a/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/NMProperties.json
+++ b/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/NMProperties.json
@@ -15,9 +15,9 @@
         "CrashRecoveryEnabled":                [ {"version": "[12.1.2,)",         "wlst_mode": "offline",    "wlst_name": "CrashRecoveryEnabled",                        "wlst_path": "WP001", "value": {"default": "false"                                           }, "wlst_type": "boolean"    } ],
         "CustomIdentityAlias":                 [ {"version": "[12.1.2,)",         "wlst_mode": "offline",    "wlst_name": "CustomIdentityAlias",                         "wlst_path": "WP001", "value": {"default": "None"                                            }, "wlst_type": "string"     } ],
         "CustomIdentityKeyStoreFileName":      [ {"version": "[12.1.2,)",         "wlst_mode": "offline",    "wlst_name": "CustomIdentityKeyStoreFileName",              "wlst_path": "WP001", "value": {"default": "None"                                            }, "wlst_type": "string",    "uses_path_tokens": "true" } ],
-        "CustomIdentityKeyStorePassPhrase":    [ {"version": "[12.1.2,)",         "wlst_mode": "offline",    "wlst_name": "CustomIdentityKeyStorePassPhrase",            "wlst_path": "WP001", "value": {"default": "None"                                            }, "wlst_type": "string",    "get_method": "GET" } ],
+        "CustomIdentityKeyStorePassPhrase":    [ {"version": "[12.1.2,)",         "wlst_mode": "offline",    "wlst_name": "CustomIdentityKeyStorePassPhrase",            "wlst_path": "WP001", "value": {"default": "None"                                            }, "wlst_type": "password", "get_method": "GET" } ],
         "CustomIdentityKeyStoreType":          [ {"version": "[12.1.2,)",         "wlst_mode": "offline",    "wlst_name": "CustomIdentityKeyStoreType",                  "wlst_path": "WP001", "value": {"default": "java.security"                                   }, "wlst_type": "string"     } ],
-        "CustomIdentityPrivateKeyPassPhrase":  [ {"version": "[12.1.2,)",         "wlst_mode": "offline",    "wlst_name": "CustomIdentityPrivateKeyPassPhrase",          "wlst_path": "WP001", "value": {"default": "None"                                            }, "wlst_type": "string",    "get_method": "GET" } ],
+        "CustomIdentityPrivateKeyPassPhrase":  [ {"version": "[12.1.2,)",         "wlst_mode": "offline",    "wlst_name": "CustomIdentityPrivateKeyPassPhrase",          "wlst_path": "WP001", "value": {"default": "None"                                            }, "wlst_type": "password", "get_method": "GET" } ],
         "DomainRegistrationEnabled":           [ {"version": "[12.1.2,)",         "wlst_mode": "offline",    "wlst_name": "DomainRegistrationEnabled",                   "wlst_path": "WP001", "value": {"default": "false"                                           }, "wlst_type": "boolean"    } ],
         "DomainsDirRemoteSharingEnabled":      [ {"version": "[12.1.2,)",         "wlst_mode": "offline",    "wlst_name": "DomainsDirRemoteSharingEnabled",              "wlst_path": "WP001", "value": {"default": "false"                                           }, "wlst_type": "boolean"    } ],
         "DomainsFile":                         [ {"version": "[12.1.2,)",         "wlst_mode": "offline",    "wlst_name": "DomainsFile",                                 "wlst_path": "WP001", "value": {"default": "@@DOMAIN_HOME@@/nodemanager/nodemanager.domains" }, "wlst_type": "string",    "uses_path_tokens": "true" } ],
@@ -25,9 +25,9 @@
         "Interface":                           [ {"version": "[12.1.2,)",         "wlst_mode": "offline",    "wlst_name": "Interface",                                   "wlst_path": "WP001", "value": {"default": "None"                                            }, "wlst_type": "string"     } ],
         "InterfaceName":                       [ {"version": "[12.1.2,)",         "wlst_mode": "offline",    "wlst_name": "InterfaceName",                               "wlst_path": "WP001", "value": {"default": "None"                                            }, "wlst_type": "string"     } ],
         "JavaHome":                            [ {"version": "[12.1.2,)",         "wlst_mode": "offline",    "wlst_name": "JavaHome",                                    "wlst_path": "WP001", "value": {"default": "@@JAVA_HOME@@"                                   }, "wlst_type": "string",    "uses_path_tokens": "true" } ],
-        "JavaStandardTrustKeyStorePassPhrase": [ {"version": "[12.1.2,)",         "wlst_mode": "offline",    "wlst_name": "JavaStandardTrustKeyStorePassPhrase",         "wlst_path": "WP001", "value": {"default": "None"                                            }, "wlst_type": "string",    "get_method": "GET" } ],
+        "JavaStandardTrustKeyStorePassPhrase": [ {"version": "[12.1.2,)",         "wlst_mode": "offline",    "wlst_name": "JavaStandardTrustKeyStorePassPhrase",         "wlst_path": "WP001", "value": {"default": "None"                                            }, "wlst_type": "password",  "get_method": "GET" } ],
         "KeyFile":                             [ {"version": "[12.1.2,)",         "wlst_mode": "offline",    "wlst_name": "KeyFile",                                     "wlst_path": "WP001", "value": {"default": "None"                                            }, "wlst_type": "string"     } ],
-        "KeyPassword":                         [ {"version": "[12.1.2,)",         "wlst_mode": "offline",    "wlst_name": "KeyPassword",                                 "wlst_path": "WP001", "value": {"default": "None"                                            }, "wlst_type": "string",    "get_method": "LSA" } ],
+        "KeyPassword":                         [ {"version": "[12.1.2,)",         "wlst_mode": "offline",    "wlst_name": "KeyPassword",                                 "wlst_path": "WP001", "value": {"default": "None"                                            }, "wlst_type": "password",  "get_method": "GET" } ],
         "KeyStores":                           [ {"version": "[12.1.2,)",         "wlst_mode": "offline",    "wlst_name": "KeyStores",                                   "wlst_path": "WP001", "value": {"default": "DemoIdentityAndDemoTrust"                        }, "wlst_type": "string"     } ],
         "ListenAddress":                       [ {"version": "[12.1.2,)",         "wlst_mode": "offline",    "wlst_name": "ListenAddress",                               "wlst_path": "WP001", "value": {"default": "localhost"                                       }, "wlst_type": "string"     } ],
         "ListenBacklog":                       [ {"version": "[12.1.2,)",         "wlst_mode": "offline",    "wlst_name": "ListenBacklog",                               "wlst_path": "WP001", "value": {"default": 50                                                }, "wlst_type": "integer"    } ],