diff --git a/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/SystemComponent.json b/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/SystemComponent.json
index 04e915448..6fd9d15a3 100644
--- a/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/SystemComponent.json
+++ b/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/SystemComponent.json
@@ -16,7 +16,7 @@
                 "ClassPath":     [ {"version": "[10,)",     "wlst_mode": "both", "wlst_name": "ClassPath",     "wlst_path": "WP001", "default_value": null,    "wlst_type": "delimited_string[path_separator]", "preferred_model_type": "delimited_string", "uses_path_tokens": "true" } ],
                 "JavaHome":      [ {"version": "[10,)",     "wlst_mode": "both", "wlst_name": "JavaHome",      "wlst_path": "WP001", "default_value": null,    "wlst_type": "string", "uses_path_tokens": "true" } ],
                 "JavaVendor":    [ {"version": "[10,)",     "wlst_mode": "both", "wlst_name": "JavaVendor",    "wlst_path": "WP001", "default_value": null,    "wlst_type": "string" } ],
-                "MWHome":        [ {"version": "[12.1.3,)", "wlst_mode": "both", "wlst_name": "MWHome",        "wlst_path": "WP001", "default_value": null,    "wlst_type": "string", "uses_path_tokens": "true" } ],
+                "MwHome":        [ {"version": "[12.1.3,)", "wlst_mode": "both", "wlst_name": "M${w:W}Home",   "wlst_path": "WP001", "default_value": null,    "wlst_type": "string", "uses_path_tokens": "true" } ],
                 "Notes":         [ {"version": "[10,)",     "wlst_mode": "both", "wlst_name": "Notes",         "wlst_path": "WP001", "default_value": null,    "wlst_type": "string" } ],
                 "RootDirectory": [ {"version": "[10,)",     "wlst_mode": "both", "wlst_name": "RootDirectory", "wlst_path": "WP001", "default_value": null,    "wlst_type": "string", "uses_path_tokens": "true" } ]
             },
diff --git a/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/WebserviceSecurity.json b/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/WebserviceSecurity.json
index f3b392b7c..bb9212630 100644
--- a/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/WebserviceSecurity.json
+++ b/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/WebserviceSecurity.json
@@ -137,7 +137,7 @@
     "attributes": {
                 "CompatibilityOrderingPreference":     [ {"version": "[10,)",       "wlst_mode": "both",    "wlst_name": "CompatibilityOrderingPreference",    "wlst_path": "WP001", "default_value": null, "wlst_type": "string"            } ],
                 "CompatibilityPreference":             [ {"version": "[10,)",       "wlst_mode": "both",    "wlst_name": "CompatibilityPreference",            "wlst_path": "WP001", "default_value": null, "wlst_type": "string"            } ],
-                "DefaultCredentialProviderSTSURI":     [ {"version": "[10,)",       "wlst_mode": "both",    "wlst_name": "DefaultCredentialProviderSTSURI",    "wlst_path": "WP001", "default_value": null, "wlst_type": "string"            } ],
+                "DefaultCredentialProviderStsuri":     [ {"version": "[10,)",       "wlst_mode": "both",    "wlst_name": "DefaultCredentialProviderS${tsuri:TSURI}", "wlst_path": "WP001", "default_value": null, "wlst_type": "string"            } ],
                 "Notes":                               [ {"version": "[10,)",       "wlst_mode": "both",    "wlst_name": "Notes",                              "wlst_path": "WP001", "default_value": null, "wlst_type": "string"            } ],
                 "PolicySelectionPreference":           [ {"version": "[10,)",       "wlst_mode": "both",    "wlst_name": "PolicySelectionPreference",          "wlst_path": "WP001", "default_value": null, "wlst_type": "string"            } ]
     },