diff --git a/core/src/main/python/wlsdeploy/aliases/alias_constants.py b/core/src/main/python/wlsdeploy/aliases/alias_constants.py
index 1eb2285df..918748af3 100644
--- a/core/src/main/python/wlsdeploy/aliases/alias_constants.py
+++ b/core/src/main/python/wlsdeploy/aliases/alias_constants.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) 2017, 2019, Oracle Corporation and/or its affiliates.  All rights reserved.
+Copyright (c) 2017, 2020, Oracle Corporation and/or its affiliates.
 Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 These constants are internal to the aliases module and should not be used, as they are not part of the public API.
@@ -21,6 +21,7 @@
 MODEL_NAME = 'model_name'
 NAME_VALUE = 'name_value'
 PASSWORD_TOKEN = "--FIX ME--"
+PATH_TOKEN = 'path_token'
 PREFERRED_MODEL_TYPE = 'preferred_model_type'
 RESTART_REQUIRED = 'restart_required'
 SET_MBEAN_TYPE = 'set_mbean_type'
@@ -52,9 +53,8 @@
 MULTIPLE_WITH_TYPE_SUBFOLDER = 'multiple_with_type_subfolder'
 NONE_CHILD_FOLDERS_TYPE = 'none'
 SINGLE = 'single'
-SINGLE_UNPREDICTABLE = 'single_unpredictable'
 
-ChildFoldersTypes = Enum(['MULTIPLE', 'MULTIPLE_WITH_TYPE_SUBFOLDER', 'NONE', 'SINGLE', 'SINGLE_UNPREDICTABLE'])
+ChildFoldersTypes = Enum(['MULTIPLE', 'MULTIPLE_WITH_TYPE_SUBFOLDER', 'NONE', 'SINGLE'])
 
 # get_method values
 GET = 'GET'
diff --git a/core/src/main/python/wlsdeploy/aliases/alias_entries.py b/core/src/main/python/wlsdeploy/aliases/alias_entries.py
index 6c599c213..a6030cbe4 100644
--- a/core/src/main/python/wlsdeploy/aliases/alias_entries.py
+++ b/core/src/main/python/wlsdeploy/aliases/alias_entries.py
@@ -25,6 +25,7 @@
 from wlsdeploy.aliases.alias_constants import MODEL_NAME
 from wlsdeploy.aliases.alias_constants import NAME_VALUE
 from wlsdeploy.aliases.alias_constants import NONE_CHILD_FOLDERS_TYPE
+from wlsdeploy.aliases.alias_constants import PATH_TOKEN
 from wlsdeploy.aliases.alias_constants import SECURITY_PROVIDER_NAME_MAP
 from wlsdeploy.aliases.alias_constants import SET_MBEAN_TYPE
 from wlsdeploy.aliases.alias_constants import SET_METHOD
@@ -44,6 +45,7 @@
 from wlsdeploy.aliases.alias_constants import WLST_SKIP_NAMES
 from wlsdeploy.aliases.alias_constants import WLST_SUBFOLDERS_PATH
 from wlsdeploy.aliases.alias_constants import WLST_TYPE
+from wlsdeploy.aliases.flattened_folder import FlattenedFolder
 from wlsdeploy.aliases.location_context import LocationContext
 from wlsdeploy.aliases.model_constants import APP_DEPLOYMENTS
 from wlsdeploy.aliases.model_constants import APPLICATION
@@ -369,7 +371,7 @@ def get_model_folder_path_for_location(self, location):
                         if name is not None:
                             my_loc.add_name_token(name_token, name)
                             # dont include token in path for single-unpredictable
-                            if not self.is_location_child_folder_type(my_loc, ChildFoldersTypes.SINGLE_UNPREDICTABLE):
+                            if not self.is_location_child_folder_type(my_loc, ChildFoldersTypes.SINGLE):
                                  model_folder_path += '%s/' % name
                         elif location_folder != location_folders[-1]:
                             # Throw AliasException if name_token is missing
@@ -488,53 +490,25 @@ def is_location_child_folder_type(self, location, child_folders_type):
         _logger.exiting(class_name=_class_name, method_name=_method_name, result=result)
         return result
 
-    def location_contains_flattened_folder(self, location):
+    def get_wlst_flattened_folder_info_for_location(self, location):
         """
-        Does the location folder specified refer to a WLST location that has been flattened to simplify the model?
+        Get the information used to create the flattened folder.
         :param location: the location
-        :return: True, if this location contains a flattened WLST folder, False otherwise
+        :return: a FlattenedFolder object, or None if the location does not have a flattened folder
         """
-        _method_name = 'location_contains_flattened_folder'
-
-        _logger.entering(str(location), class_name=_class_name, method_name=_method_name)
-        result = False
-        folder_dict = self.__get_dictionary_for_location(location, False)
-        if folder_dict is not None and FLATTENED_FOLDER_DATA in folder_dict:
-            result = True
-        _logger.exiting(class_name=_class_name, method_name=_method_name, result=result)
-        return result
-
-    def get_wlst_flattened_type_for_location(self, location):
-        """
-        Get the type of the flattened WLST folder to use to create the folder.
-        :param location: the location
-        :return: the type of the flattened WLST folder
-        """
-        _method_name = 'get_wlst_flattened_type_for_location'
+        _method_name = 'get_wlst_flattened_folder_info_for_location'
 
         _logger.entering(str(location), class_name=_class_name, method_name=_method_name)
         result = None
-        folder_dict = self.__get_dictionary_for_location(location, False)
-        if folder_dict is not None and FLATTENED_FOLDER_DATA in folder_dict and \
-                WLST_TYPE in folder_dict[FLATTENED_FOLDER_DATA]:
-            result = folder_dict[FLATTENED_FOLDER_DATA][WLST_TYPE]
-        _logger.exiting(class_name=_class_name, method_name=_method_name, result=result)
-        return result
-
-    def get_wlst_flattened_name_for_location(self, location):
-        """
-        Get the name of the flattened WLST folder to use to create the folder.
-        :param location: the location
-        :return: the name of the flattened WLST folder
-        """
-        _method_name = 'get_wlst_flattened_name_for_location'
 
-        _logger.entering(str(location), class_name=_class_name, method_name=_method_name)
-        result = None
         folder_dict = self.__get_dictionary_for_location(location, False)
-        if folder_dict is not None and FLATTENED_FOLDER_DATA in folder_dict and \
-                NAME_VALUE in folder_dict[FLATTENED_FOLDER_DATA]:
-            result = alias_utils.get_token_value(location, folder_dict[FLATTENED_FOLDER_DATA][NAME_VALUE])
+        flattened_folder_data = dictionary_utils.get_element(folder_dict, FLATTENED_FOLDER_DATA)
+        if flattened_folder_data is not None:
+            mbean_type = flattened_folder_data[WLST_TYPE]
+            mbean_name = alias_utils.get_token_value(location, flattened_folder_data[NAME_VALUE])
+            path_token = flattened_folder_data[PATH_TOKEN]
+            result = FlattenedFolder(mbean_type, mbean_name, path_token)
+
         _logger.exiting(class_name=_class_name, method_name=_method_name, result=result)
         return result
 
diff --git a/core/src/main/python/wlsdeploy/aliases/aliases.py b/core/src/main/python/wlsdeploy/aliases/aliases.py
index 04cae84a5..9c150caad 100644
--- a/core/src/main/python/wlsdeploy/aliases/aliases.py
+++ b/core/src/main/python/wlsdeploy/aliases/aliases.py
@@ -286,7 +286,7 @@ def requires_unpredictable_single_name_handling(self, location):
         _method_name = 'requires_unpredictable_single_name_handling'
 
         try:
-            return self._alias_entries.is_location_child_folder_type(location, ChildFoldersTypes.SINGLE_UNPREDICTABLE)
+            return self._alias_entries.is_location_child_folder_type(location, ChildFoldersTypes.SINGLE)
         except AliasException, ae:
             self._raise_exception(ae, _method_name, 'WLSDPLY-19021', location.get_current_model_folder(),
                                   location.get_folder_path(), ae.getLocalizedMessage())
@@ -403,45 +403,17 @@ def get_wlst_mbean_type(self, location):
         except AliasException, ae:
             self._raise_exception(ae, _method_name, 'WLSDPLY-19010', str(location), ae.getLocalizedMessage())
 
-    def is_flattened_folder(self, location):
+    def get_wlst_flattened_folder_info(self, location):
         """
-        Is the current location one that contains a flattened WLST folder?
+        Get the information used to create the flattened folder.
         :param location: the location
-        :return: True, if the specified location contains a flattened WLST tuple of folders, False otherwise
+        :return: a FlattenedFolder object, or None if the location does not have a flattened folder
         :raises: Tool type exception: if an error occurs due to a bad location or bad alias data
         """
-        _method_name = 'is_flattened_folder'
+        _method_name = 'get_wlst_flattened_mbean_info'
 
         try:
-            return self._alias_entries.location_contains_flattened_folder(location)
-        except AliasException, ae:
-            self._raise_exception(ae, _method_name, 'WLSDPLY-19011', str(location), ae.getLocalizedMessage())
-
-    def get_wlst_flattened_mbean_name(self, location):
-        """
-        Get the flattened WLST folder name.
-        :param location: the location
-        :return: the flattened folder name
-        :raises: Tool type exception: if an error occurs due to a bad location or bad alias data
-        """
-        _method_name = 'get_wlst_flattened_mbean_name'
-
-        try:
-            return self._alias_entries.get_wlst_flattened_name_for_location(location)
-        except AliasException, ae:
-            self._raise_exception(ae, _method_name, 'WLSDPLY-19012', str(location), ae.getLocalizedMessage())
-
-    def get_wlst_flattened_mbean_type(self, location):
-        """
-        Get the flattened WLST folder type.
-        :param location: the location
-        :return: the flattened folder type
-        :raises: Tool type exception: if an error occurs due to a bad location or bad alias data
-        """
-        _method_name = 'get_wlst_flattened_mbean_type'
-
-        try:
-            return self._alias_entries.get_wlst_flattened_type_for_location(location)
+            return self._alias_entries.get_wlst_flattened_folder_info_for_location(location)
         except AliasException, ae:
             self._raise_exception(ae, _method_name, 'WLSDPLY-19013', str(location), ae.getLocalizedMessage())
 
@@ -1204,6 +1176,13 @@ def decrypt_password(self, text):
     #                          Convenience Methods                            #
     ###########################################################################
 
+    def get_exception_type(self):
+        """
+        Get the exception type for this Aliases instance.
+        :return: the exception type
+        """
+        return self._exception_type
+
     def get_wlst_mbean_type_and_name(self, location):
         """
         Get the MBean type and name from the specified location.
diff --git a/core/src/main/python/wlsdeploy/aliases/flattened_folder.py b/core/src/main/python/wlsdeploy/aliases/flattened_folder.py
new file mode 100644
index 000000000..6db2d52b5
--- /dev/null
+++ b/core/src/main/python/wlsdeploy/aliases/flattened_folder.py
@@ -0,0 +1,41 @@
+"""
+Copyright (c) 2020, Oracle Corporation and/or its affiliates.
+Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
+"""
+
+
+class FlattenedFolder(object):
+    """
+    Class containing information for processing a flattened folder.
+    """
+    def __init__(self, mbean_type, mbean_name, path_token):
+        """
+        Creates a new instance of the object containing flattened folder information.
+        :param mbean_type: the type of the MBean represented by the folder
+        :param mbean_name: the name of the MBean represented by the folder
+        :param path_token: the path token used to update the location context
+        """
+        self.mbean_type = mbean_type
+        self.mbean_name = mbean_name
+        self.path_token = path_token
+
+    def get_mbean_type(self):
+        """
+        Get the MBean type for the flattened folder.
+        :return: the MBean type
+        """
+        return self.mbean_type
+
+    def get_mbean_name(self):
+        """
+        Get the MBean name for the flattened folder.
+        :return: the MBean name
+        """
+        return self.mbean_name
+
+    def get_path_token(self):
+        """
+        Get the path token for the flattened folder.
+        :return: the path token
+        """
+        return self.path_token
diff --git a/core/src/main/python/wlsdeploy/tool/create/creator.py b/core/src/main/python/wlsdeploy/tool/create/creator.py
index e1275ee6e..763b5b192 100644
--- a/core/src/main/python/wlsdeploy/tool/create/creator.py
+++ b/core/src/main/python/wlsdeploy/tool/create/creator.py
@@ -404,13 +404,17 @@ def _process_flattened_folder(self, location):
         :param location: the location
         :raises: CreateException: if an error occurs
         """
-        if self.aliases.is_flattened_folder(location):
+        flattened_folder_info = self.aliases.get_wlst_flattened_folder_info(location)
+        if flattened_folder_info is not None:
             create_path = self.aliases.get_wlst_flattened_folder_create_path(location)
-            mbean_type = self.aliases.get_wlst_flattened_mbean_type(location)
-            mbean_name = self.aliases.get_wlst_flattened_mbean_name(location)
+            mbean_type = flattened_folder_info.get_mbean_type()
+            mbean_name = flattened_folder_info.get_mbean_name()
             existing_folders = self._get_existing_folders(create_path)
             if mbean_type not in existing_folders:
                 self.wlst_helper.create(mbean_name, mbean_type)
+
+            path_token = flattened_folder_info.get_path_token()
+            location.add_name_token(path_token, mbean_name)
         return
 
     def _get_existing_folders(self, wlst_path):
diff --git a/core/src/main/python/wlsdeploy/tool/create/domain_creator.py b/core/src/main/python/wlsdeploy/tool/create/domain_creator.py
index 734b72406..b84001925 100644
--- a/core/src/main/python/wlsdeploy/tool/create/domain_creator.py
+++ b/core/src/main/python/wlsdeploy/tool/create/domain_creator.py
@@ -38,9 +38,7 @@
 from wlsdeploy.aliases.model_constants import DRIVER_PARAMS_TRUSTSTORE_PROPERTY
 from wlsdeploy.aliases.model_constants import DRIVER_PARAMS_USER_PROPERTY
 from wlsdeploy.aliases.model_constants import DRIVER_PARAMS_kEYSTORE_PROPERTY
-from wlsdeploy.aliases.model_constants import JDBC_DRIVER_PARAMS
 from wlsdeploy.aliases.model_constants import JDBC_DRIVER_PARAMS_PROPERTIES
-from wlsdeploy.aliases.model_constants import JDBC_RESOURCE
 from wlsdeploy.aliases.model_constants import JDBC_SYSTEM_RESOURCE
 from wlsdeploy.aliases.model_constants import LOG_FILTER
 from wlsdeploy.aliases.model_constants import MACHINE
@@ -939,13 +937,7 @@ def __configure_fmw_infra_database(self):
                 ds_names = self.wlst_helper.lsc()
 
                 for ds_name in ds_names:
-                    location = LocationContext()
-                    location.append_location(JDBC_SYSTEM_RESOURCE)
-                    token_name = self.aliases.get_name_token(location)
-                    location.add_name_token(token_name, ds_name)
-
-                    location.append_location(JDBC_RESOURCE)
-                    location.append_location(JDBC_DRIVER_PARAMS)
+                    location = deployer_utils.get_jdbc_driver_params_location(ds_name, self.aliases)
                     wlst_path = self.aliases.get_wlst_attributes_path(location)
                     self.wlst_helper.cd(wlst_path)
 
@@ -959,6 +951,7 @@ def __configure_fmw_infra_database(self):
                     self.wlst_helper.set_if_needed(wlst_name, wlst_value, masked=True)
 
                     location.append_location(JDBC_DRIVER_PARAMS_PROPERTIES)
+                    deployer_utils.set_flattened_folder_token(location, self.aliases)
                     token_name = self.aliases.get_name_token(location)
                     if token_name is not None:
                         location.add_name_token(token_name, DRIVER_PARAMS_USER_PROPERTY)
@@ -1008,15 +1001,8 @@ def __configure_fmw_infra_database(self):
             fmw_database = self.wls_helper.get_jdbc_url_from_rcu_connect_string(rcu_database)
             self.logger.fine('WLSDPLY-12221', fmw_database, class_name=self.__class_name, method_name=_method_name)
 
-            location = LocationContext()
-            location.append_location(JDBC_SYSTEM_RESOURCE)
-            token_name = self.aliases.get_name_token(location)
             svc_table_ds_name = self.wls_helper.get_jrf_service_table_datasource_name()
-            if token_name is not None:
-                location.add_name_token(token_name, svc_table_ds_name)
-
-            location.append_location(JDBC_RESOURCE)
-            location.append_location(JDBC_DRIVER_PARAMS)
+            location = deployer_utils.get_jdbc_driver_params_location(svc_table_ds_name, self.aliases)
             wlst_path = self.aliases.get_wlst_attributes_path(location)
             self.wlst_helper.cd(wlst_path)
 
@@ -1035,6 +1021,7 @@ def __configure_fmw_infra_database(self):
             self.wlst_helper.set_if_needed(wlst_name, wlst_value, masked=True)
 
             location.append_location(JDBC_DRIVER_PARAMS_PROPERTIES)
+            deployer_utils.set_flattened_folder_token(location, self.aliases)
             token_name = self.aliases.get_name_token(location)
 
             if token_name is not None:
diff --git a/core/src/main/python/wlsdeploy/tool/deploy/deployer_utils.py b/core/src/main/python/wlsdeploy/tool/deploy/deployer_utils.py
index 599c32f2c..4f739ec10 100644
--- a/core/src/main/python/wlsdeploy/tool/deploy/deployer_utils.py
+++ b/core/src/main/python/wlsdeploy/tool/deploy/deployer_utils.py
@@ -12,7 +12,11 @@
 from oracle.weblogic.deploy.util import PyWLSTException
 from oracle.weblogic.deploy.util import WLSDeployArchive
 
+from wlsdeploy.aliases.location_context import LocationContext
 from wlsdeploy.aliases.model_constants import FILE_URI
+from wlsdeploy.aliases.model_constants import JDBC_DRIVER_PARAMS
+from wlsdeploy.aliases.model_constants import JDBC_RESOURCE
+from wlsdeploy.aliases.model_constants import JDBC_SYSTEM_RESOURCE
 from wlsdeploy.aliases.wlst_modes import WlstModes
 from wlsdeploy.exception import exception_helper
 from wlsdeploy.exception.expection_types import ExceptionType
@@ -106,6 +110,35 @@ def get_mbean_name(location, existing_names, aliases):
     return mbean_name
 
 
+def set_single_folder_token(location, aliases):
+    """
+    Determine the name of the MBean at the specified WLST location, and set the corresponding token.
+    :param location: the single-folder location to be updated
+    :param aliases: the aliases object to use for name and path resolution
+    """
+    exception_type = aliases.get_exception_type()
+    wlst_helper = WlstHelper(exception_type)
+    list_path = aliases.get_wlst_list_path(location)
+    existing_names = wlst_helper.get_existing_object_list(list_path)
+    if len(existing_names) > 0:
+        mbean_name = existing_names[0]
+        token = aliases.get_name_token(location)
+        location.add_name_token(token, mbean_name)
+
+
+def set_flattened_folder_token(location, aliases):
+    """
+    If the specified model location contains a flattened folder,
+    add the corresponding token to the location with the MBean name.
+    :param location: the location to be checked
+    """
+    flattened_folder_info = aliases.get_wlst_flattened_folder_info(location)
+    if flattened_folder_info is not None:
+        path_token = flattened_folder_info.get_path_token()
+        mbean_name = flattened_folder_info.get_mbean_name()
+        location.add_name_token(path_token, mbean_name)
+
+
 def check_flattened_folder(location, aliases):
     """
     The paths for a location may contain a flattened folder - a type/name level that is not reflected in the model.
@@ -113,18 +146,41 @@ def check_flattened_folder(location, aliases):
     :param location: the location to examine
     :param aliases: the alias helper to use for name and path resolution
     """
-    if aliases.is_flattened_folder(location):
+    flattened_folder_info = aliases.get_wlst_flattened_folder_info(location)
+    if flattened_folder_info is not None:
         create_path = aliases.get_wlst_flattened_folder_create_path(location)
         existing_types = _wlst_helper.get_existing_object_list(create_path)
 
-        mbean_type = aliases.get_wlst_flattened_mbean_type(location)
+        mbean_type = flattened_folder_info.get_mbean_type()
+        mbean_name = flattened_folder_info.get_mbean_name()
         if mbean_type not in existing_types:
-            mbean_name = aliases.get_wlst_flattened_mbean_name(location)
             _wlst_helper.cd(create_path)
             create_if_not_exist(mbean_name, mbean_type, [])
+
+        path_token = flattened_folder_info.get_path_token()
+        location.add_name_token(path_token, mbean_name)
     return
 
 
+def get_jdbc_driver_params_location(ds_name, aliases):
+    """
+    Return the JDBC_DRIVER_PARAMS location for the specified datasource name.
+    :param ds_name: the name of the datasource
+    :param aliases: the alias helper to use for name and token resolution
+    :return: the resulting location
+    """
+    location = LocationContext()
+    location.append_location(JDBC_SYSTEM_RESOURCE)
+    token_name = aliases.get_name_token(location)
+    location.add_name_token(token_name, ds_name)
+
+    location.append_location(JDBC_RESOURCE)
+    set_single_folder_token(location, aliases)
+    location.append_location(JDBC_DRIVER_PARAMS)
+    set_single_folder_token(location, aliases)
+    return location
+
+
 def get_domain_token(aliases):
     """
     Returns the domain token required by some root-level WLST elements.
diff --git a/core/src/main/python/wlsdeploy/tool/deploy/jms_resources_deployer.py b/core/src/main/python/wlsdeploy/tool/deploy/jms_resources_deployer.py
index e4b5c1112..05fcd862e 100644
--- a/core/src/main/python/wlsdeploy/tool/deploy/jms_resources_deployer.py
+++ b/core/src/main/python/wlsdeploy/tool/deploy/jms_resources_deployer.py
@@ -27,6 +27,7 @@
 from wlsdeploy.aliases.model_constants import UNIFORM_DISTRIBUTED_QUEUE
 from wlsdeploy.aliases.model_constants import UNIFORM_DISTRIBUTED_TOPIC
 from wlsdeploy.aliases.wlst_modes import WlstModes
+from wlsdeploy.exception.expection_types import ExceptionType
 from wlsdeploy.tool.deploy import deployer_utils
 from wlsdeploy.util import model_helper
 from wlsdeploy.tool.deploy import log_helper
@@ -119,6 +120,7 @@ def _add_jms_resources(self, resource_nodes, location):
         location = LocationContext(location).append_location(JMS_RESOURCE)
         if not self._check_location(location):
             return
+        deployer_utils.set_single_folder_token(location, self.aliases)
 
         # SAF imported destination may reference error handling, and vice versa
         self.topology_helper.create_placeholder_named_elements(location, SAF_ERROR_HANDLING, resource_nodes)
diff --git a/core/src/main/python/wlsdeploy/tool/discover/coherence_resources_discoverer.py b/core/src/main/python/wlsdeploy/tool/discover/coherence_resources_discoverer.py
index 173564427..b392a22f3 100644
--- a/core/src/main/python/wlsdeploy/tool/discover/coherence_resources_discoverer.py
+++ b/core/src/main/python/wlsdeploy/tool/discover/coherence_resources_discoverer.py
@@ -15,7 +15,9 @@
 from wlsdeploy.aliases import model_constants
 from wlsdeploy.aliases.location_context import LocationContext
 from wlsdeploy.aliases.wlst_modes import WlstModes
+from wlsdeploy.exception.expection_types import ExceptionType
 from wlsdeploy.logging.platform_logger import PlatformLogger
+from wlsdeploy.tool.deploy import deployer_utils
 from wlsdeploy.tool.discover import discoverer
 from wlsdeploy.tool.discover.discoverer import Discoverer
 
@@ -136,6 +138,7 @@ def get_coherence_resource(self, location):
         result = OrderedDict()
         model_top_folder_name = model_constants.COHERENCE_RESOURCE
         location.append_location(model_top_folder_name)
+        deployer_utils.set_single_folder_token(location, self._aliases)
         self._populate_model_parameters(result, location)
         self._discover_subfolders(result, location)
         location.pop_location()
diff --git a/core/src/main/python/wlsdeploy/tool/discover/common_resources_discoverer.py b/core/src/main/python/wlsdeploy/tool/discover/common_resources_discoverer.py
index 9127609da..572129ec0 100644
--- a/core/src/main/python/wlsdeploy/tool/discover/common_resources_discoverer.py
+++ b/core/src/main/python/wlsdeploy/tool/discover/common_resources_discoverer.py
@@ -13,7 +13,9 @@
 from wlsdeploy.aliases.location_context import LocationContext
 from wlsdeploy.aliases.wlst_modes import WlstModes
 from wlsdeploy.exception import exception_helper
+from wlsdeploy.exception.expection_types import ExceptionType
 from wlsdeploy.logging.platform_logger import PlatformLogger
+from wlsdeploy.tool.deploy import deployer_utils
 from wlsdeploy.tool.discover import discoverer
 from wlsdeploy.tool.discover.coherence_resources_discoverer import CoherenceResourcesDiscoverer
 from wlsdeploy.tool.discover.discoverer import Discoverer
@@ -104,6 +106,7 @@ def get_datasources(self):
                     self._populate_model_parameters(result[datasource], location)
 
                     location.append_location(model_second_folder)
+                    deployer_utils.set_single_folder_token(location, self._aliases)
                     if self.wlst_cd(self._aliases.get_wlst_attributes_path(location), location):
                         result[datasource][model_second_folder] = OrderedDict()
                         resource_result = result[datasource][model_second_folder]
diff --git a/core/src/main/python/wlsdeploy/tool/discover/discoverer.py b/core/src/main/python/wlsdeploy/tool/discover/discoverer.py
index fc994fd54..6b9864b08 100644
--- a/core/src/main/python/wlsdeploy/tool/discover/discoverer.py
+++ b/core/src/main/python/wlsdeploy/tool/discover/discoverer.py
@@ -19,6 +19,7 @@
 from wlsdeploy.exception import exception_helper
 from wlsdeploy.exception.expection_types import ExceptionType
 from wlsdeploy.logging.platform_logger import PlatformLogger
+from wlsdeploy.tool.deploy import deployer_utils
 from wlsdeploy.tool.discover.custom_folder_helper import CustomFolderHelper
 from wlsdeploy.tool.util.mbean_utils import MBeanUtils
 from wlsdeploy.tool.util.mbean_utils import get_interface_name
@@ -469,6 +470,8 @@ def _discover_subfolder(self, model_subfolder_name, location, result=None):
         _logger.entering(model_subfolder_name, location.get_folder_path(), class_name=_class_name,
                          method_name=_method_name)
         location.append_location(model_subfolder_name)
+        deployer_utils.set_flattened_folder_token(location, self._aliases)
+
         _logger.finer('WLSDPLY-06115', model_subfolder_name, self._aliases.get_model_folder_path(location),
                       class_name=_class_name, method_name=_method_name)
         # handle null model_subfolder name which should never happen in discover. throw exception about version
@@ -772,6 +775,7 @@ def _get_from_url(self, owner_name, file_name):
 
         return True, url, path
 
+
 def add_to_model_if_not_empty(dictionary, entry_name, entry_value):
     """
     Helper method for discover to add a non-empty value to the dictionary with the provided entry-name
diff --git a/core/src/main/python/wlsdeploy/tool/discover/jms_resources_discoverer.py b/core/src/main/python/wlsdeploy/tool/discover/jms_resources_discoverer.py
index 106527f45..1dfb1430e 100644
--- a/core/src/main/python/wlsdeploy/tool/discover/jms_resources_discoverer.py
+++ b/core/src/main/python/wlsdeploy/tool/discover/jms_resources_discoverer.py
@@ -12,7 +12,9 @@
 from wlsdeploy.aliases.location_context import LocationContext
 from wlsdeploy.aliases.model_constants import FILE_URI
 from wlsdeploy.aliases.wlst_modes import WlstModes
+from wlsdeploy.exception.expection_types import ExceptionType
 from wlsdeploy.logging.platform_logger import PlatformLogger
+from wlsdeploy.tool.deploy import deployer_utils
 from wlsdeploy.tool.discover import discoverer
 from wlsdeploy.tool.discover.discoverer import Discoverer
 
@@ -211,6 +213,7 @@ def _get_jms_resources(self, location):
         result = OrderedDict()
         model_name = model_constants.JMS_RESOURCE
         location.append_location(model_name)
+        deployer_utils.set_single_folder_token(location, self._aliases)
         self._populate_model_parameters(result, location)
         wlst_subfolders = self._find_subfolders(location)
         if wlst_subfolders is not None:
diff --git a/core/src/main/python/wlsdeploy/tool/util/rcu_helper.py b/core/src/main/python/wlsdeploy/tool/util/rcu_helper.py
index 1db2b535d..ac17e4107 100644
--- a/core/src/main/python/wlsdeploy/tool/util/rcu_helper.py
+++ b/core/src/main/python/wlsdeploy/tool/util/rcu_helper.py
@@ -4,16 +4,13 @@
 """
 
 from wlsdeploy.aliases.model_constants import RCU_DB_INFO
-from wlsdeploy.aliases.model_constants import RCU_PREFIX
-from wlsdeploy.aliases.model_constants import RCU_SCHEMA_PASSWORD
 from wlsdeploy.aliases.model_constants import DRIVER_PARAMS_USER_PROPERTY
-from wlsdeploy.aliases.model_constants import JDBC_DRIVER_PARAMS
 from wlsdeploy.aliases.model_constants import JDBC_DRIVER_PARAMS_PROPERTIES
-from wlsdeploy.aliases.model_constants import JDBC_RESOURCE
 from wlsdeploy.aliases.model_constants import JDBC_SYSTEM_RESOURCE
 from wlsdeploy.aliases.model_constants import PASSWORD_ENCRYPTED
 from wlsdeploy.tool.create.rcudbinfo_helper import RcuDbInfo
 from wlsdeploy.aliases.location_context import LocationContext
+from wlsdeploy.tool.deploy import deployer_utils
 from wlsdeploy.tool.deploy.deployer import Deployer
 from wlsdeploy.exception.expection_types import ExceptionType
 
@@ -55,19 +52,14 @@ def update_rcu_password(self):
                 rcu_schemas[i] = rcu_prefix + '_' + rcu_schemas[i]
 
             for ds_name in ds_names:
-                location = LocationContext()
-                location.append_location(JDBC_SYSTEM_RESOURCE)
-                token_name = self.aliases.get_name_token(location)
-                location.add_name_token(token_name, ds_name)
-
-                location.append_location(JDBC_RESOURCE)
-                location.append_location(JDBC_DRIVER_PARAMS)
+                location = deployer_utils.get_jdbc_driver_params_location(ds_name, self.aliases)
                 password_location = LocationContext(location)
 
                 wlst_path = self.aliases.get_wlst_attributes_path(location)
                 self.wlst_helper.cd(wlst_path)
 
                 location.append_location(JDBC_DRIVER_PARAMS_PROPERTIES)
+                deployer_utils.set_flattened_folder_token(location, self.aliases)
                 token_name = self.aliases.get_name_token(location)
                 if token_name is not None:
                     location.add_name_token(token_name, DRIVER_PARAMS_USER_PROPERTY)
diff --git a/core/src/main/python/wlsdeploy/tool/util/topology_helper.py b/core/src/main/python/wlsdeploy/tool/util/topology_helper.py
index e02f08754..a418cfcfd 100644
--- a/core/src/main/python/wlsdeploy/tool/util/topology_helper.py
+++ b/core/src/main/python/wlsdeploy/tool/util/topology_helper.py
@@ -143,6 +143,7 @@ def _update_placeholder(self, type_name, name, location):
             # for online update, Name must be assigned to each JDBCSystemResource / JdbcResource MBean.
             # (see datasource_deployer.set_attributes())
             child_location = LocationContext(location).append_location(JDBC_RESOURCE)
+            deployer_utils.set_single_folder_token(child_location, self.aliases)
             wlst_path = self.aliases.get_wlst_attributes_path(child_location)
             if self.wlst_helper.path_exists(wlst_path):
                 original_location = self.wlst_helper.get_pwd()
diff --git a/core/src/main/python/wlsdeploy/tool/validate/validator.py b/core/src/main/python/wlsdeploy/tool/validate/validator.py
index 09b2b9b27..c7805ade8 100644
--- a/core/src/main/python/wlsdeploy/tool/validate/validator.py
+++ b/core/src/main/python/wlsdeploy/tool/validate/validator.py
@@ -443,6 +443,12 @@ def __validate_section_folder(self, model_node, validation_location):
             self._logger.severe('WLSDPLY-05027', message, class_name=_class_name, method_name=_method_name)
             return
 
+        # generate and add a flattened folder token, if required
+        flattened_folder_info = self._aliases.get_wlst_flattened_folder_info(validation_location)
+        if flattened_folder_info is not None:
+            path_token = flattened_folder_info.get_path_token()
+            validation_location.add_name_token(path_token, '%s-0' % path_token)
+
         model_folder_path = self._aliases.get_model_folder_path(validation_location)
         self._logger.finest('1 model_folder_path={0}', model_folder_path,
                             class_name=_class_name, method_name=_method_name)
diff --git a/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/AdminConsole.json b/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/AdminConsole.json
index 6d15cf70d..262abef5b 100644
--- a/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/AdminConsole.json
+++ b/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/AdminConsole.json
@@ -2,7 +2,6 @@
     "copyright": "Copyright (c) 2019, Oracle Corporation and/or its affiliates.  All rights reserved.",
     "license": "Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl",
     "wlst_type": "AdminConsole",
-    "child_folders_type": "single_unpredictable",
     "default_name_value": "${NO_NAME_0:%DOMAIN%}",
     "short_name": "Console",
     "folders": {},
diff --git a/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/CdiContainer.json b/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/CdiContainer.json
index 7ae81c673..96554bc27 100644
--- a/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/CdiContainer.json
+++ b/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/CdiContainer.json
@@ -3,7 +3,6 @@
   "license": "Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl",
   "wlst_type": "CdiContainer",
   "version": "[12.2.1,)",
-  "child_folders_type": "single_unpredictable",
   "default_name_value": "${NO_NAME_0:%DOMAIN%}",
   "folders": {},
   "attributes": {
@@ -13,6 +12,6 @@
   },
   "wlst_attributes_path": "WP001",
   "wlst_paths": {
-    "WP001": "/CdiContainer/%CdiContainer%"
+    "WP001": "/CdiContainer/%CDICONTAINER%"
   }
 }
diff --git a/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/Cluster.json b/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/Cluster.json
index ad629dddb..84fb3148d 100644
--- a/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/Cluster.json
+++ b/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/Cluster.json
@@ -1,5 +1,5 @@
 {
-    "copyright": "Copyright (c) 2017, 2019, Oracle Corporation and/or its affiliates.  All rights reserved.",
+    "copyright": "Copyright (c) 2017, 2020, Oracle Corporation and/or its affiliates.  All rights reserved.",
     "license": "Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl",
     "wlst_type": "Cluster${:s}",
     "child_folders_type": "multiple",
@@ -8,7 +8,6 @@
         "DynamicServers": {
             "wlst_type": "DynamicServers",
             "version": "[12.1.2,)",
-            "child_folders_type": "single_unpredictable",
             "default_name_value": "${NO_NAME_0:%CLUSTER%}",
             "folders": {},
             "attributes": {
@@ -48,6 +47,7 @@
             "wlst_type": "CoherenceTier",
             "version": "[12.1.2,)",
             "child_folders_type": "single",
+            "default_name_value": "${NO_NAME_0:%CLUSTER%}",
             "folders" : {},
             "attributes" : {
                 "CoherenceWebFederatedStorageEnabled": [ {"version": "[12.2.1.1,)", "wlst_mode": "both", "wlst_name": "CoherenceWebFederatedStorageEnabled", "wlst_path": "WP001", "value": {"default": "false" }, "wlst_type": "boolean"  } ],
@@ -57,13 +57,12 @@
             },
             "wlst_attributes_path": "WP001",
             "wlst_paths": {
-                "WP001": "/Cluster${:s}/%CLUSTER%/CoherenceTier/${NO_NAME_0:%CLUSTER%}"
+                "WP001": "/Cluster${:s}/%CLUSTER%/CoherenceTier/%COHERENCETIER%"
             }
         },
         "DatabaseLessLeasingBasis" : {
             "wlst_type": "DatabaseLessLeasingBasis",
             "version": "[10.3.6,)",
-            "child_folders_type": "single_unpredictable",
             "default_name_value": "${NO_NAME_0:%CLUSTER%}",
             "folders": {},
             "attributes" : {
@@ -84,6 +83,7 @@
             "wlst_type": "JTACluster",
             "version": "[12.1.3,)",
             "child_folders_type": "single",
+            "default_name_value": "${NO_NAME_0:%CLUSTER%}",
             "folders" : {},
             "attributes" : {
                 "AbandonTimeoutSeconds":                      [ {"version": "[12.1.3,)",   "wlst_mode": "both",    "wlst_name": "AbandonTimeoutSeconds",                      "wlst_path": "WP001", "value": {"default": 86400   }, "wlst_type": "integer" } ],
@@ -127,16 +127,18 @@
             },
             "wlst_attributes_path": "WP001",
             "wlst_paths": {
-                "WP001": "/Cluster${:s}/%CLUSTER%/JTACluster/${NO_NAME_0:%CLUSTER%}"
+                "WP001": "/Cluster${:s}/%CLUSTER%/JTACluster/%JTACLUSTER%"
             }
         },
         "OverloadProtection" : {
             "wlst_type": "OverloadProtection",
             "child_folders_type": "single",
+            "default_name_value": "${NO_NAME_0:%CLUSTER%}",
             "folders" : {
                 "ServerFailureTrigger" : {
                     "wlst_type": "ServerFailureTrigger",
                     "child_folders_type": "single",
+                    "default_name_value": "${NO_NAME_0:%CLUSTER%}",
                     "folders" : {},
                     "attributes" : {
                         "MaxStuckThreadTime": [ {"version": "[10,)",           "wlst_mode": "both",   "wlst_name": "MaxStuckThreadTime", "wlst_path": "WP001", "value": {"default": 600     }, "wlst_type": "integer" } ],
@@ -145,7 +147,7 @@
                 },
                 "wlst_attributes_path": "WP001",
                 "wlst_paths": {
-                    "WP001": "/Cluster${:s}/%CLUSTER%/OverloadProtection/${NO_NAME_0:%CLUSTER%}/ServerFailureTrigger/${NO_NAME_0:%CLUSTER%}"
+                    "WP001": "/Cluster${:s}/%CLUSTER%/OverloadProtection/%OVERLOADPROTECTION%/ServerFailureTrigger/%SERVERFAILURETRIGGER%"
                 }
               }
             },
@@ -161,7 +163,7 @@
             },
             "wlst_attributes_path": "WP001",
             "wlst_paths": {
-                "WP001": "/Cluster${:s}/%CLUSTER%/OverloadProtection/${NO_NAME_0:%CLUSTER%}"
+                "WP001": "/Cluster${:s}/%CLUSTER%/OverloadProtection/%OVERLOADPROTECTION%"
             }
       }
     },
diff --git a/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/CoherenceClusterSystemResource.json b/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/CoherenceClusterSystemResource.json
index 6358cd0fc..24519b850 100644
--- a/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/CoherenceClusterSystemResource.json
+++ b/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/CoherenceClusterSystemResource.json
@@ -1,5 +1,5 @@
 {
-    "copyright": "Copyright (c) 2017, 2019, Oracle Corporation and/or its affiliates.  All rights reserved.",
+    "copyright": "Copyright (c) 2017, 2020, Oracle Corporation and/or its affiliates.  All rights reserved.",
     "license": "Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl",
     "wlst_type": "CoherenceClusterSystemResource${:s}",
     "child_folders_type": "multiple",
@@ -31,6 +31,7 @@
             "wlst_type": "${CoherenceResource:CoherenceClusterResource}",
             "version" : "[12.1.2,)",
             "child_folders_type": "single",
+            "default_name_value": "%COHERENCECLUSTER%",
             "folders": {
                 "CoherenceAddressProvider": {
                     "wlst_type": "CoherenceAddressProvider${:s}",
@@ -38,7 +39,8 @@
                     "child_folders_type": "multiple",
                     "flattened_folder_data": {
                         "wlst_type": "CoherenceAddressProviders",
-                        "name_value": "${NO_NAME_0:%COHERENCECLUSTER%}"
+                        "name_value": "${NO_NAME_0:%COHERENCECLUSTER%}",
+                        "path_token": "COHERENCEADDRESSPROVIDERS"
                     },
                     "folders": {
                         "CoherenceSocketAddress": {
@@ -52,23 +54,25 @@
                             },
                             "wlst_attributes_path": "WP001",
                             "wlst_paths": {
-                                "WP001": "/CoherenceClusterSystemResource${:s}/%COHERENCECLUSTER%/Coherence${:Cluster}Resource/${NO_NAME_0:%COHERENCECLUSTER%}/CoherenceAddressProviders/${NO_NAME_0:%COHERENCECLUSTER%}/CoherenceAddressProvider${:s}/%COHERENCEADDRESSPROVIDER%/CoherenceSocketAddress${:es}/%COHERENCESOCKETADDRESS%"
+                                "WP001": "/CoherenceClusterSystemResource${:s}/%COHERENCECLUSTER%/Coherence${:Cluster}Resource/%COHERENCERESOURCE%/CoherenceAddressProviders/%COHERENCEADDRESSPROVIDERS%/CoherenceAddressProvider${:s}/%COHERENCEADDRESSPROVIDER%/CoherenceSocketAddress${:es}/%COHERENCESOCKETADDRESS%"
                             }
                         }
                     },
                     "attributes": { },
                     "wlst_attributes_path": "WP001",
                     "wlst_paths": {
-                        "WP001": "/CoherenceClusterSystemResource${:s}/%COHERENCECLUSTER%/Coherence${:Cluster}Resource/%COHERENCECLUSTER%/CoherenceAddressProviders/${NO_NAME_0:%COHERENCECLUSTER%}/CoherenceAddressProvider${:s}/%COHERENCEADDRESSPROVIDER%"
+                        "WP001": "/CoherenceClusterSystemResource${:s}/%COHERENCECLUSTER%/Coherence${:Cluster}Resource/%COHERENCERESOURCE%/CoherenceAddressProviders/%COHERENCEADDRESSPROVIDERS%/CoherenceAddressProvider${:s}/%COHERENCEADDRESSPROVIDER%"
                     }
                 },
                 "CoherenceClusterParams": {
                     "wlst_type": "CoherenceClusterParams",
                     "version" : "[12.1.2,)",
+                    "default_name_value": "${NO_NAME_0:%COHERENCECLUSTER%}",
                     "folders": {
                         "CoherenceIdentityAsserter": {
                             "wlst_type": "CoherenceIdentityAsserter",
                             "version" : "[12.2.1.1,)",
+                            "default_name_value": "${NO_NAME_0:%COHERENCECLUSTER%}",
                             "folders": {
                                 "CoherenceInitParam": {
                                     "wlst_type": "CoherenceInitParam${:s}",
@@ -81,7 +85,7 @@
                                     },
                                     "wlst_attributes_path": "WP001",
                                     "wlst_paths": {
-                                        "WP001": "/CoherenceClusterSystemResource${:s}/%COHERENCECLUSTER%/Coherence${:Cluster}Resource/%COHERENCECLUSTER%/CoherenceClusterParams/${NO_NAME_0:%COHERENCECLUSTER%}/CoherenceIdentityAsserter/${NO_NAME_0:%COHERENCECLUSTER%}/CoherenceInitParam${:s}/%COHERENCEIAINITPARAM%"
+                                        "WP001": "/CoherenceClusterSystemResource${:s}/%COHERENCECLUSTER%/Coherence${:Cluster}Resource/%COHERENCERESOURCE%/CoherenceClusterParams/%COHERENCECLUSTERPARAMS%/CoherenceIdentityAsserter/%COHERENCEIDENTITYASSERTER%/CoherenceInitParam${:s}/%COHERENCEIAINITPARAM%"
                                     }
                                 }
                             },
@@ -90,12 +94,13 @@
                             },
                             "wlst_attributes_path": "WP001",
                             "wlst_paths": {
-                                "WP001": "/CoherenceClusterSystemResource${:s}/%COHERENCECLUSTER%/Coherence${:Cluster}Resource/%COHERENCECLUSTER%/CoherenceClusterParams/${NO_NAME_0:%COHERENCECLUSTER%}/CoherenceIdentityAsserter/${NO_NAME_0:%COHERENCECLUSTER%}"
+                                "WP001": "/CoherenceClusterSystemResource${:s}/%COHERENCECLUSTER%/Coherence${:Cluster}Resource/%COHERENCERESOURCE%/CoherenceClusterParams/%COHERENCECLUSTERPARAMS%/CoherenceIdentityAsserter/%COHERENCEIDENTITYASSERTER%"
                             }
                         },
                         "CoherenceKeystoreParams": {
                             "wlst_type": "CoherenceKeystoreParams",
                             "version" : "[12.2.1.1,)",
+                            "default_name_value": "${NO_NAME_0:%COHERENCECLUSTER%}",
                             "folders": {},
                             "attributes": {
                                 "CoherenceIdentityAlias":                 [ {"version": "[12.2.1.1,)", "wlst_mode": "both",  "wlst_name": "CoherenceIdentityAlias",                 "wlst_path": "WP001", "value": {"default": "None"}, "wlst_type": "string"} ],
@@ -103,7 +108,7 @@
                             },
                             "wlst_attributes_path": "WP001",
                             "wlst_paths": {
-                                "WP001": "/CoherenceClusterSystemResource${:s}/%COHERENCECLUSTER%/Coherence${:Cluster}Resource/%COHERENCECLUSTER%/CoherenceClusterParams/${NO_NAME_0:%COHERENCECLUSTER%}/CoherenceKeystoreParams/${NO_NAME_0:%COHERENCECLUSTER%}"
+                                "WP001": "/CoherenceClusterSystemResource${:s}/%COHERENCECLUSTER%/Coherence${:Cluster}Resource/%COHERENCERESOURCE%/CoherenceClusterParams/%COHERENCECLUSTERPARAMS%/CoherenceKeystoreParams/%COHERENCEKEYSTOREPARAMS%"
                             }
                         },
                         "CoherenceCache": {
@@ -116,7 +121,7 @@
                             },
                             "wlst_attributes_path": "WP001",
                             "wlst_paths": {
-                                "WP001": "/CoherenceClusterSystemResource${:s}/%COHERENCECLUSTER%/Coherence${:Cluster}Resource/%COHERENCECLUSTER%/CoherenceClusterParams/${NO_NAME_0:%COHERENCECLUSTER%}/CoherenceCache${:s}/%COHERENCECACHE%"
+                                "WP001": "/CoherenceClusterSystemResource${:s}/%COHERENCECLUSTER%/Coherence${:Cluster}Resource/%COHERENCERESOURCE%/CoherenceClusterParams/%COHERENCECLUSTERPARAMS%/CoherenceCache${:s}/%COHERENCECACHE%"
                             }
                         },
                         "CoherenceClusterWellKnownAddress": {
@@ -125,7 +130,8 @@
                             "child_folders_type": "multiple",
                             "flattened_folder_data": {
                                 "wlst_type": "CoherenceClusterWellKnownAddresses",
-                                "name_value": "${NO_NAME_0:%COHERENCECLUSTER%}"
+                                "name_value": "${NO_NAME_0:%COHERENCECLUSTER%}",
+                                "path_token": "COHERENCECLUSTERWELLKNOWNADDRESSES"
                             },
                             "folders": {},
                             "attributes": {
@@ -134,7 +140,7 @@
                             },
                             "wlst_attributes_path": "WP001",
                             "wlst_paths": {
-                                "WP001": "/CoherenceClusterSystemResource${:s}/%COHERENCECLUSTER%/Coherence${:Cluster}Resource/%COHERENCECLUSTER%/CoherenceClusterParams/${NO_NAME_0:%COHERENCECLUSTER%}/CoherenceClusterWellKnownAddresses/${NO_NAME_0:%COHERENCECLUSTER%}/CoherenceClusterWellKnownAddress${:es}/%COHERENCEWKA%"
+                                "WP001": "/CoherenceClusterSystemResource${:s}/%COHERENCECLUSTER%/Coherence${:Cluster}Resource/%COHERENCERESOURCE%/CoherenceClusterParams/%COHERENCECLUSTERPARAMS%/CoherenceClusterWellKnownAddresses/%COHERENCECLUSTERWELLKNOWNADDRESSES%/CoherenceClusterWellKnownAddress${:es}/%COHERENCEWKA%"
                             }
                         },
                         "CoherenceService": {
@@ -147,7 +153,7 @@
                             },
                             "wlst_attributes_path": "WP001",
                             "wlst_paths": {
-                                "WP001": "/CoherenceClusterSystemResource${:s}/%COHERENCECLUSTER%/Coherence${:Cluster}Resource/%COHERENCECLUSTER%/CoherenceClusterParams/${NO_NAME_0:%COHERENCECLUSTER%}/CoherenceService${:s}/%COHERENCESERVICE%"
+                                "WP001": "/CoherenceClusterSystemResource${:s}/%COHERENCECLUSTER%/Coherence${:Cluster}Resource/%COHERENCERESOURCE%/CoherenceClusterParams/%COHERENCECLUSTERPARAMS%/CoherenceService${:s}/%COHERENCESERVICE%"
                             }
                         }
                     },
@@ -168,12 +174,13 @@
                     },
                     "wlst_attributes_path": "WP001",
                     "wlst_paths": {
-                        "WP001": "/CoherenceClusterSystemResource${:s}/%COHERENCECLUSTER%/Coherence${:Cluster}Resource/%COHERENCECLUSTER%/CoherenceClusterParams/${NO_NAME_0:%COHERENCECLUSTER%}"
+                        "WP001": "/CoherenceClusterSystemResource${:s}/%COHERENCECLUSTER%/Coherence${:Cluster}Resource/%COHERENCERESOURCE%/CoherenceClusterParams/%COHERENCECLUSTERPARAMS%"
                     }
                 },
                 "CoherencePersistenceParams": {
                     "wlst_type": "CoherencePersistenceParams",
                     "version" : "[12.2.1.1,)",
+                    "default_name_value": "${NO_NAME_0:%COHERENCECLUSTER%}",
                     "folders": {},
                     "attributes": {
                         "ActiveDirectory":         [ {"version": "[12.2.1.1,)",     "wlst_mode": "both",    "wlst_name": "ActiveDirectory",        "wlst_path": "WP001", "value": {"default": "None"               }, "wlst_type": "string", "uses_path_tokens": "true" } ],
@@ -183,12 +190,13 @@
                     },
                     "wlst_attributes_path": "WP001",
                     "wlst_paths": {
-                        "WP001": "/CoherenceClusterSystemResource${:s}/%COHERENCECLUSTER%/Coherence${:Cluster}Resource/%COHERENCECLUSTER%/CoherencePersistenceParams/${NO_NAME_0:%COHERENCECLUSTER%}"
+                        "WP001": "/CoherenceClusterSystemResource${:s}/%COHERENCECLUSTER%/Coherence${:Cluster}Resource/%COHERENCERESOURCE%/CoherencePersistenceParams/%COHERENCEPERSISTENCEPARAMS%"
                     }
                 },
                 "CoherenceFederationParams": {
                     "wlst_type": "CoherenceFederationParams",
                     "version" : "[12.2.1.1,)",
+                    "default_name_value": "${NO_NAME_0:%COHERENCECLUSTER%}",
                     "folders": {},
                     "attributes": {
                         "FederationTopology":                [ {"version": "[12.2.1.1,)",     "wlst_mode": "both",    "wlst_name": "FederationTopology",               "wlst_path": "WP001", "value": {"default": "None"           }, "wlst_type": "string" } ],
@@ -198,12 +206,13 @@
                     },
                     "wlst_attributes_path": "WP001",
                     "wlst_paths": {
-                        "WP001": "/CoherenceClusterSystemResource${:s}/%COHERENCECLUSTER%/Coherence${:Cluster}Resource/%COHERENCECLUSTER%/CoherenceFederationParams/${NO_NAME_0:%COHERENCECLUSTER%}"
+                        "WP001": "/CoherenceClusterSystemResource${:s}/%COHERENCECLUSTER%/Coherence${:Cluster}Resource/%COHERENCERESOURCE%/CoherenceFederationParams/%COHERENCEFEDERATIONPARAMS%"
                     }
                 },
                 "CoherenceLoggingParams": {
                     "wlst_type": "CoherenceLoggingParams",
                     "version" : "[12.1.2,)",
+                    "default_name_value": "${NO_NAME_0:%COHERENCECLUSTER%}",
                     "folders": {},
                     "attributes": {
                         "Enabled":           [ {"version": "[12.1.2,)",     "wlst_mode": "both",    "wlst_name": "Enabled",       "wlst_path": "WP001", "value": {"default": "${None:true}"                                                                               }, "wlst_type": "boolean"} ],
@@ -213,7 +222,7 @@
                     },
                     "wlst_attributes_path": "WP001",
                     "wlst_paths": {
-                        "WP001": "/CoherenceClusterSystemResource${:s}/%COHERENCECLUSTER%/Coherence${:Cluster}Resource/%COHERENCECLUSTER%/CoherenceLoggingParams/${NO_NAME_0:%COHERENCECLUSTER%}"
+                        "WP001": "/CoherenceClusterSystemResource${:s}/%COHERENCECLUSTER%/Coherence${:Cluster}Resource/%COHERENCERESOURCE%/CoherenceLoggingParams/%COHERENCELOGGINGPARAMS%"
                     }
                 }
             },
@@ -224,11 +233,12 @@
             },
             "wlst_attributes_path": "WP001",
             "wlst_paths": {
-                "WP001": "/CoherenceClusterSystemResource${:s}/%COHERENCECLUSTER%/Coherence${:Cluster}Resource/%COHERENCECLUSTER%"
+                "WP001": "/CoherenceClusterSystemResource${:s}/%COHERENCECLUSTER%/Coherence${:Cluster}Resource/%COHERENCERESOURCE%"
             }
         },
         "SubDeployment": {
             "wlst_type": "SubDeployment${:s}",
+            "child_folders_type": "multiple",
             "version" : "[12.1.2,)",
             "folders": {},
             "attributes": {
@@ -241,8 +251,8 @@
             },
             "wlst_attributes_path": "WP001",
             "wlst_paths": {
-                "WP001": "/CoherenceClusterSystemResource${:s}/%COHERENCECLUSTER%/SubDeployment${:s}/%SUBDEPLOY%",
-                "WP002": "/CoherenceClusterSystemResource${:s}/%COHERENCECLUSTER%/SubDeployment${:s}/%SUBDEPLOY%/Targets"
+                "WP001": "/CoherenceClusterSystemResource${:s}/%COHERENCECLUSTER%/SubDeployment${:s}/%SUBDEPLOYMENT%",
+                "WP002": "/CoherenceClusterSystemResource${:s}/%COHERENCECLUSTER%/SubDeployment${:s}/%SUBDEPLOYMENT%/Targets"
             }
         }
     },
diff --git a/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/EmbeddedLDAP.json b/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/EmbeddedLDAP.json
index 0abb54749..de847ef3a 100644
--- a/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/EmbeddedLDAP.json
+++ b/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/EmbeddedLDAP.json
@@ -1,8 +1,7 @@
 {
-    "copyright": "Copyright (c) 2019, Oracle Corporation and/or its affiliates.  All rights reserved.",
+    "copyright": "Copyright (c) 2019, 2020, Oracle Corporation and/or its affiliates.  All rights reserved.",
     "license": "Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl",
     "wlst_type": "EmbeddedLDAP",
-    "child_folders_type": "single_unpredictable",
     "default_name_value": "%DOMAIN%",
     "short_name": "LDAP",
     "folders": {},
@@ -23,6 +22,6 @@
     },
     "wlst_attributes_path": "WP001",
     "wlst_paths": {
-        "WP001": "/EmbeddedLDAP/%EMBEDDED_LDAP%"
+        "WP001": "/EmbeddedLDAP/%EMBEDDEDLDAP%"
     }
 }
diff --git a/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/JDBCSystemResource.json b/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/JDBCSystemResource.json
index c472137c1..01541bc5b 100644
--- a/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/JDBCSystemResource.json
+++ b/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/JDBCSystemResource.json
@@ -1,5 +1,5 @@
 {
-    "copyright": "Copyright (c) 2017, 2019, Oracle Corporation and/or its affiliates.  All rights reserved.",
+    "copyright": "Copyright (c) 2017, 2020, Oracle Corporation and/or its affiliates.  All rights reserved.",
     "license": "Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl",
     "wlst_type": "JDBCSystemResource${:s}",
     "child_folders_type": "multiple",
@@ -7,9 +7,11 @@
     "folders": {
         "JdbcResource" : {
             "wlst_type": "${Jdbc:JDBC}Resource",
+            "default_name_value": "%DATASOURCE%",
             "folders": {
                 "JDBCConnectionPoolParams": {
                     "wlst_type": "JDBCConnectionPoolParams",
+                    "default_name_value": "${NO_NAME_0:%DATASOURCE%}",
                     "folders": {},
                     "attributes": {
                         "CapacityIncrement":                     [ {"version": "[10,)",       "wlst_mode": "both",    "wlst_name": "CapacityIncrement",                      "wlst_path": "WP001", "value": {"default": "${None:1}"          },  "wlst_type": "integer",       "get_method": "LSA"} ],
@@ -54,11 +56,12 @@
                     },
                     "wlst_attributes_path": "WP001",
                     "wlst_paths": {
-                        "WP001": "/JDBCSystemResource${:s}/%DATASOURCE%/${Jdbc:JDBC}Resource/%DATASOURCE%/JDBCConnectionPoolParams/${NO_NAME_0:%DATASOURCE%}"
+                        "WP001": "/JDBCSystemResource${:s}/%DATASOURCE%/${Jdbc:JDBC}Resource/%JDBCRESOURCE%/JDBCConnectionPoolParams/%JDBCCONNECTIONPOOLPARAMS%"
                     }
                 },
                 "JDBCDataSourceParams": {
                     "wlst_type": "JDBCDataSourceParams",
+                    "default_name_value": "${NO_NAME_0:%DATASOURCE%}",
                     "folders": {},
                     "attributes": {
                         "AlgorithmType":                         [ {"version": "[10,)",       "wlst_mode": "both",    "wlst_name": "AlgorithmType",                          "wlst_path": "WP001", "value": {"default": "${None:Failover}"      },  "wlst_type": "string"           } ],
@@ -78,18 +81,20 @@
                     },
                     "wlst_attributes_path": "WP001",
                     "wlst_paths": {
-                        "WP001": "/JDBCSystemResource${:s}/%DATASOURCE%/${Jdbc:JDBC}Resource/%DATASOURCE%/JDBCDataSourceParams/${NO_NAME_0:%DATASOURCE%}"
+                        "WP001": "/JDBCSystemResource${:s}/%DATASOURCE%/${Jdbc:JDBC}Resource/%JDBCRESOURCE%/JDBCDataSourceParams/%JDBCDATASOURCEPARAMS%"
                     }
                 },
                 "JDBCDriverParams": {
                     "wlst_type": "JDBCDriverParams",
+                    "default_name_value": "${NO_NAME_0:%DATASOURCE%}",
                     "folders": {
                         "Properties": {
                             "wlst_type": "Propert${y:ies}",
                             "child_folders_type": "multiple",
                             "flattened_folder_data": {
                                 "wlst_type": "Properties",
-                                "name_value": "${NO_NAME_0:%DATASOURCE%}"
+                                "name_value": "${NO_NAME_0:%DATASOURCE%}",
+                                "path_token": "PROPERTIES"
                             },
                             "folders": { },
                             "attributes": {
@@ -99,7 +104,7 @@
                             },
                             "wlst_attributes_path": "WP001",
                             "wlst_paths": {
-                                "WP001": "/JDBCSystemResource${:s}/%DATASOURCE%/${Jdbc:JDBC}Resource/%DATASOURCE%/JDBCDriverParams/${NO_NAME_0:%DATASOURCE%}/Properties/${NO_NAME_0:%DATASOURCE%}/Propert${y:ies}/%PROPERTY_NAME%"
+                                "WP001": "/JDBCSystemResource${:s}/%DATASOURCE%/${Jdbc:JDBC}Resource/%JDBCRESOURCE%/JDBCDriverParams/%JDBCDRIVERPARAMS%/Properties/%PROPERTIES%/Propert${y:ies}/%PROPERTY_NAME%"
                             }
                         }
                     },
@@ -113,11 +118,12 @@
                     },
                     "wlst_attributes_path": "WP001",
                     "wlst_paths": {
-                        "WP001": "/JDBCSystemResource${:s}/%DATASOURCE%/${Jdbc:JDBC}Resource/%DATASOURCE%/JDBCDriverParams/${NO_NAME_0:%DATASOURCE%}"
+                        "WP001": "/JDBCSystemResource${:s}/%DATASOURCE%/${Jdbc:JDBC}Resource/%JDBCRESOURCE%/JDBCDriverParams/%JDBCDRIVERPARAMS%"
                     }
                 },
                 "JDBCOracleParams": {
                     "wlst_type": "JDBCOracleParams",
+                    "default_name_value": "${NO_NAME_0:%DATASOURCE%}",
                     "folders": {},
                     "attributes": {
                         "ActiveGridlink":                    [ {"version": "[12.1.2,)",   "wlst_mode": "both",    "wlst_name": "ActiveGridlink",                    "wlst_path": "WP001", "value": {"default": "${None:false}"        },  "wlst_type": "boolean",        "get_method": "LSA"} ],
@@ -135,11 +141,12 @@
                     },
                     "wlst_attributes_path": "WP001",
                     "wlst_paths": {
-                        "WP001": "/JDBCSystemResource${:s}/%DATASOURCE%/${Jdbc:JDBC}Resource/%DATASOURCE%/JDBCOracleParams/${NO_NAME_0:%DATASOURCE%}"
+                        "WP001": "/JDBCSystemResource${:s}/%DATASOURCE%/${Jdbc:JDBC}Resource/%JDBCRESOURCE%/JDBCOracleParams/%JDBCORACLEPARAMS%"
                     }
                 },
                 "JDBCXAParams": {
                     "wlst_type": "JDBCXAParams",
+                    "default_name_value": "${NO_NAME_0:%DATASOURCE%}",
                     "folders": {},
                     "attributes": {
                         "KeepLogicalConnOpenOnRelease":        [ {"version": "[10,)",     "wlst_mode": "both",    "wlst_name": "KeepLogicalConnOpenOnRelease",   "wlst_path": "WP001", "value": {"default": "${None:false}"  },  "wlst_type": "boolean", "get_method": "LSA"} ],
@@ -157,7 +164,7 @@
                     },
                     "wlst_attributes_path": "WP001",
                     "wlst_paths": {
-                        "WP001": "/JDBCSystemResource${:s}/%DATASOURCE%/${Jdbc:JDBC}Resource/%DATASOURCE%/JDBCXAParams/${NO_NAME_0:%DATASOURCE%}"
+                        "WP001": "/JDBCSystemResource${:s}/%DATASOURCE%/${Jdbc:JDBC}Resource/%JDBCRESOURCE%/JDBCXAParams/%JDBCXAPARAMS%"
                     }
                 }
             },
@@ -167,7 +174,7 @@
             },
             "wlst_attributes_path": "WP001",
             "wlst_paths": {
-                "WP001": "/JDBCSystemResource${:s}/%DATASOURCE%/${Jdbc:JDBC}Resource/%DATASOURCE%"
+                "WP001": "/JDBCSystemResource${:s}/%DATASOURCE%/${Jdbc:JDBC}Resource/%JDBCRESOURCE%"
             }
         },
         "SubDeployment" : {
diff --git a/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/JMSServer.json b/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/JMSServer.json
index 6541d3e69..26c349d78 100644
--- a/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/JMSServer.json
+++ b/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/JMSServer.json
@@ -40,7 +40,6 @@
         },
         "JmsMessageLogFile": {
             "wlst_type": "${Jms:JMS}MessageLogFile",
-            "child_folders_type": "single_unpredictable",
             "default_name_value": "${NO_NAME_0:%JMSSERVER%}",
             "folders": {},
             "attributes": {
diff --git a/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/JMSSystemResource.json b/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/JMSSystemResource.json
index 77d9a8015..d1439871d 100644
--- a/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/JMSSystemResource.json
+++ b/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/JMSSystemResource.json
@@ -24,7 +24,8 @@
                   }
             },
             "JmsResource": {
-            "wlst_type": "${Jms:JMS}Resource",
+                  "wlst_type": "${Jms:JMS}Resource",
+                  "default_name_value": "${NO_NAME_0:%JMSSYSTEMRESOURCE%}",
                   "folders": {
                         "ConnectionFactory": {
                               "wlst_type": "ConnectionFactor${y:ies}",
@@ -32,6 +33,7 @@
                               "folders": {
                                     "ClientParams": {
                                           "wlst_type": "ClientParams",
+                                          "default_name_value": "${NO_NAME_0:%CONNECTIONFACTORY%}",
                                           "folders": {},
                                           "attributes": {
                                                 "AcknowledgePolicy":          [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "AcknowledgePolicy",          "wlst_path": "WP001", "value": {"default": "${None:All}"       }, "wlst_type": "string"  } ],
@@ -48,11 +50,12 @@
                                           },
                                           "wlst_attributes_path": "WP001",
                                           "wlst_paths": {
-                                                "WP001": "/JMSSystemResource${:s}/%JMSSYSTEMRESOURCE%/${Jms:JMS}Resource/${NO_NAME_0:%JMSSYSTEMRESOURCE%}/ConnectionFactor${y:ies}/%CONNECTIONFACTORY%/ClientParams/${NO_NAME_0:%CONNECTIONFACTORY%}"
+                                                "WP001": "/JMSSystemResource${:s}/%JMSSYSTEMRESOURCE%/${Jms:JMS}Resource/%JMSRESOURCE%/ConnectionFactor${y:ies}/%CONNECTIONFACTORY%/ClientParams/%CLIENTPARAMS%"
                                           }
                                     },
                                     "DefaultDeliveryParams": {
                                           "wlst_type": "DefaultDeliveryParams",
+                                          "default_name_value": "${NO_NAME_0:%CONNECTIONFACTORY%}",
                                           "folders": {},
                                           "attributes": {
                                                 "DefaultCompressionThreshold": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "DefaultCompressionThreshold", "wlst_path": "WP001", "value": {"default": "${0:2147483647}"       }, "wlst_type": "integer" } ],
@@ -66,11 +69,12 @@
                                           },
                                           "wlst_attributes_path": "WP001",
                                           "wlst_paths": {
-                                                "WP001": "/JMSSystemResource${:s}/%JMSSYSTEMRESOURCE%/${Jms:JMS}Resource/${NO_NAME_0:%JMSSYSTEMRESOURCE%}/ConnectionFactor${y:ies}/%CONNECTIONFACTORY%/DefaultDeliveryParams/${NO_NAME_0:%CONNECTIONFACTORY%}"
+                                                "WP001": "/JMSSystemResource${:s}/%JMSSYSTEMRESOURCE%/${Jms:JMS}Resource/%JMSRESOURCE%/ConnectionFactor${y:ies}/%CONNECTIONFACTORY%/DefaultDeliveryParams/%DEFAULTDELIVERYPARAMS%"
                                           }
                                     },
                                     "FlowControlParams": {
                                           "wlst_type": "FlowControlParams",
+                                          "default_name_value": "${NO_NAME_0:%CONNECTIONFACTORY%}",
                                           "folders": {},
                                           "attributes": {
                                                 "FlowControlEnabled":   [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "FlowControlEnabled",   "wlst_path": "WP001", "value": {"default": "true"               }, "wlst_type": "boolean"} ],
@@ -83,11 +87,12 @@
                                           },
                                           "wlst_attributes_path": "WP001",
                                           "wlst_paths": {
-                                                "WP001": "/JMSSystemResource${:s}/%JMSSYSTEMRESOURCE%/${Jms:JMS}Resource/${NO_NAME_0:%JMSSYSTEMRESOURCE%}/ConnectionFactor${y:ies}/%CONNECTIONFACTORY%/FlowControlParams/${NO_NAME_0:%CONNECTIONFACTORY%}"
+                                                "WP001": "/JMSSystemResource${:s}/%JMSSYSTEMRESOURCE%/${Jms:JMS}Resource/%JMSRESOURCE%/ConnectionFactor${y:ies}/%CONNECTIONFACTORY%/FlowControlParams/%FLOWCONTROLPARAMS%"
                                           }
                                     },
                                     "LoadBalancingParams": {
                                           "wlst_type": "LoadBalancingParams",
+                                          "default_name_value": "${NO_NAME_0:%CONNECTIONFACTORY%}",
                                           "folders": {},
                                           "attributes": {
                                                 "LoadBalancingEnabled":         [ {"version": "[10,)",         "wlst_mode": "both", "wlst_name": "LoadBalancingEnabled",          "wlst_path": "WP001", "value": {"default": "true"},               "wlst_type": "boolean"} ],
@@ -96,11 +101,12 @@
                                           },
                                           "wlst_attributes_path": "WP001",
                                           "wlst_paths": {
-                                                "WP001": "/JMSSystemResource${:s}/%JMSSYSTEMRESOURCE%/${Jms:JMS}Resource/${NO_NAME_0:%JMSSYSTEMRESOURCE%}/ConnectionFactor${y:ies}/%CONNECTIONFACTORY%/LoadBalancingParams/${NO_NAME_0:%CONNECTIONFACTORY%}"
+                                                "WP001": "/JMSSystemResource${:s}/%JMSSYSTEMRESOURCE%/${Jms:JMS}Resource/%JMSRESOURCE%/ConnectionFactor${y:ies}/%CONNECTIONFACTORY%/LoadBalancingParams/%LOADBALANCINGPARAMS%"
                                           }
                                     },
                                     "SecurityParams": {
                                           "wlst_type": "SecurityParams",
+                                          "default_name_value": "${NO_NAME_0:%CONNECTIONFACTORY%}",
                                           "folders": {},
                                           "attributes": {
                                                 "AttachJMSXUserId": [ {"version": "[10,)",          "wlst_mode": "both",  "wlst_name": "AttachJMSXUserId", "wlst_path": "WP001", "value": {"default": "false"                 }, "wlst_type": "boolean", "get_method": "${LSA:GET}" } ],
@@ -108,11 +114,12 @@
                                           },
                                           "wlst_attributes_path": "WP001",
                                           "wlst_paths": {
-                                                "WP001": "/JMSSystemResource${:s}/%JMSSYSTEMRESOURCE%/${Jms:JMS}Resource/${NO_NAME_0:%JMSSYSTEMRESOURCE%}/ConnectionFactor${y:ies}/%CONNECTIONFACTORY%/SecurityParams/${NO_NAME_0:%CONNECTIONFACTORY%}"
+                                                "WP001": "/JMSSystemResource${:s}/%JMSSYSTEMRESOURCE%/${Jms:JMS}Resource/%JMSRESOURCE%/ConnectionFactor${y:ies}/%CONNECTIONFACTORY%/SecurityParams/%SECURITYPARAMS%"
                                           }
                                     },
                                     "TransactionParams": {
                                           "wlst_type": "TransactionParams",
+                                          "default_name_value": "${NO_NAME_0:%CONNECTIONFACTORY%}",
                                           "folders": {},
                                           "attributes": {
                                                 "TransactionTimeout":         [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "TransactionTimeout",         "wlst_path": "WP001", "value": {"default": "${0:3600}"   }, "wlst_type": "long"   } ],
@@ -120,7 +127,7 @@
                                           },
                                           "wlst_attributes_path": "WP001",
                                           "wlst_paths": {
-                                                "WP001": "/JMSSystemResource${:s}/%JMSSYSTEMRESOURCE%/${Jms:JMS}Resource/${NO_NAME_0:%JMSSYSTEMRESOURCE%}/ConnectionFactor${y:ies}/%CONNECTIONFACTORY%/TransactionParams/${NO_NAME_0:%CONNECTIONFACTORY%}"
+                                                "WP001": "/JMSSystemResource${:s}/%JMSSYSTEMRESOURCE%/${Jms:JMS}Resource/%JMSRESOURCE%/ConnectionFactor${y:ies}/%CONNECTIONFACTORY%/TransactionParams/%TRANSACTIONPARAMS%"
                                           }
                                     }
                               },
@@ -133,7 +140,7 @@
                               },
                               "wlst_attributes_path": "WP001",
                               "wlst_paths": {
-                                    "WP001": "/JMSSystemResource${:s}/%JMSSYSTEMRESOURCE%/${Jms:JMS}Resource/${NO_NAME_0:%JMSSYSTEMRESOURCE%}/ConnectionFactor${y:ies}/%CONNECTIONFACTORY%"
+                                    "WP001": "/JMSSystemResource${:s}/%JMSSYSTEMRESOURCE%/${Jms:JMS}Resource/%JMSRESOURCE%/ConnectionFactor${y:ies}/%CONNECTIONFACTORY%"
                               }
                         },
                         "DestinationKey": {
@@ -148,7 +155,7 @@
                               },
                               "wlst_attributes_path": "WP001",
                               "wlst_paths": {
-                                    "WP001": "/JMSSystemResource${:s}/%JMSSYSTEMRESOURCE%/${Jms:JMS}Resource/${NO_NAME_0:%JMSSYSTEMRESOURCE%}/DestinationKey${:s}/%DESTINATIONKEY%"
+                                    "WP001": "/JMSSystemResource${:s}/%JMSSYSTEMRESOURCE%/${Jms:JMS}Resource/%JMSRESOURCE%/DestinationKey${:s}/%DESTINATIONKEY%"
                               }
                         },
                         "DistributedQueue": {
@@ -166,7 +173,7 @@
                                           },
                                           "wlst_attributes_path": "WP001",
                                           "wlst_paths": {
-                                                "WP001": "/JMSSystemResource${:s}/%JMSSYSTEMRESOURCE%/${Jms:JMS}Resource/${NO_NAME_0:%JMSSYSTEMRESOURCE%}/DistributedQueue${:s}/%DISTRIBUTEDQUEUE%/DistributedQueueMember${:s}/%DISTRIBUTEDQUEUEMEMBER%"
+                                                "WP001": "/JMSSystemResource${:s}/%JMSSYSTEMRESOURCE%/${Jms:JMS}Resource/%JMSRESOURCE%/DistributedQueue${:s}/%DISTRIBUTEDQUEUE%/DistributedQueueMember${:s}/%DISTRIBUTEDQUEUEMEMBER%"
                                           }
                                     }
                               },
@@ -183,7 +190,7 @@
                               },
                               "wlst_attributes_path": "WP001",
                               "wlst_paths": {
-                                    "WP001": "/JMSSystemResource${:s}/%JMSSYSTEMRESOURCE%/${Jms:JMS}Resource/${NO_NAME_0:%JMSSYSTEMRESOURCE%}/DistributedQueue${:s}/%DISTRIBUTEDQUEUE%"
+                                    "WP001": "/JMSSystemResource${:s}/%JMSSYSTEMRESOURCE%/${Jms:JMS}Resource/%JMSRESOURCE%/DistributedQueue${:s}/%DISTRIBUTEDQUEUE%"
                               }
                         },
                         "DistributedTopic": {
@@ -201,7 +208,7 @@
                                           },
                                           "wlst_attributes_path": "WP001",
                                           "wlst_paths": {
-                                                "WP001": "/JMSSystemResource${:s}/%JMSSYSTEMRESOURCE%/${Jms:JMS}Resource/${NO_NAME_0:%JMSSYSTEMRESOURCE%}/DistributedTopic${:s}/%DISTRIBUTEDTOPIC%/DistributedTopicMember${:s}/%DISTRIBUTEDTOPICMEMBER%"
+                                                "WP001": "/JMSSystemResource${:s}/%JMSSYSTEMRESOURCE%/${Jms:JMS}Resource/%JMSRESOURCE%/DistributedTopic${:s}/%DISTRIBUTEDTOPIC%/DistributedTopicMember${:s}/%DISTRIBUTEDTOPICMEMBER%"
                                           }
                                     }
                               },
@@ -216,7 +223,7 @@
                               },
                               "wlst_attributes_path": "WP001",
                               "wlst_paths": {
-                                    "WP001": "/JMSSystemResource${:s}/%JMSSYSTEMRESOURCE%/${Jms:JMS}Resource/${NO_NAME_0:%JMSSYSTEMRESOURCE%}/DistributedTopic${:s}/%DISTRIBUTEDTOPIC%"
+                                    "WP001": "/JMSSystemResource${:s}/%JMSSYSTEMRESOURCE%/${Jms:JMS}Resource/%JMSRESOURCE%/DistributedTopic${:s}/%DISTRIBUTEDTOPIC%"
                               }
                         },
                         "ForeignServer": {
@@ -238,7 +245,7 @@
                                           },
                                           "wlst_attributes_path": "WP001",
                                           "wlst_paths": {
-                                                "WP001": "/JMSSystemResource${:s}/%JMSSYSTEMRESOURCE%/${Jms:JMS}Resource/${NO_NAME_0:%JMSSYSTEMRESOURCE%}/ForeignServer${:s}/%FOREIGNSERVER%/ForeignConnectionFactor${y:ies}/%FOREIGNCONNECTIONFACTORY%"
+                                                "WP001": "/JMSSystemResource${:s}/%JMSSYSTEMRESOURCE%/${Jms:JMS}Resource/%JMSRESOURCE%/ForeignServer${:s}/%FOREIGNSERVER%/ForeignConnectionFactor${y:ies}/%FOREIGNCONNECTIONFACTORY%"
                                           }
                                     },
                                     "ForeignDestination": {
@@ -253,7 +260,7 @@
                                           },
                                           "wlst_attributes_path": "WP001",
                                           "wlst_paths": {
-                                                "WP001": "/JMSSystemResource${:s}/%JMSSYSTEMRESOURCE%/${Jms:JMS}Resource/${NO_NAME_0:%JMSSYSTEMRESOURCE%}/ForeignServer${:s}/%FOREIGNSERVER%/ForeignDestination${:s}/%FOREIGNDESTINATION%"
+                                                "WP001": "/JMSSystemResource${:s}/%JMSSYSTEMRESOURCE%/${Jms:JMS}Resource/%JMSRESOURCE%/ForeignServer${:s}/%FOREIGNSERVER%/ForeignDestination${:s}/%FOREIGNDESTINATION%"
                                           }
                                     },
                                     "JNDIProperty": {
@@ -266,7 +273,7 @@
                                           },
                                           "wlst_attributes_path": "WP001",
                                           "wlst_paths": {
-                                                "WP001": "/JMSSystemResource${:s}/%JMSSYSTEMRESOURCE%/${Jms:JMS}Resource/${NO_NAME_0:%JMSSYSTEMRESOURCE%}/ForeignServer${:s}/%FOREIGNSERVER%/JNDIPropert${y:ies}/%FOLDERNAME%"
+                                                "WP001": "/JMSSystemResource${:s}/%JMSSYSTEMRESOURCE%/${Jms:JMS}Resource/%JMSRESOURCE%/ForeignServer${:s}/%FOREIGNSERVER%/JNDIPropert${y:ies}/%FOLDERNAME%"
                                           }
                                     }
                               },
@@ -281,7 +288,7 @@
                               },
                               "wlst_attributes_path": "WP001",
                               "wlst_paths": {
-                                    "WP001": "/JMSSystemResource${:s}/%JMSSYSTEMRESOURCE%/${Jms:JMS}Resource/${NO_NAME_0:%JMSSYSTEMRESOURCE%}/ForeignServer${:s}/%FOREIGNSERVER%"
+                                    "WP001": "/JMSSystemResource${:s}/%JMSSYSTEMRESOURCE%/${Jms:JMS}Resource/%JMSRESOURCE%/ForeignServer${:s}/%FOREIGNSERVER%"
                               }
                         },
                         "Queue": {
@@ -290,6 +297,7 @@
                               "folders": {
                                     "DeliveryFailureParams": {
                                           "wlst_type": "DeliveryFailureParams",
+                                          "default_name_value": "${NO_NAME_0:%QUEUE%}",
                                           "folders": {},
                                           "attributes": {
                                                 "ErrorDestination":        [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "ErrorDestination",        "wlst_path": "WP001", "value": {"default": "None"             }, "wlst_type": "string", "get_method": "LSA", "set_method": "MBEAN.set_jms_error_destination_mbean", "set_mbean_type": "weblogic.j2ee.descriptor.wl.DestinationBean"} ],
@@ -299,11 +307,12 @@
                                           },
                                           "wlst_attributes_path": "WP001",
                                           "wlst_paths": {
-                                                "WP001": "/JMSSystemResource${:s}/%JMSSYSTEMRESOURCE%/${Jms:JMS}Resource/${NO_NAME_0:%JMSSYSTEMRESOURCE%}/Queue${:s}/%QUEUE%/DeliveryFailureParams/${NO_NAME_0:%QUEUE%}"
+                                                "WP001": "/JMSSystemResource${:s}/%JMSSYSTEMRESOURCE%/${Jms:JMS}Resource/%JMSRESOURCE%/Queue${:s}/%QUEUE%/DeliveryFailureParams/%DELIVERYFAILUREPARAMS%"
                                           }
                                     },
                                     "DeliveryParamsOverrides": {
                                           "wlst_type": "DeliveryParamsOverrides",
+                                          "default_name_value": "${NO_NAME_0:%QUEUE%}",
                                           "folders": {},
                                           "attributes": {
                                                 "DeliveryMode":    [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "DeliveryMode",    "wlst_path": "WP001", "value": {"default": "${None:No-Delivery}" }, "wlst_type": "string" } ],
@@ -314,11 +323,12 @@
                                           },
                                           "wlst_attributes_path": "WP001",
                                           "wlst_paths": {
-                                                "WP001": "/JMSSystemResource${:s}/%JMSSYSTEMRESOURCE%/${Jms:JMS}Resource/${NO_NAME_0:%JMSSYSTEMRESOURCE%}/Queue${:s}/%QUEUE%/DeliveryParamsOverrides/${NO_NAME_0:%QUEUE%}"
+                                                "WP001": "/JMSSystemResource${:s}/%JMSSYSTEMRESOURCE%/${Jms:JMS}Resource/%JMSRESOURCE%/Queue${:s}/%QUEUE%/DeliveryParamsOverrides/%DELIVERYPARAMSOVERRIDES%"
                                           }
                                     },
                                     "MessageLoggingParams": {
                                           "wlst_type": "MessageLoggingParams",
+                                          "default_name_value": "${NO_NAME_0:%QUEUE%}",
                                           "folders": {},
                                           "attributes": {
                                                 "MessageLoggingEnabled": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "MessageLoggingEnabled", "wlst_path": "WP001", "value": {"default": "false"}, "wlst_type": "boolean"} ],
@@ -326,11 +336,12 @@
                                           },
                                           "wlst_attributes_path": "WP001",
                                           "wlst_paths": {
-                                                "WP001": "/JMSSystemResource${:s}/%JMSSYSTEMRESOURCE%/${Jms:JMS}Resource/${NO_NAME_0:%JMSSYSTEMRESOURCE%}/Queue${:s}/%QUEUE%/MessageLoggingParams/${NO_NAME_0:%QUEUE%}"
+                                                "WP001": "/JMSSystemResource${:s}/%JMSSYSTEMRESOURCE%/${Jms:JMS}Resource/%JMSRESOURCE%/Queue${:s}/%QUEUE%/MessageLoggingParams/%MESSAGELOGGINGPARAMS%"
                                           }
                                     },
                                     "Thresholds": {
                                           "wlst_type": "Thresholds",
+                                          "default_name_value": "${NO_NAME_0:%QUEUE%}",
                                           "folders": {},
                                           "attributes": {
                                                 "BytesHigh":    [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "BytesHigh",    "wlst_path": "WP001", "value": {"default": "${0:9223372036854775807}"}, "wlst_type": "long" } ],
@@ -340,7 +351,7 @@
                                           },
                                           "wlst_attributes_path": "WP001",
                                           "wlst_paths": {
-                                                "WP001": "/JMSSystemResource${:s}/%JMSSYSTEMRESOURCE%/${Jms:JMS}Resource/${NO_NAME_0:%JMSSYSTEMRESOURCE%}/Queue${:s}/%QUEUE%/Thresholds/${NO_NAME_0:%QUEUE%}"
+                                                "WP001": "/JMSSystemResource${:s}/%JMSSYSTEMRESOURCE%/${Jms:JMS}Resource/%JMSRESOURCE%/Queue${:s}/%QUEUE%/Thresholds/%THRESHOLDS%"
                                           }
                                     }
                               },
@@ -372,7 +383,7 @@
                               },
                               "wlst_attributes_path": "WP001",
                               "wlst_paths": {
-                                    "WP001": "/JMSSystemResource${:s}/%JMSSYSTEMRESOURCE%/${Jms:JMS}Resource/${NO_NAME_0:%JMSSYSTEMRESOURCE%}/Queue${:s}/%QUEUE%"
+                                    "WP001": "/JMSSystemResource${:s}/%JMSSYSTEMRESOURCE%/${Jms:JMS}Resource/%JMSRESOURCE%/Queue${:s}/%QUEUE%"
                               }
                         },
                         "Quota": {
@@ -388,7 +399,7 @@
                               },
                               "wlst_attributes_path": "WP001",
                               "wlst_paths": {
-                                    "WP001": "/JMSSystemResource${:s}/%JMSSYSTEMRESOURCE%/${Jms:JMS}Resource/${NO_NAME_0:%JMSSYSTEMRESOURCE%}/Quota${:s}/%QUOTA%"
+                                    "WP001": "/JMSSystemResource${:s}/%JMSSYSTEMRESOURCE%/${Jms:JMS}Resource/%JMSRESOURCE%/Quota${:s}/%QUOTA%"
                               }
                         },
                         "SAFErrorHandling": {
@@ -403,7 +414,7 @@
                               },
                               "wlst_attributes_path": "WP001",
                               "wlst_paths": {
-                                    "WP001": "/JMSSystemResource${:s}/%JMSSYSTEMRESOURCE%/${Jms:JMS}Resource/${NO_NAME_0:%JMSSYSTEMRESOURCE%}/SAFErrorHandling${:s}/%SAFERRORHANDLING%"
+                                    "WP001": "/JMSSystemResource${:s}/%JMSSYSTEMRESOURCE%/${Jms:JMS}Resource/%JMSRESOURCE%/SAFErrorHandling${:s}/%SAFERRORHANDLING%"
                               }
                         },
                         "SAFImportedDestinations": {
@@ -416,7 +427,6 @@
                                           "folders": {
                                                 "MessageLoggingParams": {
                                                       "wlst_type": "MessageLoggingParams",
-                                                      "child_folders_type": "single_unpredictable",
                                                       "default_name_value": "${NO_NAME_0:%SAFQUEUE%}",
                                                       "folders": {},
                                                       "attributes": {
@@ -425,7 +435,7 @@
                                                       },
                                                       "wlst_attributes_path": "WP001",
                                                       "wlst_paths": {
-                                                            "WP001": "/JMSSystemResource${:s}/%JMSSYSTEMRESOURCE%/${Jms:JMS}Resource/${NO_NAME_0:%JMSSYSTEMRESOURCE%}/SAFImportedDestinations/%SAFIMPORTEDDESTINATION%/SAFQueue${:s}/%SAFQUEUE%/MessageLoggingParams/%MESSAGELOGGINGPARAMS%"
+                                                            "WP001": "/JMSSystemResource${:s}/%JMSSYSTEMRESOURCE%/${Jms:JMS}Resource/%JMSRESOURCE%/SAFImportedDestinations/%SAFIMPORTEDDESTINATION%/SAFQueue${:s}/%SAFQUEUE%/MessageLoggingParams/%MESSAGELOGGINGPARAMS%"
                                                       }
                                                 }
                                           },
@@ -443,7 +453,7 @@
                                           },
                                           "wlst_attributes_path": "WP001",
                                           "wlst_paths": {
-                                                "WP001": "/JMSSystemResource${:s}/%JMSSYSTEMRESOURCE%/${Jms:JMS}Resource/${NO_NAME_0:%JMSSYSTEMRESOURCE%}/SAFImportedDestinations/%SAFIMPORTEDDESTINATION%/SAFQueue${:s}/%SAFQUEUE%"
+                                                "WP001": "/JMSSystemResource${:s}/%JMSSYSTEMRESOURCE%/${Jms:JMS}Resource/%JMSRESOURCE%/SAFImportedDestinations/%SAFIMPORTEDDESTINATION%/SAFQueue${:s}/%SAFQUEUE%"
                                           }
                                     },
                                     "SAFTopic": {
@@ -452,7 +462,6 @@
                                           "folders": {
                                                 "MessageLoggingParams": {
                                                       "wlst_type": "MessageLoggingParams",
-                                                      "child_folders_type": "single_unpredictable",
                                                       "default_name_value": "${NO_NAME_0:%SAFTOPIC%}",
                                                       "folders": {},
                                                       "attributes": {
@@ -461,7 +470,7 @@
                                                       },
                                                       "wlst_attributes_path": "WP001",
                                                       "wlst_paths": {
-                                                            "WP001": "/JMSSystemResource${:s}/%JMSSYSTEMRESOURCE%/${Jms:JMS}Resource/${NO_NAME_0:%JMSSYSTEMRESOURCE%}/SAFImportedDestinations/%SAFIMPORTEDDESTINATION%/SAFTopic${:s}/%SAFTOPIC%/MessageLoggingParams/%MESSAGELOGGINGPARAMS%"
+                                                            "WP001": "/JMSSystemResource${:s}/%JMSSYSTEMRESOURCE%/${Jms:JMS}Resource/%JMSRESOURCE%/SAFImportedDestinations/%SAFIMPORTEDDESTINATION%/SAFTopic${:s}/%SAFTOPIC%/MessageLoggingParams/%MESSAGELOGGINGPARAMS%"
                                                       }
                                                 }
                                           },
@@ -479,11 +488,12 @@
                                           },
                                           "wlst_attributes_path": "WP001",
                                           "wlst_paths": {
-                                                "WP001": "/JMSSystemResource${:s}/%JMSSYSTEMRESOURCE%/${Jms:JMS}Resource/${NO_NAME_0:%JMSSYSTEMRESOURCE%}/SAFImportedDestinations/%SAFIMPORTEDDESTINATION%/SAFTopic${:s}/%SAFTOPIC%"
+                                                "WP001": "/JMSSystemResource${:s}/%JMSSYSTEMRESOURCE%/${Jms:JMS}Resource/%JMSRESOURCE%/SAFImportedDestinations/%SAFIMPORTEDDESTINATION%/SAFTopic${:s}/%SAFTOPIC%"
                                           }
                                     },
                                     "MessageLoggingParams": {
                                           "wlst_type": "MessageLoggingParams",
+                                          "default_name_value": "${NO_NAME_0:%SAFIMPORTEDDESTINATION%}",
                                           "folders": {},
                                           "attributes": {
                                                 "MessageLoggingEnabled": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "MessageLoggingEnabled", "wlst_path": "WP001", "value": {"default": "None"}, "wlst_type": "boolean"} ],
@@ -491,7 +501,7 @@
                                           },
                                           "wlst_attributes_path": "WP001",
                                           "wlst_paths": {
-                                                "WP001": "/JMSSystemResource${:s}/%JMSSYSTEMRESOURCE%/${Jms:JMS}Resource/${NO_NAME_0:%JMSSYSTEMRESOURCE%}/SAFImportedDestinations/%SAFIMPORTEDDESTINATION%/MessageLoggingParams/${NO_NAME_0:%SAFIMPORTEDDESTINATION%}"
+                                                "WP001": "/JMSSystemResource${:s}/%JMSSYSTEMRESOURCE%/${Jms:JMS}Resource/%JMSRESOURCE%/SAFImportedDestinations/%SAFIMPORTEDDESTINATION%/MessageLoggingParams/%MESSAGELOGGINGPARAMS%"
                                           }
                                     }
                               },
@@ -510,7 +520,7 @@
                               },
                               "wlst_attributes_path": "WP001",
                               "wlst_paths": {
-                                    "WP001": "/JMSSystemResource${:s}/%JMSSYSTEMRESOURCE%/${Jms:JMS}Resource/${NO_NAME_0:%JMSSYSTEMRESOURCE%}/SAFImportedDestinations/%SAFIMPORTEDDESTINATION%"
+                                    "WP001": "/JMSSystemResource${:s}/%JMSSYSTEMRESOURCE%/${Jms:JMS}Resource/%JMSRESOURCE%/SAFImportedDestinations/%SAFIMPORTEDDESTINATION%"
                               }
                         },
                         "SAFRemoteContext": {
@@ -519,6 +529,7 @@
                               "folders": {
                                     "SAFLoginContext": {
                                           "wlst_type": "SAFLoginContext",
+                                          "default_name_value": "${NO_NAME_0:%SAFREMOTECONTEXT%}",
                                           "folders": {},
                                           "attributes": {
                                                 "LoginURL":          [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "LoginURL",              "wlst_path": "WP001", "value": {"default": "None"}, "wlst_type": "string"      } ],
@@ -527,7 +538,7 @@
                                           },
                                           "wlst_attributes_path": "WP001",
                                           "wlst_paths": {
-                                                "WP001": "/JMSSystemResource${:s}/%JMSSYSTEMRESOURCE%/${Jms:JMS}Resource/${NO_NAME_0:%JMSSYSTEMRESOURCE%}/SAFRemoteContext${:s}/%SAFREMOTECONTEXT%/SAFLoginContext/${NO_NAME_0:%SAFREMOTECONTEXT%}"
+                                                "WP001": "/JMSSystemResource${:s}/%JMSSYSTEMRESOURCE%/${Jms:JMS}Resource/%JMSRESOURCE%/SAFRemoteContext${:s}/%SAFREMOTECONTEXT%/SAFLoginContext/%SAFLOGINCONTEXT%"
                                           }
                                     }
                               },
@@ -538,7 +549,7 @@
                               },
                               "wlst_attributes_path": "WP001",
                               "wlst_paths": {
-                                    "WP001": "/JMSSystemResource${:s}/%JMSSYSTEMRESOURCE%/${Jms:JMS}Resource/${NO_NAME_0:%JMSSYSTEMRESOURCE%}/SAFRemoteContext${:s}/%SAFREMOTECONTEXT%"
+                                    "WP001": "/JMSSystemResource${:s}/%JMSSYSTEMRESOURCE%/${Jms:JMS}Resource/%JMSRESOURCE%/SAFRemoteContext${:s}/%SAFREMOTECONTEXT%"
                               }
                         },
                         "Template": {
@@ -547,6 +558,7 @@
                               "folders": {
                                     "DeliveryFailureParams": {
                                           "wlst_type": "DeliveryFailureParams",
+                                          "default_name_value": "${NO_NAME_0:%TEMPLATE%}",
                                           "folders": {},
                                           "attributes": {
                                                 "ErrorDestination":        [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "ErrorDestination",        "wlst_path": "WP001", "value": {"default": "None"             }, "wlst_type": "string", "get_method": "LSA", "set_method": "MBEAN.set_jms_error_destination_mbean",  "set_mbean_type": "weblogic.j2ee.descriptor.wl.DestinationBean"} ],
@@ -556,11 +568,12 @@
                                           },
                                           "wlst_attributes_path": "WP001",
                                           "wlst_paths": {
-                                                "WP001": "/JMSSystemResource${:s}/%JMSSYSTEMRESOURCE%/${Jms:JMS}Resource/${NO_NAME_0:%JMSSYSTEMRESOURCE%}/Template${:s}/%TEMPLATE%/DeliveryFailureParams/${NO_NAME_0:%TEMPLATE%}"
+                                                "WP001": "/JMSSystemResource${:s}/%JMSSYSTEMRESOURCE%/${Jms:JMS}Resource/%JMSRESOURCE%/Template${:s}/%TEMPLATE%/DeliveryFailureParams/%DELIVERYFAILUREPARAMS%"
                                           }
                                     },
                                     "DeliveryParamsOverrides": {
                                           "wlst_type": "DeliveryParamsOverrides",
+                                          "default_name_value": "${NO_NAME_0:%TEMPLATE%}",
                                           "folders": {},
                                           "attributes": {
                                                 "DeliveryMode":     [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "DeliveryMode",    "wlst_path": "WP001", "value": {"default": "${None:No-Delivery}"  }, "wlst_type": "string"  } ],
@@ -571,7 +584,7 @@
                                           },
                                           "wlst_attributes_path": "WP001",
                                           "wlst_paths": {
-                                                "WP001": "/JMSSystemResource${:s}/%JMSSYSTEMRESOURCE%/${Jms:JMS}Resource/${NO_NAME_0:%JMSSYSTEMRESOURCE%}/Template${:s}/%TEMPLATE%/DeliveryParamsOverrides/${NO_NAME_0:%TEMPLATE%}"
+                                                "WP001": "/JMSSystemResource${:s}/%JMSSYSTEMRESOURCE%/${Jms:JMS}Resource/%JMSRESOURCE%/Template${:s}/%TEMPLATE%/DeliveryParamsOverrides/%DELIVERYPARAMSOVERRIDES%"
                                           }
                                     },
                                     "GroupParams": {
@@ -584,11 +597,12 @@
                                           },
                                           "wlst_attributes_path": "WP001",
                                           "wlst_paths": {
-                                                "WP001": "/JMSSystemResource${:s}/%JMSSYSTEMRESOURCE%/${Jms:JMS}Resource/${NO_NAME_0:%JMSSYSTEMRESOURCE%}/Template${:s}/%TEMPLATE%/GroupParams/%FOLDERNAME%"
+                                                "WP001": "/JMSSystemResource${:s}/%JMSSYSTEMRESOURCE%/${Jms:JMS}Resource/%JMSRESOURCE%/Template${:s}/%TEMPLATE%/GroupParams/%FOLDERNAME%"
                                           }
                                     },
                                     "MessageLoggingParams": {
                                           "wlst_type": "MessageLoggingParams",
+                                          "default_name_value": "${NO_NAME_0:%TEMPLATE%}",
                                           "folders": {},
                                           "attributes": {
                                                 "MessageLoggingEnabled": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "MessageLoggingEnabled", "wlst_path": "WP001", "value": {"default": "false"}, "wlst_type": "boolean"} ],
@@ -596,11 +610,12 @@
                                           },
                                           "wlst_attributes_path": "WP001",
                                           "wlst_paths": {
-                                                "WP001": "/JMSSystemResource${:s}/%JMSSYSTEMRESOURCE%/${Jms:JMS}Resource/${NO_NAME_0:%JMSSYSTEMRESOURCE%}/Template${:s}/%TEMPLATE%/MessageLoggingParams/${NO_NAME_0:%TEMPLATE%}"
+                                                "WP001": "/JMSSystemResource${:s}/%JMSSYSTEMRESOURCE%/${Jms:JMS}Resource/%JMSRESOURCE%/Template${:s}/%TEMPLATE%/MessageLoggingParams/%MESSAGELOGGINGPARAMS%"
                                           }
                                     },
                                     "Multicast": {
                                           "wlst_type": "Multicast",
+                                          "default_name_value": "${NO_NAME_0:%TEMPLATE%}",
                                           "folders": {},
                                           "attributes": {
                                                 "MulticastAddress":    [ {"version": "[10,)",          "wlst_mode": "both", "wlst_name": "MulticastAddress",    "wlst_path": "WP001", "value": {"default": "None"       }, "wlst_type": "string",  "get_method": "GET", "restart_required": "true" } ],
@@ -611,11 +626,12 @@
                                           },
                                           "wlst_attributes_path": "WP001",
                                           "wlst_paths": {
-                                                "WP001": "/JMSSystemResource${:s}/%JMSSYSTEMRESOURCE%/${Jms:JMS}Resource/${NO_NAME_0:%JMSSYSTEMRESOURCE%}/Template${:s}/%TEMPLATE%/Multicast/${NO_NAME_0:%TEMPLATE%}"
+                                                "WP001": "/JMSSystemResource${:s}/%JMSSYSTEMRESOURCE%/${Jms:JMS}Resource/%JMSRESOURCE%/Template${:s}/%TEMPLATE%/Multicast/%MULTICAST%"
                                           }
                                     },
                                     "Thresholds": {
                                           "wlst_type": "Thresholds",
+                                          "default_name_value": "${NO_NAME_0:%TEMPLATE%}",
                                           "folders": {},
                                           "attributes": {
                                                 "BytesHigh":    [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "BytesHigh",    "wlst_path": "WP001", "value": {"default": "${0:9223372036854775807}" }, "wlst_type": "long"  } ],
@@ -625,7 +641,7 @@
                                           },
                                           "wlst_attributes_path": "WP001",
                                           "wlst_paths": {
-                                                "WP001": "/JMSSystemResource${:s}/%JMSSYSTEMRESOURCE%/${Jms:JMS}Resource/${NO_NAME_0:%JMSSYSTEMRESOURCE%}/Template${:s}/%TEMPLATE%/Thresholds/${NO_NAME_0:%TEMPLATE%}"
+                                                "WP001": "/JMSSystemResource${:s}/%JMSSYSTEMRESOURCE%/${Jms:JMS}Resource/%JMSRESOURCE%/Template${:s}/%TEMPLATE%/Thresholds/%THRESHOLDS%"
                                           }
                                     }
                               },
@@ -647,7 +663,7 @@
                               },
                               "wlst_attributes_path": "WP001",
                               "wlst_paths": {
-                                    "WP001": "/JMSSystemResource${:s}/%JMSSYSTEMRESOURCE%/${Jms:JMS}Resource/${NO_NAME_0:%JMSSYSTEMRESOURCE%}/Template${:s}/%TEMPLATE%"
+                                    "WP001": "/JMSSystemResource${:s}/%JMSSYSTEMRESOURCE%/${Jms:JMS}Resource/%JMSRESOURCE%/Template${:s}/%TEMPLATE%"
                               }
                         },
                         "Topic": {
@@ -656,6 +672,7 @@
                               "folders": {
                                     "DeliveryFailureParams": {
                                           "wlst_type": "DeliveryFailureParams",
+                                          "default_name_value": "${NO_NAME_0:%TOPIC%}",
                                           "folders": {},
                                           "attributes": {
                                                 "ErrorDestination":        [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "ErrorDestination",        "wlst_path": "WP001", "value": {"default": "None"             }, "wlst_type": "string", "get_method": "LSA", "set_method": "MBEAN.set_jms_error_destination_mbean", "set_mbean_type": "weblogic.j2ee.descriptor.wl.DestinationBean"} ],
@@ -665,11 +682,12 @@
                                           },
                                           "wlst_attributes_path": "WP001",
                                           "wlst_paths": {
-                                                "WP001": "/JMSSystemResource${:s}/%JMSSYSTEMRESOURCE%/${Jms:JMS}Resource/${NO_NAME_0:%JMSSYSTEMRESOURCE%}/Topic${:s}/%TOPIC%/DeliveryFailureParams/${NO_NAME_0:%TOPIC%}"
+                                                "WP001": "/JMSSystemResource${:s}/%JMSSYSTEMRESOURCE%/${Jms:JMS}Resource/%JMSRESOURCE%/Topic${:s}/%TOPIC%/DeliveryFailureParams/%DELIVERYFAILUREPARAMS%"
                                           }
                                     },
                                     "DeliveryParamsOverrides": {
                                           "wlst_type": "DeliveryParamsOverrides",
+                                          "default_name_value": "${NO_NAME_0:%TOPIC%}",
                                           "folders": {},
                                           "attributes": {
                                                 "DeliveryMode":    [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "DeliveryMode",    "wlst_path": "WP001", "value": {"default": "${None:No-Delivery}"  }, "wlst_type": "string"  } ],
@@ -680,11 +698,12 @@
                                           },
                                           "wlst_attributes_path": "WP001",
                                           "wlst_paths": {
-                                                "WP001": "/JMSSystemResource${:s}/%JMSSYSTEMRESOURCE%/${Jms:JMS}Resource/${NO_NAME_0:%JMSSYSTEMRESOURCE%}/Topic${:s}/%TOPIC%/DeliveryParamsOverrides/${NO_NAME_0:%TOPIC%}"
+                                                "WP001": "/JMSSystemResource${:s}/%JMSSYSTEMRESOURCE%/${Jms:JMS}Resource/%JMSRESOURCE%/Topic${:s}/%TOPIC%/DeliveryParamsOverrides/%DELIVERYPARAMSOVERRIDES%"
                                           }
                                     },
                                     "MessageLoggingParams": {
                                           "wlst_type": "MessageLoggingParams",
+                                          "default_name_value": "${NO_NAME_0:%TOPIC%}",
                                           "folders": {},
                                           "attributes": {
                                                 "MessageLoggingEnabled": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "MessageLoggingEnabled", "wlst_path": "WP001", "value": {"default": "false"}, "wlst_type": "boolean" } ],
@@ -692,11 +711,12 @@
                                           },
                                           "wlst_attributes_path": "WP001",
                                           "wlst_paths": {
-                                                "WP001": "/JMSSystemResource${:s}/%JMSSYSTEMRESOURCE%/${Jms:JMS}Resource/${NO_NAME_0:%JMSSYSTEMRESOURCE%}/Topic${:s}/%TOPIC%/MessageLoggingParams/${NO_NAME_0:%TOPIC%}"
+                                                "WP001": "/JMSSystemResource${:s}/%JMSSYSTEMRESOURCE%/${Jms:JMS}Resource/%JMSRESOURCE%/Topic${:s}/%TOPIC%/MessageLoggingParams/%MESSAGELOGGINGPARAMS%"
                                           }
                                     },
                                     "Multicast": {
                                           "wlst_type": "Multicast",
+                                          "default_name_value": "${NO_NAME_0:%TOPIC%}",
                                           "folders": {},
                                           "attributes": {
                                                 "MulticastAddress":    [ {"version": "[10,)",         "wlst_mode": "both", "wlst_name": "MulticastAddress",    "wlst_path": "WP001", "value": {"default": "None"       }, "wlst_type": "string",  "get_method": "GET", "restart_required": "true"  } ],
@@ -707,11 +727,12 @@
                                           },
                                           "wlst_attributes_path": "WP001",
                                           "wlst_paths": {
-                                                "WP001": "/JMSSystemResource${:s}/%JMSSYSTEMRESOURCE%/${Jms:JMS}Resource/${NO_NAME_0:%JMSSYSTEMRESOURCE%}/Topic${:s}/%TOPIC%/Multicast/${NO_NAME_0:%TOPIC%}"
+                                                "WP001": "/JMSSystemResource${:s}/%JMSSYSTEMRESOURCE%/${Jms:JMS}Resource/%JMSRESOURCE%/Topic${:s}/%TOPIC%/Multicast/%MULTICAST%"
                                           }
                                     },
                                     "Thresholds": {
                                           "wlst_type": "Thresholds",
+                                          "default_name_value": "${NO_NAME_0:%TOPIC%}",
                                           "folders": {},
                                           "attributes": {
                                                 "BytesHigh":     [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "BytesHigh",    "wlst_path": "WP001", "value": {"default": "${0:9223372036854775807}"}, "wlst_type": "long"} ],
@@ -721,7 +742,7 @@
                                           },
                                           "wlst_attributes_path": "WP001",
                                           "wlst_paths": {
-                                                "WP001": "/JMSSystemResource${:s}/%JMSSYSTEMRESOURCE%/${Jms:JMS}Resource/${NO_NAME_0:%JMSSYSTEMRESOURCE%}/Topic${:s}/%TOPIC%/Thresholds/${NO_NAME_0:%TOPIC%}"
+                                                "WP001": "/JMSSystemResource${:s}/%JMSSYSTEMRESOURCE%/${Jms:JMS}Resource/%JMSRESOURCE%/Topic${:s}/%TOPIC%/Thresholds/%THRESHOLDS%"
                                           }
                                     }
                               },
@@ -752,7 +773,7 @@
                               },
                               "wlst_attributes_path": "WP001",
                               "wlst_paths": {
-                                    "WP001": "/JMSSystemResource${:s}/%JMSSYSTEMRESOURCE%/${Jms:JMS}Resource/${NO_NAME_0:%JMSSYSTEMRESOURCE%}/Topic${:s}/%TOPIC%"
+                                    "WP001": "/JMSSystemResource${:s}/%JMSSYSTEMRESOURCE%/${Jms:JMS}Resource/%JMSRESOURCE%/Topic${:s}/%TOPIC%"
                               }
                         },
                         "UniformDistributedQueue": {
@@ -761,6 +782,7 @@
                               "folders": {
                                     "DeliveryFailureParams": {
                                           "wlst_type": "DeliveryFailureParams",
+                                          "default_name_value": "${NO_NAME_0:%UNIFORMDISTRIBUTEDQUEUE%}",
                                           "folders": {},
                                           "attributes": {
                                                 "ErrorDestination":        [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "ErrorDestination",        "wlst_path": "WP001", "value": {"default": "None"             }, "wlst_type": "string", "get_method": "${LSA:GET}", "set_method": "MBEAN.set_jms_error_destination_mbean", "set_mbean_type": "weblogic.j2ee.descriptor.wl.DestinationBean"} ],
@@ -770,11 +792,12 @@
                                           },
                                           "wlst_attributes_path": "WP001",
                                           "wlst_paths": {
-                                                "WP001": "/JMSSystemResource${:s}/%JMSSYSTEMRESOURCE%/${Jms:JMS}Resource/${NO_NAME_0:%JMSSYSTEMRESOURCE%}/UniformDistributedQueue${:s}/%UNIFORMDISTRIBUTEDQUEUE%/DeliveryFailureParams/${NO_NAME_0:%UNIFORMDISTRIBUTEDQUEUE%}"
+                                                "WP001": "/JMSSystemResource${:s}/%JMSSYSTEMRESOURCE%/${Jms:JMS}Resource/%JMSRESOURCE%/UniformDistributedQueue${:s}/%UNIFORMDISTRIBUTEDQUEUE%/DeliveryFailureParams/%DELIVERYFAILUREPARAMS%"
                                           }
                                     },
                                     "DeliveryParamsOverrides": {
                                           "wlst_type": "DeliveryParamsOverrides",
+                                          "default_name_value": "${NO_NAME_0:%UNIFORMDISTRIBUTEDQUEUE%}",
                                           "folders": {},
                                           "attributes": {
                                                 "DeliveryMode":    [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "DeliveryMode",    "wlst_path": "WP001", "value": {"default": "${None:No-Delivery}"  }, "wlst_type": "string" } ],
@@ -785,11 +808,12 @@
                                           },
                                           "wlst_attributes_path": "WP001",
                                           "wlst_paths": {
-                                                "WP001": "/JMSSystemResource${:s}/%JMSSYSTEMRESOURCE%/${Jms:JMS}Resource/${NO_NAME_0:%JMSSYSTEMRESOURCE%}/UniformDistributedQueue${:s}/%UNIFORMDISTRIBUTEDQUEUE%/DeliveryParamsOverrides/${NO_NAME_0:%UNIFORMDISTRIBUTEDQUEUE%}"
+                                                "WP001": "/JMSSystemResource${:s}/%JMSSYSTEMRESOURCE%/${Jms:JMS}Resource/%JMSRESOURCE%/UniformDistributedQueue${:s}/%UNIFORMDISTRIBUTEDQUEUE%/DeliveryParamsOverrides/%DELIVERYPARAMSOVERRIDES%"
                                           }
                                     },
                                     "MessageLoggingParams": {
                                           "wlst_type": "MessageLoggingParams",
+                                          "default_name_value": "${NO_NAME_0:%UNIFORMDISTRIBUTEDQUEUE%}",
                                           "folders": {},
                                           "attributes": {
                                                 "MessageLoggingEnabled": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "MessageLoggingEnabled", "wlst_path": "WP001", "value": {"default": "false"}, "wlst_type": "boolean"} ],
@@ -797,11 +821,12 @@
                                           },
                                           "wlst_attributes_path": "WP001",
                                           "wlst_paths": {
-                                                "WP001": "/JMSSystemResource${:s}/%JMSSYSTEMRESOURCE%/${Jms:JMS}Resource/${NO_NAME_0:%JMSSYSTEMRESOURCE%}/UniformDistributedQueue${:s}/%UNIFORMDISTRIBUTEDQUEUE%/MessageLoggingParams/${NO_NAME_0:%UNIFORMDISTRIBUTEDQUEUE%}"
+                                                "WP001": "/JMSSystemResource${:s}/%JMSSYSTEMRESOURCE%/${Jms:JMS}Resource/%JMSRESOURCE%/UniformDistributedQueue${:s}/%UNIFORMDISTRIBUTEDQUEUE%/MessageLoggingParams/%MESSAGELOGGINGPARAMS%"
                                           }
                                     },
                                     "Thresholds": {
                                           "wlst_type": "Thresholds",
+                                          "default_name_value": "${NO_NAME_0:%UNIFORMDISTRIBUTEDQUEUE%}",
                                           "folders": {},
                                           "attributes": {
                                                 "BytesHigh":    [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "BytesHigh",    "wlst_path": "WP001", "value": {"default": "${0:9223372036854775807}"}, "wlst_type": "long"   } ],
@@ -811,7 +836,7 @@
                                           },
                                           "wlst_attributes_path": "WP001",
                                           "wlst_paths": {
-                                                "WP001": "/JMSSystemResource${:s}/%JMSSYSTEMRESOURCE%/${Jms:JMS}Resource/${NO_NAME_0:%JMSSYSTEMRESOURCE%}/UniformDistributedQueue${:s}/%UNIFORMDISTRIBUTEDQUEUE%/Thresholds/${NO_NAME_0:%UNIFORMDISTRIBUTEDQUEUE%}"
+                                                "WP001": "/JMSSystemResource${:s}/%JMSSYSTEMRESOURCE%/${Jms:JMS}Resource/%JMSRESOURCE%/UniformDistributedQueue${:s}/%UNIFORMDISTRIBUTEDQUEUE%/Thresholds/%THRESHOLDS%"
                                           }
                                     }
                               },
@@ -844,7 +869,7 @@
                               },
                               "wlst_attributes_path": "WP001",
                               "wlst_paths": {
-                                    "WP001": "/JMSSystemResource${:s}/%JMSSYSTEMRESOURCE%/${Jms:JMS}Resource/${NO_NAME_0:%JMSSYSTEMRESOURCE%}/UniformDistributedQueue${:s}/%UNIFORMDISTRIBUTEDQUEUE%"
+                                    "WP001": "/JMSSystemResource${:s}/%JMSSYSTEMRESOURCE%/${Jms:JMS}Resource/%JMSRESOURCE%/UniformDistributedQueue${:s}/%UNIFORMDISTRIBUTEDQUEUE%"
                               }
                         },
                         "UniformDistributedTopic": {
@@ -853,6 +878,7 @@
                               "folders": {
                                     "DeliveryFailureParams": {
                                           "wlst_type": "DeliveryFailureParams",
+                                          "default_name_value": "${NO_NAME_0:%UNIFORMDISTRIBUTEDTOPIC%}",
                                           "folders": {},
                                           "attributes": {
                                                 "ErrorDestination":        [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "ErrorDestination",        "wlst_path": "WP001", "value": {"default": "None"             }, "wlst_type": "string", "get_method": "LSA", "set_method": "MBEAN.set_jms_error_destination_mbean", "set_mbean_type": "weblogic.j2ee.descriptor.wl.DestinationBean"} ],
@@ -862,11 +888,12 @@
                                           },
                                           "wlst_attributes_path": "WP001",
                                           "wlst_paths": {
-                                                "WP001": "/JMSSystemResource${:s}/%JMSSYSTEMRESOURCE%/${Jms:JMS}Resource/${NO_NAME_0:%JMSSYSTEMRESOURCE%}/UniformDistributedTopic${:s}/%UNIFORMDISTRIBUTEDTOPIC%/DeliveryFailureParams/${NO_NAME_0:%UNIFORMDISTRIBUTEDTOPIC%}"
+                                                "WP001": "/JMSSystemResource${:s}/%JMSSYSTEMRESOURCE%/${Jms:JMS}Resource/%JMSRESOURCE%/UniformDistributedTopic${:s}/%UNIFORMDISTRIBUTEDTOPIC%/DeliveryFailureParams/%DELIVERYFAILUREPARAMS%"
                                           }
                                     },
                                     "DeliveryParamsOverrides": {
                                           "wlst_type": "DeliveryParamsOverrides",
+                                          "default_name_value": "${NO_NAME_0:%UNIFORMDISTRIBUTEDTOPIC%}",
                                           "folders": {},
                                           "attributes": {
                                                 "DeliveryMode":    [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "DeliveryMode",    "wlst_path": "WP001", "value": {"default": "${None:No-Delivery}" }, "wlst_type": "string" } ],
@@ -877,11 +904,12 @@
                                           },
                                           "wlst_attributes_path": "WP001",
                                           "wlst_paths": {
-                                                "WP001": "/JMSSystemResource${:s}/%JMSSYSTEMRESOURCE%/${Jms:JMS}Resource/${NO_NAME_0:%JMSSYSTEMRESOURCE%}/UniformDistributedTopic${:s}/%UNIFORMDISTRIBUTEDTOPIC%/DeliveryParamsOverrides/${NO_NAME_0:%UNIFORMDISTRIBUTEDTOPIC%}"
+                                                "WP001": "/JMSSystemResource${:s}/%JMSSYSTEMRESOURCE%/${Jms:JMS}Resource/%JMSRESOURCE%/UniformDistributedTopic${:s}/%UNIFORMDISTRIBUTEDTOPIC%/DeliveryParamsOverrides/%DELIVERYPARAMSOVERRIDES%"
                                           }
                                     },
                                     "MessageLoggingParams": {
                                           "wlst_type": "MessageLoggingParams",
+                                          "default_name_value": "${NO_NAME_0:%UNIFORMDISTRIBUTEDTOPIC%}",
                                           "folders": {},
                                           "attributes": {
                                                 "MessageLoggingEnabled": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "MessageLoggingEnabled", "wlst_path": "WP001", "value": {"default": "false"}, "wlst_type": "boolean"} ],
@@ -889,11 +917,12 @@
                                           },
                                           "wlst_attributes_path": "WP001",
                                           "wlst_paths": {
-                                                "WP001": "/JMSSystemResource${:s}/%JMSSYSTEMRESOURCE%/${Jms:JMS}Resource/${NO_NAME_0:%JMSSYSTEMRESOURCE%}/UniformDistributedTopic${:s}/%UNIFORMDISTRIBUTEDTOPIC%/MessageLoggingParams/${NO_NAME_0:%UNIFORMDISTRIBUTEDTOPIC%}"
+                                                "WP001": "/JMSSystemResource${:s}/%JMSSYSTEMRESOURCE%/${Jms:JMS}Resource/%JMSRESOURCE%/UniformDistributedTopic${:s}/%UNIFORMDISTRIBUTEDTOPIC%/MessageLoggingParams/%MESSAGELOGGINGPARAMS%"
                                           }
                                     },
                                     "Multicast": {
                                           "wlst_type": "Multicast",
+                                          "default_name_value": "${NO_NAME_0:%UNIFORMDISTRIBUTEDTOPIC%}",
                                           "folders": {},
                                           "attributes": {
                                                 "MulticastAddress":    [ {"version": "[10,)",            "wlst_mode": "both", "wlst_name": "MulticastAddress",    "wlst_path": "WP001", "value": {"default": "None"         }, "wlst_type": "string",       "get_method": "GET", "restart_required": "true" } ],
@@ -904,11 +933,12 @@
                                           },
                                           "wlst_attributes_path": "WP001",
                                           "wlst_paths": {
-                                                "WP001": "/JMSSystemResource${:s}/%JMSSYSTEMRESOURCE%/${Jms:JMS}Resource/${NO_NAME_0:%JMSSYSTEMRESOURCE%}/UniformDistributedTopic${:s}/%UNIFORMDISTRIBUTEDTOPIC%/Multicast/${NO_NAME_0:%UNIFORMDISTRIBUTEDTOPIC%}"
+                                                "WP001": "/JMSSystemResource${:s}/%JMSSYSTEMRESOURCE%/${Jms:JMS}Resource/%JMSRESOURCE%/UniformDistributedTopic${:s}/%UNIFORMDISTRIBUTEDTOPIC%/Multicast/%MULTICAST%"
                                           }
                                     },
                                     "Thresholds": {
                                           "wlst_type": "Thresholds",
+                                          "default_name_value": "${NO_NAME_0:%UNIFORMDISTRIBUTEDTOPIC%}",
                                           "folders": {},
                                           "attributes": {
                                                 "BytesHigh":    [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "BytesHigh",    "wlst_path": "WP001", "value": {"default": "${0:9223372036854775807}"}, "wlst_type": "long" } ],
@@ -918,7 +948,7 @@
                                           },
                                           "wlst_attributes_path": "WP001",
                                           "wlst_paths": {
-                                                "WP001": "/JMSSystemResource${:s}/%JMSSYSTEMRESOURCE%/${Jms:JMS}Resource/${NO_NAME_0:%JMSSYSTEMRESOURCE%}/UniformDistributedTopic${:s}/%UNIFORMDISTRIBUTEDTOPIC%/Thresholds/${NO_NAME_0:%UNIFORMDISTRIBUTEDTOPIC%}"
+                                                "WP001": "/JMSSystemResource${:s}/%JMSSYSTEMRESOURCE%/${Jms:JMS}Resource/%JMSRESOURCE%/UniformDistributedTopic${:s}/%UNIFORMDISTRIBUTEDTOPIC%/Thresholds/%THRESHOLDS%"
                                           }
                                     }
                               },
@@ -950,7 +980,7 @@
                               },
                               "wlst_attributes_path": "WP001",
                               "wlst_paths": {
-                                    "WP001": "/JMSSystemResource${:s}/%JMSSYSTEMRESOURCE%/${Jms:JMS}Resource/${NO_NAME_0:%JMSSYSTEMRESOURCE%}/UniformDistributedTopic${:s}/%UNIFORMDISTRIBUTEDTOPIC%"
+                                    "WP001": "/JMSSystemResource${:s}/%JMSSYSTEMRESOURCE%/${Jms:JMS}Resource/%JMSRESOURCE%/UniformDistributedTopic${:s}/%UNIFORMDISTRIBUTEDTOPIC%"
                               }
                         }
                   },
@@ -960,7 +990,7 @@
                   },
                   "wlst_attributes_path": "WP001",
                   "wlst_paths": {
-                        "WP001": "/JMSSystemResource${:s}/%JMSSYSTEMRESOURCE%/${Jms:JMS}Resource/${NO_NAME_0:%JMSSYSTEMRESOURCE%}"
+                        "WP001": "/JMSSystemResource${:s}/%JMSSYSTEMRESOURCE%/${Jms:JMS}Resource/%JMSRESOURCE%"
                   }
             }
       },
diff --git a/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/JMX.json b/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/JMX.json
index a1c0b057d..a6528c872 100644
--- a/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/JMX.json
+++ b/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/JMX.json
@@ -2,7 +2,6 @@
     "copyright": "Copyright (c) 2017, 2019, Oracle Corporation and/or its affiliates.  All rights reserved.",
     "license": "Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl",
     "wlst_type": "JMX",
-    "child_folders_type": "single_unpredictable",
     "default_name_value": "${NO_NAME_0:%DOMAIN%}",
     "folders": {},
     "attributes": {
diff --git a/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/JPA.json b/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/JPA.json
index 54e8daa4f..6b24bd613 100644
--- a/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/JPA.json
+++ b/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/JPA.json
@@ -2,7 +2,6 @@
   "copyright": "Copyright (c) 2020, Oracle Corporation and/or its affiliates.",
   "license": "Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl",
   "wlst_type": "JPA",
-  "child_folders_type": "single_unpredictable",
   "default_name_value": "${NO_NAME_0:%DOMAIN%}",
   "folder_params": [{
     "version": "[10,12.1.3)",
diff --git a/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/JTA.json b/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/JTA.json
index 6bb0231b7..5baefbe01 100644
--- a/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/JTA.json
+++ b/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/JTA.json
@@ -2,7 +2,6 @@
     "copyright": "Copyright (c) 2017, 2019, Oracle Corporation and/or its affiliates.  All rights reserved.",
     "license": "Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl",
     "wlst_type": "JTA",
-    "child_folders_type": "single_unpredictable",
     "default_name_value": "${NO_NAME_0:%DOMAIN%}",
     "folders": {},
     "attributes": {
diff --git a/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/Log.json b/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/Log.json
index bf2ed37bb..3e40dad16 100644
--- a/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/Log.json
+++ b/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/Log.json
@@ -2,7 +2,6 @@
     "copyright": "Copyright (c) 2017, 2020, Oracle Corporation and/or its affiliates.",
     "license": "Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl",
     "wlst_type": "Log",
-    "child_folders_type": "single_unpredictable",
     "default_name_value": "${NO_NAME_0:%DOMAIN%}",
     "folders": {},
     "attributes": {
diff --git a/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/Machine.json b/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/Machine.json
index 3ea689a0a..62c26574e 100644
--- a/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/Machine.json
+++ b/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/Machine.json
@@ -7,7 +7,6 @@
     "folders": {
         "NodeManager" : {
             "wlst_type": "NodeManager",
-            "child_folders_type": "single_unpredictable",
             "default_name_value": "%MACHINE%",
             "folders" : {},
             "attributes": {
diff --git a/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/Partition.json b/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/Partition.json
index efa5b5c5a..00d86c021 100644
--- a/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/Partition.json
+++ b/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/Partition.json
@@ -73,7 +73,6 @@
         "DataSourcePartition": {
             "wlst_type": "DataSourcePartition",
             "version": "[12.2.1,)",
-            "child_folders_type": "single_unpredictable",
             "default_name_value": "${NO_NAME_0:%PARTITION%}",
             "folders": {},
             "attributes": {
@@ -82,7 +81,7 @@
             },
             "wlst_attributes_path": "WP001",
             "wlst_paths": {
-                "WP001": "/Partition${:s}/%PARTITION%/DataSourcePartition/%DSPARTITION%"
+                "WP001": "/Partition${:s}/%PARTITION%/DataSourcePartition/%DATASOURCEPARTITION%"
             }
         },
         "ForeignJndiProviderOverride": {
@@ -236,7 +235,6 @@
         "JtaPartition": {
             "wlst_type": "${JtaPartition:JTAPartition}",
             "version": "[12.2.1,)",
-            "child_folders_type": "single_unpredictable",
             "default_name_value": "${NO_NAME_0:%PARTITION%}",
             "folders": {},
             "attributes": {
@@ -269,7 +267,6 @@
         "PartitionLog": {
             "wlst_type": "PartitionLog",
             "version": "[12.2.1,)",
-            "child_folders_type": "single_unpredictable",
             "default_name_value": "%PARTITION%",
             "folders": {},
             "attributes": {
@@ -285,7 +282,6 @@
         "SystemFileSystem": {
             "wlst_type": "SystemFileSystem",
             "version": "[12.2.1,)",
-            "child_folders_type": "single_unpredictable",
             "default_name_value": "${NO_NAME_0:%PARTITION%}",
             "folders": {},
             "attributes": {
@@ -302,7 +298,6 @@
         "UserFileSystem": {
             "wlst_type": "UserFileSystem",
             "version": "[12.2.1,)",
-            "child_folders_type": "single_unpredictable",
             "default_name_value": "${NO_NAME_0:%PARTITION%}",
             "folders": {},
             "attributes": {
@@ -319,19 +314,16 @@
         "WebService": {
             "wlst_type": "WebService",
             "version": "[12.2.1,)",
-            "child_folders_type": "single_unpredictable",
             "default_name_value": "${NO_NAME_0:%PARTITION%}",
             "folders": {
                 "WebServiceBuffering": {
                     "wlst_type": "WebServiceBuffering",
                     "version": "[12.2.1,)",
-                    "child_folders_type": "single_unpredictable",
                     "default_name_value": "${NO_NAME_0:%PARTITION%}",
                     "folders": {
                         "WebServiceRequestBufferingQueue": {
                             "wlst_type": "WebServiceRequestBufferingQueue",
                             "version": "[12.2.1,)",
-                            "child_folders_type": "single_unpredictable",
                             "default_name_value": "${NO_NAME_0:%PARTITION%}",
                             "folders": {},
                             "attributes": {
@@ -342,13 +334,12 @@
                             },
                             "wlst_attributes_path": "WP001",
                             "wlst_paths": {
-                                "WP001": "/Partition${:s}/%PARTITION%/WebService/%WEBSERVICE%/WebServiceBuffering/%WSBUFFERING%/WebServiceRequestBufferingQueue/%WSREQUESTQUEUE%"
+                                "WP001": "/Partition${:s}/%PARTITION%/WebService/%WEBSERVICE%/WebServiceBuffering/%WEBSERVICEBUFFERING%/WebServiceRequestBufferingQueue/%WEBSERVICEREQUESTBUFFERINGQUEUE%"
                             }
                         },
                         "WebServiceResponseBufferingQueue": {
                             "wlst_type": "WebServiceResponseBufferingQueue",
                             "version": "[12.2.1,)",
-                            "child_folders_type": "single_unpredictable",
                             "default_name_value": "${NO_NAME_0:%PARTITION%}",
                             "folders": {},
                             "attributes": {
@@ -359,7 +350,7 @@
                             },
                             "wlst_attributes_path": "WP001",
                             "wlst_paths": {
-                                "WP001": "/Partition${:s}/%PARTITION%/WebService/%WEBSERVICE%/WebServiceBuffering/%WSBUFFERING%/WebServiceResponseBufferingQueue/%WSRESPONSEQUEUE%"
+                                "WP001": "/Partition${:s}/%PARTITION%/WebService/%WEBSERVICE%/WebServiceBuffering/%WEBSERVICEBUFFERING%/WebServiceResponseBufferingQueue/%WEBSERVICERESPONSEBUFFERINGQUEUE%"
                             }
                         }
                     },
@@ -370,7 +361,7 @@
                     },
                     "wlst_attributes_path": "WP001",
                     "wlst_paths": {
-                        "WP001": "/Partition${:s}/%PARTITION%/WebService/%WEBSERVICE%/WebServiceBuffering/%WSBUFFERING%"
+                        "WP001": "/Partition${:s}/%PARTITION%/WebService/%WEBSERVICE%/WebServiceBuffering/%WEBSERVICEBUFFERING%"
                     }
                 }
             },
@@ -395,13 +386,11 @@
                 "CpuUtilization": {
                     "wlst_type": "CpuUtilization",
                     "version": "[12.2.1,)",
-                    "child_folders_type": "single_unpredictable",
                     "default_name_value": "${NO_NAME_0:CpuTimeResource}",
                     "folders": {
                         "FairShareConstraint": {
                             "wlst_type": "FairShareConstraint",
                             "version": "[12.2.1,)",
-                            "child_folders_type": "single_unpredictable",
                             "default_name_value": "${NO_NAME_0:CpuUtilizationFairShareConstraint}",
                             "folders": { },
                             "attributes": {
@@ -410,7 +399,7 @@
                             },
                             "wlst_attributes_path": "WP001",
                             "wlst_paths": {
-                                "WP001": "/Partition${:s}/%PARTITION%/ResourceManager/%RESOURCEMANAGER%/CpuUtilization/%CPUUTIL%/FairShareConstraint/%FAIRSHARE%"
+                                "WP001": "/Partition${:s}/%PARTITION%/ResourceManager/%RESOURCEMANAGER%/CpuUtilization/%CPUUTILIZATION%/FairShareConstraint/%FAIRSHARECONSTRAINT%"
                             }
                         },
                         "Trigger": {
@@ -427,7 +416,7 @@
                             },
                             "wlst_attributes_path": "WP001",
                             "wlst_paths": {
-                                "WP001": "/Partition${:s}/%PARTITION%/ResourceManager/%RESOURCEMANAGER%/CpuUtilization/%CPUUTIL%/Trigger${:s}/%TRIGGER%"
+                                "WP001": "/Partition${:s}/%PARTITION%/ResourceManager/%RESOURCEMANAGER%/CpuUtilization/%CPUUTILIZATION%/Trigger${:s}/%TRIGGER%"
                             }
                         }
                     },
@@ -436,13 +425,12 @@
                     },
                     "wlst_attributes_path": "WP001",
                     "wlst_paths": {
-                        "WP001": "/Partition${:s}/%PARTITION%/ResourceManager/%RESOURCEMANAGER%/CpuUtilization/%CPUUTIL%"
+                        "WP001": "/Partition${:s}/%PARTITION%/ResourceManager/%RESOURCEMANAGER%/CpuUtilization/%CPUUTILIZATION%"
                     }
                 },
                 "FileOpen": {
                     "wlst_type": "FileOpen",
                     "version": "[12.2.1,)",
-                    "child_folders_type": "single_unpredictable",
                     "default_name_value": "${NO_NAME_0:FileOpenResource}",
                     "folders": {
                         "Trigger": {
@@ -474,13 +462,11 @@
                 "HeapRetained": {
                     "wlst_type": "HeapRetained",
                     "version": "[12.2.1,)",
-                    "child_folders_type": "single_unpredictable",
                     "default_name_value": "${NO_NAME_0:HeapRetainedResource}",
                     "folders": {
                         "FairShareConstraint": {
                             "wlst_type": "FairShareConstraint",
                             "version": "[12.2.1,)",
-                            "child_folders_type": "single_unpredictable",
                             "default_name_value": "${NO_NAME_0:HeapRetainedFairShareConstraint}",
                             "folders": { },
                             "attributes": {
@@ -490,7 +476,7 @@
                             },
                             "wlst_attributes_path": "WP001",
                             "wlst_paths": {
-                                "WP001": "/Partition${:s}/%PARTITION%/ResourceManager/%RESOURCEMANAGER%/HeapRetained/%HEAPRETAIN%/FairShareConstraint/%FAIRSHARE%"
+                                "WP001": "/Partition${:s}/%PARTITION%/ResourceManager/%RESOURCEMANAGER%/HeapRetained/%HEAPRETAINED%/FairShareConstraint/%FAIRSHARECONSTRAINT%"
                             }
                         },
                         "Trigger": {
@@ -507,7 +493,7 @@
                             },
                             "wlst_attributes_path": "WP001",
                             "wlst_paths": {
-                                "WP001": "/Partition${:s}/%PARTITION%/ResourceManager/%RESOURCEMANAGER%/HeapRetained/%HEAPRETAIN%/Trigger${:s}/%TRIGGER%"
+                                "WP001": "/Partition${:s}/%PARTITION%/ResourceManager/%RESOURCEMANAGER%/HeapRetained/%HEAPRETAINED%/Trigger${:s}/%TRIGGER%"
                             }
                         }
                     },
@@ -516,13 +502,12 @@
                     },
                     "wlst_attributes_path": "WP001",
                     "wlst_paths": {
-                        "WP001": "/Partition${:s}/%PARTITION%/ResourceManager/%RESOURCEMANAGER%/HeapRetained/%HEAPRETAIN%"
+                        "WP001": "/Partition${:s}/%PARTITION%/ResourceManager/%RESOURCEMANAGER%/HeapRetained/%HEAPRETAINED%"
                     }
                 },
                 "RestartLoopProtection": {
                     "wlst_type": "RestartLoopProtection",
                     "version": "[12.2.1,)",
-                    "child_folders_type": "single_unpredictable",
                     "default_name_value": "${NO_NAME_0:%RESOURCEMANAGER%}",
                     "folders": { },
                     "attributes": {
@@ -534,7 +519,7 @@
                     },
                     "wlst_attributes_path": "WP001",
                     "wlst_paths": {
-                        "WP001": "/Partition${:s}/%PARTITION%/ResourceManager/%RESOURCEMANAGER%/RestartLoopProtection/%RESTARTLOOP%"
+                        "WP001": "/Partition${:s}/%PARTITION%/ResourceManager/%RESOURCEMANAGER%/RestartLoopProtection/%RESTARTLOOPPROTECTION%"
                     }
                 }
             },
diff --git a/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/ResourceManagement.json b/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/ResourceManagement.json
index 08b54e817..829aa6fb3 100644
--- a/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/ResourceManagement.json
+++ b/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/ResourceManagement.json
@@ -1,9 +1,10 @@
 {
-    "copyright": "Copyright (c) 2017, 2019, Oracle Corporation and/or its affiliates.  All rights reserved.",
+    "copyright": "Copyright (c) 2017, 2020, Oracle Corporation and/or its affiliates.  All rights reserved.",
     "license": "Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl",
     "wlst_type": "ResourceManagement",
     "version": "[12.2.1,)",
     "child_folders_type": "single",
+    "default_name_value": "%DOMAIN%",
     "short_name": "ResManagement",
     "folders": { },
     "attributes": {
diff --git a/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/ResourceManager.json b/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/ResourceManager.json
index 193951c6b..c703562e4 100644
--- a/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/ResourceManager.json
+++ b/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/ResourceManager.json
@@ -1,5 +1,5 @@
 {
-    "copyright": "Copyright (c) 2017, 2019, Oracle Corporation and/or its affiliates.  All rights reserved.",
+    "copyright": "Copyright (c) 2017, 2020, Oracle Corporation and/or its affiliates.  All rights reserved.",
     "license": "Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl",
     "wlst_type": "ResourceManager${:s}",
     "version": "[12.2.1,)",
@@ -9,13 +9,11 @@
         "CpuUtilization": {
             "wlst_type": "CpuUtilization",
             "version": "[12.2.1,)",
-            "child_folders_type": "single_unpredictable",
             "default_name_value": "${NO_NAME_0:CpuTimeResource}",
             "folders": {
                 "FairShareConstraint": {
                     "wlst_type": "FairShareConstraint",
                     "version": "[12.2.1,)",
-                    "child_folders_type": "single_unpredictable",
                     "default_name_value": "${NO_NAME_0:CpuUtilizationFairShareConstraint}",
                     "folders": { },
                     "attributes": {
@@ -24,7 +22,7 @@
                     },
                     "wlst_attributes_path": "WP001",
                     "wlst_paths": {
-                        "WP001": "/ResourceManager${:s}/%RESOURCEMANAGER%/CpuUtilization/%CPUUTIL%/FairShareConstraint/%FAIRSHARE%"
+                        "WP001": "/ResourceManager${:s}/%RESOURCEMANAGER%/CpuUtilization/%CPUUTILIZATION%/FairShareConstraint/%FAIRSHARECONSTRAINT%"
                     }
                 },
                 "Trigger": {
@@ -41,7 +39,7 @@
                     },
                     "wlst_attributes_path": "WP001",
                     "wlst_paths": {
-                        "WP001": "/ResourceManager${:s}/%RESOURCEMANAGER%/CpuUtilization/%CPUUTIL%/Trigger${:s}/%TRIGGER%"
+                        "WP001": "/ResourceManager${:s}/%RESOURCEMANAGER%/CpuUtilization/%CPUUTILIZATION%/Trigger${:s}/%TRIGGER%"
                     }
                 }
             },
@@ -50,13 +48,12 @@
             },
             "wlst_attributes_path": "WP001",
             "wlst_paths": {
-                "WP001": "/ResourceManager${:s}/%RESOURCEMANAGER%/CpuUtilization/%CPUUTIL%"
+                "WP001": "/ResourceManager${:s}/%RESOURCEMANAGER%/CpuUtilization/%CPUUTILIZATION%"
             }
         },
         "FileOpen": {
             "wlst_type": "FileOpen",
             "version": "[12.2.1,)",
-            "child_folders_type": "single_unpredictable",
             "default_name_value": "${NO_NAME_0:FileOpenResource}",
             "folders": {
                 "Trigger": {
@@ -88,13 +85,11 @@
         "HeapRetained": {
             "wlst_type": "HeapRetained",
             "version": "[12.2.1,)",
-            "child_folders_type": "single_unpredictable",
             "default_name_value": "${NO_NAME_0:HeapRetainedResource}",
             "folders": {
                 "FairShareConstraint": {
                     "wlst_type": "FairShareConstraint",
                     "version": "[12.2.1,)",
-                    "child_folders_type": "single_unpredictable",
                     "default_name_value": "${NO_NAME_0:HeapRetainedFairShareConstraint}",
                     "folders": { },
                     "attributes": {
@@ -104,7 +99,7 @@
                     },
                     "wlst_attributes_path": "WP001",
                     "wlst_paths": {
-                        "WP001": "/ResourceManager${:s}/%RESOURCEMANAGER%/HeapRetained/%HEAPRETAIN%/FairShareConstraint/%FAIRSHARE%"
+                        "WP001": "/ResourceManager${:s}/%RESOURCEMANAGER%/HeapRetained/%HEAPRETAINED%/FairShareConstraint/%FAIRSHARECONSTRAINT%"
                     }
                 },
                 "Trigger": {
@@ -121,7 +116,7 @@
                     },
                     "wlst_attributes_path": "WP001",
                     "wlst_paths": {
-                        "WP001": "/ResourceManager${:s}/%RESOURCEMANAGER%/HeapRetained/%HEAPRETAIN%/Trigger${:s}/%TRIGGER%"
+                        "WP001": "/ResourceManager${:s}/%RESOURCEMANAGER%/HeapRetained/%HEAPRETAINED%/Trigger${:s}/%TRIGGER%"
                     }
                 }
             },
@@ -130,13 +125,12 @@
             },
             "wlst_attributes_path": "WP001",
             "wlst_paths": {
-                "WP001": "/ResourceManager${:s}/%RESOURCEMANAGER%/HeapRetained/%HEAPRETAIN%"
+                "WP001": "/ResourceManager${:s}/%RESOURCEMANAGER%/HeapRetained/%HEAPRETAINED%"
             }
         },
         "RestartLoopProtection": {
             "wlst_type": "RestartLoopProtection",
             "version": "[12.2.1,)",
-            "child_folders_type": "single_unpredictable",
             "default_name_value": "${NO_NAME_0:%RESOURCEMANAGER%}",
             "folders": { },
             "attributes": {
@@ -148,7 +142,7 @@
             },
             "wlst_attributes_path": "WP001",
             "wlst_paths": {
-                "WP001": "/ResourceManager${:s}/%RESOURCEMANAGER%/RestartLoopProtection/%RESTARTLOOP%"
+                "WP001": "/ResourceManager${:s}/%RESOURCEMANAGER%/RestartLoopProtection/%RESTARTLOOPPROTECTION%"
             }
         }
     },
diff --git a/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/RestfulManagementServices.json b/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/RestfulManagementServices.json
index cffaee758..0d41da374 100644
--- a/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/RestfulManagementServices.json
+++ b/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/RestfulManagementServices.json
@@ -3,7 +3,6 @@
     "license": "Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl",
     "wlst_type": "RestfulManagementServices",
     "version": "[12.1.2,)",
-    "child_folders_type": "single_unpredictable",
     "default_name_value": "${NO_NAME_0:%DOMAIN%}",
     "short_name": "RestManage",
     "folders": {},
diff --git a/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/SAFAgent.json b/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/SAFAgent.json
index 3938e22b4..876e12151 100644
--- a/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/SAFAgent.json
+++ b/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/SAFAgent.json
@@ -1,5 +1,5 @@
 {
-    "copyright": "Copyright (c) 2017, 2019, Oracle Corporation and/or its affiliates.  All rights reserved.",
+    "copyright": "Copyright (c) 2017, 2020, Oracle Corporation and/or its affiliates.  All rights reserved.",
     "license": "Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl",
     "wlst_type": "SAFAgent${:s}",
     "child_folders_type": "multiple",
@@ -11,6 +11,7 @@
             }, {
                 "version": "[12.2.1,)"
             }],
+            "default_name_value": "${NO_NAME_0:%SAFAGENT%}",
             "folders": {},
             "attributes": {
                 "BufferSizeKb":         [ {"version": "[10,)",           "wlst_mode": "both",    "wlst_name": "BufferSize${Kb:KB}",   "wlst_path": "WP001", "value": {"default": 8                                                        }, "wlst_type": "integer" } ],
@@ -35,7 +36,7 @@
             "wlst_type": "${Jmssaf:JMSSAF}MessageLogFile",
             "wlst_attributes_path": "WP001",
             "wlst_paths": {
-                "WP001": "/SAFAgent${:s}/%SAFAGENT%/${Jmssaf:JMSSAF}MessageLogFile/${NO_NAME_0:%SAFAGENT%}"
+                "WP001": "/SAFAgent${:s}/%SAFAGENT%/${Jmssaf:JMSSAF}MessageLogFile/%JMSSAFMESSAGELOGFILE%"
             }
         }
     },
diff --git a/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/Security.json b/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/Security.json
index e202c9f27..ae5ae1e9f 100644
--- a/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/Security.json
+++ b/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/Security.json
@@ -1,7 +1,8 @@
 {
-    "copyright": "Copyright (c) 2017, 2019, Oracle Corporation and/or its affiliates.  All rights reserved.",
+    "copyright": "Copyright (c) 2017, 2020, Oracle Corporation and/or its affiliates.  All rights reserved.",
     "license": "Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl",
     "wlst_type": "Security",
+    "default_name_value": "%DOMAIN%",
     "folders": {
         "Group": {
             "wlst_type": "Group",
@@ -13,7 +14,7 @@
             },
             "wlst_attributes_path": "WP001",
             "wlst_paths": {
-                "WP001": "/Security/%DOMAIN%/Group/%GROUP%"
+                "WP001": "/Security/%SECURITY%/Group/%GROUP%"
             }
         },
         "User": {
@@ -29,13 +30,13 @@
             },
             "wlst_attributes_path": "WP001",
             "wlst_paths": {
-                "WP001": "/Security/%DOMAIN%/User/%USER%"
+                "WP001": "/Security/%SECURITY%/User/%USER%"
             }
         }
     },
     "attributes" : { },
     "wlst_attributes_path": "WP001",
     "wlst_paths": {
-        "WP001": "/Security/%DOMAIN%"
+        "WP001": "/Security/%SECURITY%"
     }
 }
diff --git a/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/SecurityConfiguration.json b/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/SecurityConfiguration.json
index cca731abd..fb1f5bb0e 100644
--- a/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/SecurityConfiguration.json
+++ b/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/SecurityConfiguration.json
@@ -2,13 +2,11 @@
     "copyright": "Copyright (c) 2017, 2020, Oracle Corporation and/or its affiliates.",
     "license": "Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl",
     "wlst_type": "SecurityConfiguration",
-    "child_folders_type": "single_unpredictable",
     "default_name_value": "%DOMAIN%",
     "short_name": "SecurityConfig",
     "folders": {
         "CertRevoc" : {
             "wlst_type": "CertRevoc",
-            "child_folders_type": "single_unpredictable",
             "default_name_value": "${NO_NAME_0:%DOMAIN%}",
             "folders" : {
                     "CertRevocCa" : {
@@ -39,7 +37,7 @@
                         },
                         "wlst_attributes_path": "WP001",
                         "wlst_paths": {
-                            "WP001": "/SecurityConfiguration/%SEC_CONFIG%/CertRevoc/%CERTREVOC%/CertRevocCa${:s}/%CERTREVOCCA%"
+                            "WP001": "/SecurityConfiguration/%SECURITYCONFIGURATION%/CertRevoc/%CERTREVOC%/CertRevocCa${:s}/%CERTREVOCCA%"
                         }
                     }
                 },
@@ -66,7 +64,7 @@
                 },
                 "wlst_attributes_path": "WP001",
                 "wlst_paths": {
-                    "WP001": "/SecurityConfiguration/%SEC_CONFIG%/CertRevoc/%CERTREVOC%"
+                    "WP001": "/SecurityConfiguration/%SECURITYCONFIGURATION%/CertRevoc/%CERTREVOC%"
                 }
         },
         "Realm" : {
@@ -90,14 +88,14 @@
                             },
                             "wlst_attributes_path": "WP001",
                             "wlst_paths": {
-                                "WP001": "/SecurityConfiguration/%SEC_CONFIG%/Realm${:s}/%REALM%/Adjudicator/%PROVIDER%"
+                                "WP001": "/SecurityConfiguration/%SECURITYCONFIGURATION%/Realm${:s}/%REALM%/Adjudicator/%PROVIDER%"
                             }
                         }
                     },
                     "attributes" : { },
                     "wlst_attributes_path": "WP001",
                     "wlst_paths": {
-                        "WP001": "/SecurityConfiguration/%SEC_CONFIG%/Realm${:s}/%REALM%/Adjudicator/%PROVIDER%"
+                        "WP001": "/SecurityConfiguration/%SECURITYCONFIGURATION%/Realm${:s}/%REALM%/Adjudicator/%PROVIDER%"
                     }
                 },
                 "Auditor" : {
@@ -126,7 +124,7 @@
                             },
                             "wlst_attributes_path": "WP001",
                             "wlst_paths": {
-                                "WP001": "/SecurityConfiguration/%SEC_CONFIG%/Realm${:s}/%REALM%/Auditor/%PROVIDER%"
+                                "WP001": "/SecurityConfiguration/%SECURITYCONFIGURATION%/Realm${:s}/%REALM%/Auditor/%PROVIDER%"
                             }
 
                         }
@@ -134,7 +132,7 @@
                     "attributes" : { },
                     "wlst_attributes_path": "WP001",
                     "wlst_paths": {
-                        "WP001": "/SecurityConfiguration/%SEC_CONFIG%/Realm${:s}/%REALM%/Auditor/%PROVIDER%"
+                        "WP001": "/SecurityConfiguration/%SECURITYCONFIGURATION%/Realm${:s}/%REALM%/Auditor/%PROVIDER%"
                     }
                 },
                 "AuthenticationProvider" : {
@@ -203,7 +201,7 @@
                             },
                             "wlst_attributes_path": "WP001",
                             "wlst_paths": {
-                                "WP001": "/SecurityConfiguration/%SEC_CONFIG%/Realm${:s}/%REALM%/AuthenticationProvider${:s}/%PROVIDER%"
+                                "WP001": "/SecurityConfiguration/%SECURITYCONFIGURATION%/Realm${:s}/%REALM%/AuthenticationProvider${:s}/%PROVIDER%"
                             }
                         },
                         "CustomDBMSAuthenticator": {
@@ -226,7 +224,7 @@
                             },
                             "wlst_attributes_path": "WP001",
                             "wlst_paths": {
-                                "WP001": "/SecurityConfiguration/%SEC_CONFIG%/Realm${:s}/%REALM%/AuthenticationProvider${:s}/%PROVIDER%"
+                                "WP001": "/SecurityConfiguration/%SECURITYCONFIGURATION%/Realm${:s}/%REALM%/AuthenticationProvider${:s}/%PROVIDER%"
                             }
                         },
                         "DefaultAuthenticator": {
@@ -260,7 +258,7 @@
                             },
                             "wlst_attributes_path": "WP001",
                             "wlst_paths": {
-                                "WP001": "/SecurityConfiguration/%SEC_CONFIG%/Realm${:s}/%REALM%/AuthenticationProvider${:s}/%PROVIDER%"
+                                "WP001": "/SecurityConfiguration/%SECURITYCONFIGURATION%/Realm${:s}/%REALM%/AuthenticationProvider${:s}/%PROVIDER%"
                             }
                         },
                         "DefaultIdentityAsserter": {
@@ -289,7 +287,7 @@
                             },
                             "wlst_attributes_path": "WP001",
                             "wlst_paths": {
-                                "WP001": "/SecurityConfiguration/%SEC_CONFIG%/Realm${:s}/%REALM%/AuthenticationProvider${:s}/%PROVIDER%"
+                                "WP001": "/SecurityConfiguration/%SECURITYCONFIGURATION%/Realm${:s}/%REALM%/AuthenticationProvider${:s}/%PROVIDER%"
                             }
                         },
                         "IPlanetAuthenticator": {
@@ -351,7 +349,7 @@
                             },
                             "wlst_attributes_path": "WP001",
                             "wlst_paths": {
-                                "WP001": "/SecurityConfiguration/%SEC_CONFIG%/Realm${:s}/%REALM%/AuthenticationProvider${:s}/%PROVIDER%"
+                                "WP001": "/SecurityConfiguration/%SECURITYCONFIGURATION%/Realm${:s}/%REALM%/AuthenticationProvider${:s}/%PROVIDER%"
                             }
                         },
                         "LDAPAuthenticator": {
@@ -411,7 +409,7 @@
                             },
                             "wlst_attributes_path": "WP001",
                             "wlst_paths": {
-                                "WP001": "/SecurityConfiguration/%SEC_CONFIG%/Realm${:s}/%REALM%/AuthenticationProvider${:s}/%PROVIDER%"
+                                "WP001": "/SecurityConfiguration/%SECURITYCONFIGURATION%/Realm${:s}/%REALM%/AuthenticationProvider${:s}/%PROVIDER%"
                             }
                         },
                         "LDAPX509IdentityAsserter": {
@@ -445,7 +443,7 @@
                             },
                             "wlst_attributes_path": "WP001",
                             "wlst_paths": {
-                                "WP001": "/SecurityConfiguration/%SEC_CONFIG%/Realm${:s}/%REALM%/AuthenticationProvider${:s}/%PROVIDER%"
+                                "WP001": "/SecurityConfiguration/%SECURITYCONFIGURATION%/Realm${:s}/%REALM%/AuthenticationProvider${:s}/%PROVIDER%"
                             }
                         },
                         "NegotiateIdentityAsserter": {
@@ -461,7 +459,7 @@
                             },
                             "wlst_attributes_path": "WP001",
                             "wlst_paths": {
-                                "WP001": "/SecurityConfiguration/%SEC_CONFIG%/Realm${:s}/%REALM%/AuthenticationProvider${:s}/%PROVIDER%"
+                                "WP001": "/SecurityConfiguration/%SECURITYCONFIGURATION%/Realm${:s}/%REALM%/AuthenticationProvider${:s}/%PROVIDER%"
                             }
                         },
                         "NovellAuthenticator": {
@@ -521,7 +519,7 @@
                             },
                             "wlst_attributes_path": "WP001",
                             "wlst_paths": {
-                                "WP001": "/SecurityConfiguration/%SEC_CONFIG%/Realm${:s}/%REALM%/AuthenticationProvider${:s}/%PROVIDER%"
+                                "WP001": "/SecurityConfiguration/%SECURITYCONFIGURATION%/Realm${:s}/%REALM%/AuthenticationProvider${:s}/%PROVIDER%"
                             }
                         },
                         "OpenLDAPAuthenticator": {
@@ -581,7 +579,7 @@
                             },
                             "wlst_attributes_path": "WP001",
                             "wlst_paths": {
-                                "WP001": "/SecurityConfiguration/%SEC_CONFIG%/Realm${:s}/%REALM%/AuthenticationProvider${:s}/%PROVIDER%"
+                                "WP001": "/SecurityConfiguration/%SECURITYCONFIGURATION%/Realm${:s}/%REALM%/AuthenticationProvider${:s}/%PROVIDER%"
                             }
                         },
                         "OracleInternetDirectoryAuthenticator": {
@@ -642,7 +640,7 @@
                             },
                             "wlst_attributes_path": "WP001",
                             "wlst_paths": {
-                                "WP001": "/SecurityConfiguration/%SEC_CONFIG%/Realm${:s}/%REALM%/AuthenticationProvider${:s}/%PROVIDER%"
+                                "WP001": "/SecurityConfiguration/%SECURITYCONFIGURATION%/Realm${:s}/%REALM%/AuthenticationProvider${:s}/%PROVIDER%"
                             }
                         },
                         "OracleUnifiedDirectoryAuthenticator": {
@@ -704,7 +702,7 @@
                             },
                             "wlst_attributes_path": "WP001",
                             "wlst_paths": {
-                                "WP001": "/SecurityConfiguration/%SEC_CONFIG%/Realm${:s}/%REALM%/AuthenticationProvider${:s}/%PROVIDER%"
+                                "WP001": "/SecurityConfiguration/%SECURITYCONFIGURATION%/Realm${:s}/%REALM%/AuthenticationProvider${:s}/%PROVIDER%"
                             }
                         },
                         "OracleVirtualDirectoryAuthenticator": {
@@ -764,7 +762,7 @@
                             },
                             "wlst_attributes_path": "WP001",
                             "wlst_paths": {
-                                "WP001": "/SecurityConfiguration/%SEC_CONFIG%/Realm${:s}/%REALM%/AuthenticationProvider${:s}/%PROVIDER%"
+                                "WP001": "/SecurityConfiguration/%SECURITYCONFIGURATION%/Realm${:s}/%REALM%/AuthenticationProvider${:s}/%PROVIDER%"
                             }
                         },
                         "ReadOnlySQLAuthenticator": {
@@ -795,7 +793,7 @@
                             },
                             "wlst_attributes_path": "WP001",
                             "wlst_paths": {
-                                "WP001": "/SecurityConfiguration/%SEC_CONFIG%/Realm${:s}/%REALM%/AuthenticationProvider${:s}/%PROVIDER%"
+                                "WP001": "/SecurityConfiguration/%SECURITYCONFIGURATION%/Realm${:s}/%REALM%/AuthenticationProvider${:s}/%PROVIDER%"
                             }
                         },
                         "SAML2IdentityAsserter": {
@@ -813,7 +811,7 @@
                             },
                             "wlst_attributes_path": "WP001",
                             "wlst_paths": {
-                                "WP001": "/SecurityConfiguration/%SEC_CONFIG%/Realm${:s}/%REALM%/AuthenticationProvider${:s}/%PROVIDER%"
+                                "WP001": "/SecurityConfiguration/%SECURITYCONFIGURATION%/Realm${:s}/%REALM%/AuthenticationProvider${:s}/%PROVIDER%"
                             }
                         },
                         "SAMLAuthenticator": {
@@ -827,7 +825,7 @@
                             },
                             "wlst_attributes_path": "WP001",
                             "wlst_paths": {
-                                "WP001": "/SecurityConfiguration/%SEC_CONFIG%/Realm${:s}/%REALM%/AuthenticationProvider${:s}/%PROVIDER%"
+                                "WP001": "/SecurityConfiguration/%SECURITYCONFIGURATION%/Realm${:s}/%REALM%/AuthenticationProvider${:s}/%PROVIDER%"
                             }
                         },
                         "SAMLIdentityAsserterV2": {
@@ -844,7 +842,7 @@
                             },
                             "wlst_attributes_path": "WP001",
                             "wlst_paths": {
-                                "WP001": "/SecurityConfiguration/%SEC_CONFIG%/Realm${:s}/%REALM%/AuthenticationProvider${:s}/%PROVIDER%"
+                                "WP001": "/SecurityConfiguration/%SECURITYCONFIGURATION%/Realm${:s}/%REALM%/AuthenticationProvider${:s}/%PROVIDER%"
                             }
                         },
                         "SQLAuthenticator": {
@@ -890,7 +888,7 @@
                             },
                             "wlst_attributes_path": "WP001",
                             "wlst_paths": {
-                                "WP001": "/SecurityConfiguration/%SEC_CONFIG%/Realm${:s}/%REALM%/AuthenticationProvider${:s}/%PROVIDER%"
+                                "WP001": "/SecurityConfiguration/%SECURITYCONFIGURATION%/Realm${:s}/%REALM%/AuthenticationProvider${:s}/%PROVIDER%"
                             }
                         },
                         "TrustServiceIdentityAsserter": {
@@ -911,7 +909,7 @@
                             },
                             "wlst_attributes_path": "WP001",
                             "wlst_paths": {
-                                "WP001": "/SecurityConfiguration/%SEC_CONFIG%/Realm${:s}/%REALM%/AuthenticationProvider${:s}/%PROVIDER%"
+                                "WP001": "/SecurityConfiguration/%SECURITYCONFIGURATION%/Realm${:s}/%REALM%/AuthenticationProvider${:s}/%PROVIDER%"
                             }
                         },
                         "VirtualUserAuthenticator": {
@@ -926,14 +924,14 @@
                             },
                             "wlst_attributes_path": "WP001",
                             "wlst_paths": {
-                                "WP001": "/SecurityConfiguration/%SEC_CONFIG%/Realm${:s}/%REALM%/AuthenticationProvider${:s}/%PROVIDER%"
+                                "WP001": "/SecurityConfiguration/%SECURITYCONFIGURATION%/Realm${:s}/%REALM%/AuthenticationProvider${:s}/%PROVIDER%"
                             }
                         }
                     },
                     "attributes": {},
                     "wlst_attributes_path": "WP001",
                     "wlst_paths": {
-                        "WP001": "/SecurityConfiguration/%SEC_CONFIG%/Realm${:s}/%REALM%/AuthenticationProvider${:s}/%PROVIDER%"
+                        "WP001": "/SecurityConfiguration/%SECURITYCONFIGURATION%/Realm${:s}/%REALM%/AuthenticationProvider${:s}/%PROVIDER%"
                     }
                 },
                 "Authorizer" : {
@@ -950,7 +948,7 @@
                             },
                             "wlst_attributes_path": "WP001",
                             "wlst_paths": {
-                                "WP001": "/SecurityConfiguration/%SEC_CONFIG%/Realm${:s}/%REALM%/Authorizer${:s}/%PROVIDER%"
+                                "WP001": "/SecurityConfiguration/%SECURITYCONFIGURATION%/Realm${:s}/%REALM%/Authorizer${:s}/%PROVIDER%"
                             }
                         },
                         "XACMLAuthorizer": {
@@ -970,14 +968,14 @@
                             },
                             "wlst_attributes_path": "WP001",
                             "wlst_paths": {
-                                "WP001": "/SecurityConfiguration/%SEC_CONFIG%/Realm${:s}/%REALM%/Authorizer${:s}/%PROVIDER%"
+                                "WP001": "/SecurityConfiguration/%SECURITYCONFIGURATION%/Realm${:s}/%REALM%/Authorizer${:s}/%PROVIDER%"
                             }
                         }
                     },
                     "attributes" : { },
                     "wlst_attributes_path": "WP001",
                     "wlst_paths": {
-                        "WP001": "/SecurityConfiguration/%SEC_CONFIG%/Realm${:s}/%REALM%/Authorizer${:s}/%PROVIDER%"
+                        "WP001": "/SecurityConfiguration/%SECURITYCONFIGURATION%/Realm${:s}/%REALM%/Authorizer${:s}/%PROVIDER%"
                     }
                 },
                 "CertPathProvider" : {
@@ -993,7 +991,7 @@
                             },
                             "wlst_attributes_path": "WP001",
                             "wlst_paths": {
-                                "WP001": "/SecurityConfiguration/%SEC_CONFIG%/Realm${:s}/%REALM%/CertPathProvider${:s}/%PROVIDER%"
+                                "WP001": "/SecurityConfiguration/%SECURITYCONFIGURATION%/Realm${:s}/%REALM%/CertPathProvider${:s}/%PROVIDER%"
                             }
                         },
                         "WebLogicCertPathProvider": {
@@ -1008,14 +1006,14 @@
                             },
                             "wlst_attributes_path": "WP001",
                             "wlst_paths": {
-                                "WP001": "/SecurityConfiguration/%SEC_CONFIG%/Realm${:s}/%REALM%/CertPathProvider${:s}/%PROVIDER%"
+                                "WP001": "/SecurityConfiguration/%SECURITYCONFIGURATION%/Realm${:s}/%REALM%/CertPathProvider${:s}/%PROVIDER%"
                             }
                         }
                     },
                     "attributes" : { },
                     "wlst_attributes_path": "WP001",
                     "wlst_paths": {
-                        "WP001": "/SecurityConfiguration/%SEC_CONFIG%/Realm${:s}/%REALM%/CertPathProvider${:s}/%PROVIDER%"
+                        "WP001": "/SecurityConfiguration/%SECURITYCONFIGURATION%/Realm${:s}/%REALM%/CertPathProvider${:s}/%PROVIDER%"
                     }
                 },
                 "CredentialMapper" : {
@@ -1040,7 +1038,7 @@
                             },
                             "wlst_attributes_path": "WP001",
                             "wlst_paths": {
-                                "WP001": "/SecurityConfiguration/%SEC_CONFIG%/Realm${:s}/%REALM%/CredentialMapper${:s}/%PROVIDER%"
+                                "WP001": "/SecurityConfiguration/%SECURITYCONFIGURATION%/Realm${:s}/%REALM%/CredentialMapper${:s}/%PROVIDER%"
                             }
                         },
                         "PKICredentialMapper": {
@@ -1058,7 +1056,7 @@
                             },
                             "wlst_attributes_path": "WP001",
                             "wlst_paths": {
-                                "WP001": "/SecurityConfiguration/%SEC_CONFIG%/Realm${:s}/%REALM%/CredentialMapper${:s}/%PROVIDER%"
+                                "WP001": "/SecurityConfiguration/%SECURITYCONFIGURATION%/Realm${:s}/%REALM%/CredentialMapper${:s}/%PROVIDER%"
                             }
                         },
                         "SAML2CredentialMapper": {
@@ -1080,7 +1078,7 @@
                             },
                             "wlst_attributes_path": "WP001",
                             "wlst_paths": {
-                                "WP001": "/SecurityConfiguration/%SEC_CONFIG%/Realm${:s}/%REALM%/CredentialMapper${:s}/%PROVIDER%"
+                                "WP001": "/SecurityConfiguration/%SECURITYCONFIGURATION%/Realm${:s}/%REALM%/CredentialMapper${:s}/%PROVIDER%"
                             }
                         },
                         "SAMLCredentialMapperV2": {
@@ -1102,14 +1100,14 @@
                             },
                             "wlst_attributes_path": "WP001",
                             "wlst_paths": {
-                                "WP001": "/SecurityConfiguration/%SEC_CONFIG%/Realm${:s}/%REALM%/CredentialMapper${:s}/%PROVIDER%"
+                                "WP001": "/SecurityConfiguration/%SECURITYCONFIGURATION%/Realm${:s}/%REALM%/CredentialMapper${:s}/%PROVIDER%"
                             }
                         }
                     },
                     "attributes" : { },
                     "wlst_attributes_path": "WP001",
                     "wlst_paths": {
-                        "WP001": "/SecurityConfiguration/%SEC_CONFIG%/Realm${:s}/%REALM%/CredentialMapper${:s}/%PROVIDER%"
+                        "WP001": "/SecurityConfiguration/%SECURITYCONFIGURATION%/Realm${:s}/%REALM%/CredentialMapper${:s}/%PROVIDER%"
                     }
                 },
                 "PasswordValidator" : {
@@ -1140,19 +1138,18 @@
                             },
                             "wlst_attributes_path": "WP001",
                             "wlst_paths": {
-                                "WP001": "/SecurityConfiguration/%SEC_CONFIG%/Realm${:s}/%REALM%/PasswordValidator${:s}/%PASSWORDVALIDATOR%"
+                                "WP001": "/SecurityConfiguration/%SECURITYCONFIGURATION%/Realm${:s}/%REALM%/PasswordValidator${:s}/%PASSWORDVALIDATOR%"
                             }
                         }
                     },
                     "attributes" : { },
                     "wlst_attributes_path": "WP001",
                     "wlst_paths": {
-                        "WP001": "/SecurityConfiguration/%SEC_CONFIG%/Realm${:s}/%REALM%/PasswordValidator${:s}/%PASSWORDVALIDATOR%"
+                        "WP001": "/SecurityConfiguration/%SECURITYCONFIGURATION%/Realm${:s}/%REALM%/PasswordValidator${:s}/%PASSWORDVALIDATOR%"
                     }
                 },
                 "RDBMSSecurityStore" : {
                     "wlst_type" : "RDBMSSecurityStore",
-                    "child_folders_type": "single_unpredictable",
                     "default_name_value": "${NO_NAME_0:RDBMSSecurityStore}",
                     "folders" : {},
                     "attributes" : {
@@ -1171,7 +1168,7 @@
                     },
                     "wlst_attributes_path": "WP001",
                     "wlst_paths": {
-                        "WP001": "/SecurityConfiguration/%SEC_CONFIG%/Realm${:s}/%REALM%/RDBMSSecurityStore/%RDBMSSECURITYSTORE%"
+                        "WP001": "/SecurityConfiguration/%SECURITYCONFIGURATION%/Realm${:s}/%REALM%/RDBMSSecurityStore/%RDBMSSECURITYSTORE%"
                     }
                 },
                 "RoleMapper" : {
@@ -1188,7 +1185,7 @@
                             },
                             "wlst_attributes_path": "WP001",
                             "wlst_paths": {
-                                "WP001": "/SecurityConfiguration/%SEC_CONFIG%/Realm${:s}/%REALM%/RoleMapper${:s}/%PROVIDER%"
+                                "WP001": "/SecurityConfiguration/%SECURITYCONFIGURATION%/Realm${:s}/%REALM%/RoleMapper${:s}/%PROVIDER%"
                             }
                         },
                         "XACMLRoleMapper": {
@@ -1208,20 +1205,19 @@
                             },
                             "wlst_attributes_path": "WP001",
                             "wlst_paths": {
-                                "WP001": "/SecurityConfiguration/%SEC_CONFIG%/Realm${:s}/%REALM%/RoleMapper${:s}/%PROVIDER%"
+                                "WP001": "/SecurityConfiguration/%SECURITYCONFIGURATION%/Realm${:s}/%REALM%/RoleMapper${:s}/%PROVIDER%"
                             }
                         }
                     },
                     "attributes" : { },
                     "wlst_attributes_path": "WP001",
                     "wlst_paths": {
-                        "WP001": "/SecurityConfiguration/%SEC_CONFIG%/Realm${:s}/%REALM%/RoleMapper${:s}/%PROVIDER%"
+                        "WP001": "/SecurityConfiguration/%SECURITYCONFIGURATION%/Realm${:s}/%REALM%/RoleMapper${:s}/%PROVIDER%"
                     }
                 },
                 "UserLockoutManager" : {
                     "wlst_type" : "UserLockoutManager",
                     "folders" : {},
-                    "child_folders_type": "single_unpredictable",
                     "default_name_value": "${NO_NAME_0:UserLockoutManager}",
                     "attributes" : {
                         "CompatibilityObjectName":            [ {"version": "[10,)", "wlst_mode": "offline", "wlst_name": "CompatibilityObjectName",            "wlst_path": "WP001", "value": {"default": "None" },    "wlst_type": "string", "access": "RO"  } ],
@@ -1240,7 +1236,7 @@
                     },
                     "wlst_attributes_path": "WP001",
                     "wlst_paths": {
-                        "WP001": "/SecurityConfiguration/%SEC_CONFIG%/Realm${:s}/%REALM%/UserLockoutManager/%USERLOCKOUTMANAGER%"
+                        "WP001": "/SecurityConfiguration/%SECURITYCONFIGURATION%/Realm${:s}/%REALM%/UserLockoutManager/%USERLOCKOUTMANAGER%"
                     }
                 }
             },
@@ -1280,13 +1276,12 @@
             },
             "wlst_attributes_path": "WP001",
             "wlst_paths": {
-                "WP001": "/SecurityConfiguration/%SEC_CONFIG%/Realm${:s}/%REALM%"
+                "WP001": "/SecurityConfiguration/%SECURITYCONFIGURATION%/Realm${:s}/%REALM%"
             }
         },
         "SecureMode" : {
             "wlst_type" : "SecureMode",
             "version": "[12.2.1.1,)",
-            "child_folders_type": "single_unpredictable",
             "default_name_value": "${NO_NAME_0:%DOMAIN%}",
             "folders" : {},
             "attributes" : {
@@ -1302,7 +1297,7 @@
             },
             "wlst_attributes_path": "WP001",
             "wlst_paths": {
-                "WP001": "/SecurityConfiguration/%SEC_CONFIG%/SecureMode/%SECUREMODE%"
+                "WP001": "/SecurityConfiguration/%SECURITYCONFIGURATION%/SecureMode/%SECUREMODE%"
             }
         }
     },
@@ -1347,6 +1342,6 @@
     },
     "wlst_attributes_path": "WP001",
     "wlst_paths": {
-        "WP001": "/SecurityConfiguration/%SEC_CONFIG%"
+        "WP001": "/SecurityConfiguration/%SECURITYCONFIGURATION%"
     }
 }
diff --git a/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/SelfTuning.json b/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/SelfTuning.json
index 005e8ff13..43b12fdda 100644
--- a/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/SelfTuning.json
+++ b/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/SelfTuning.json
@@ -1,8 +1,7 @@
 {
-    "copyright": "Copyright (c) 2017, 2019, Oracle Corporation and/or its affiliates.  All rights reserved.",
+    "copyright": "Copyright (c) 2017, 2020, Oracle Corporation and/or its affiliates.  All rights reserved.",
     "license": "Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl",
     "wlst_type": "SelfTuning",
-    "child_folders_type": "single_unpredictable",
     "default_name_value": "${NO_NAME_0:%DOMAIN%}",
     "short_name": "WorkManager",
     "folders": {
@@ -136,6 +135,7 @@
                 "WorkManagerShutdownTrigger": {
                     "wlst_type": "WorkManagerShutdownTrigger",
                     "child_folders_type": "single",
+                    "default_name_value": "${NO_NAME_0:%WORKMANAGER%}",
                     "folders": {},
                     "attributes": {
                         "MaxStuckThreadTime": [ {"version": "[10,)",         "wlst_mode": "both",   "wlst_name": "MaxStuckThreadTime",  "wlst_path": "WP001", "value": {"default": 0      }, "wlst_type": "integer"} ],
@@ -145,7 +145,7 @@
                     },
                     "wlst_attributes_path": "WP001",
                     "wlst_paths": {
-                        "WP001": "/SelfTuning/%SELFTUNING%/WorkManager${:s}/%WORKMANAGER%/WorkManagerShutdownTrigger/${NO_NAME_0:%WORKMANAGER%}"
+                        "WP001": "/SelfTuning/%SELFTUNING%/WorkManager${:s}/%WORKMANAGER%/WorkManagerShutdownTrigger/%WORKMANAGERSHUTDOWNTRIGGER%"
                     }
                 }
             },
diff --git a/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/Server.json b/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/Server.json
index 2d6643369..51667b076 100644
--- a/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/Server.json
+++ b/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/Server.json
@@ -7,6 +7,7 @@
     "folders": {
         "CoherenceMemberConfig": {
             "wlst_type": "CoherenceMemberConfig",
+            "default_name_value": "${NO_NAME_0:%SERVER%}",
             "version": "[12.1.2,)",
             "folders": {},
             "attributes": {
@@ -27,12 +28,11 @@
             },
             "wlst_attributes_path": "WP001",
             "wlst_paths": {
-                "WP001": "/Server${:s}/%SERVER%/CoherenceMemberConfig/${NO_NAME_0:%SERVER%}"
+                "WP001": "/Server${:s}/%SERVER%/CoherenceMemberConfig/%COHERENCEMEMBERCONFIG%"
             }
         },
         "COM": {
             "wlst_type": "COM",
-            "child_folders_type": "single_unpredictable",
             "default_name_value": "${NO_NAME_0:%SERVER%}",
             "folders": {},
             "attributes": {
@@ -46,7 +46,7 @@
             },
             "wlst_attributes_path": "WP001",
             "wlst_paths": {
-                "WP001": "/Server${:s}/%SERVER%/COM/%SERVER_COM%"
+                "WP001": "/Server${:s}/%SERVER%/COM/%COM%"
             }
         },
         "ConfigurationProperty" : {
@@ -69,6 +69,7 @@
         },
         "DataSource": {
             "wlst_type": "DataSource",
+            "default_name_value": "${NO_NAME_0:%SERVER%}",
             "folders": {},
             "attributes": {
                 "DefaultDatasource": [ {"version": "[12.2.1,)",   "wlst_mode": "both",    "wlst_name": "DefaultDatasource", "wlst_path": "WP001", "value": {"default": "None"                }, "wlst_type": "string",          "restart_required": "true" } ],
@@ -81,13 +82,12 @@
             },
             "wlst_attributes_path": "WP001",
             "wlst_paths": {
-                "WP001": "/Server${:s}/%SERVER%/DataSource/${NO_NAME_0:%SERVER%}",
-                "WP002": "/Server${:s}/%SERVER%/DataSource/${NO_NAME_0:%SERVER%}/Targets"
+                "WP001": "/Server${:s}/%SERVER%/DataSource/%DATASOURCE%",
+                "WP002": "/Server${:s}/%SERVER%/DataSource/%DATASOURCE%/Targets"
             }
         },
         "DefaultFileStore": {
             "wlst_type": "DefaultFileStore",
-            "child_folders_type": "single_unpredictable",
             "default_name_value": "${NO_NAME_0:%SERVER%}",
             "folders": {},
             "attributes": {
@@ -106,7 +106,7 @@
             },
             "wlst_attributes_path": "WP001",
             "wlst_paths": {
-                "WP001": "/Server${:s}/%SERVER%/DefaultFileStore/%SERVER_DEFAULTFILESTORE%"
+                "WP001": "/Server${:s}/%SERVER%/DefaultFileStore/%DEFAULTFILESTORE%"
             }
         },
         "ExecuteQueue": {
@@ -131,6 +131,7 @@
         },
         "FederationServices" : {
             "wlst_type" : "FederationServices",
+            "default_name_value": "${NO_NAME_0:%SERVER%}",
             "version" : "[12.2.1,)",
             "folders" : {},
             "attributes" : {
@@ -163,12 +164,11 @@
             },
             "wlst_attributes_path": "WP001",
             "wlst_paths": {
-                "WP001": "/Server${:s}/%SERVER%/FederationServices/${NO_NAME_0:%SERVER%}"
+                "WP001": "/Server${:s}/%SERVER%/FederationServices/%FEDERATIONSERVICES%"
             }
         },
         "IIOP": {
             "wlst_type": "IIOP",
-            "child_folders_type": "single_unpredictable",
             "default_name_value": "${NO_NAME_0:%SERVER%}",
             "folders": {},
             "attributes": {
@@ -191,12 +191,11 @@
             },
             "wlst_attributes_path": "WP001",
             "wlst_paths": {
-                "WP001": "/Server${:s}/%SERVER%/IIOP/%SERVE_IIOP%"
+                "WP001": "/Server${:s}/%SERVER%/IIOP/%IIOP%"
             }
         },
         "JTAMigratableTarget": {
             "wlst_type": "JTAMigratableTarget",
-            "child_folders_type": "single_unpredictable",
             "default_name_value": "%SERVER%",
             "folders": {},
             "attributes": {
@@ -229,7 +228,6 @@
         },
         "Log": {
             "wlst_type": "Log",
-            "child_folders_type": "single_unpredictable",
             "default_name_value": "%SERVER%",
             "folders": {},
             "attributes": {
@@ -278,7 +276,7 @@
             },
             "wlst_attributes_path": "WP001",
             "wlst_paths": {
-                "WP001": "/Server${:s}/%SERVER%/Log/%SERVER_LOG%"
+                "WP001": "/Server${:s}/%SERVER%/Log/%LOG%"
             }
         },
         "NetworkAccessPoint": {
@@ -353,9 +351,11 @@
         },
         "OverloadProtection": {
             "wlst_type": "OverloadProtection",
+            "default_name_value": "${NO_NAME_0:%SERVER%}",
             "folders": {
                 "ServerFailureTrigger": {
                     "wlst_type": "ServerFailureTrigger",
+                    "default_name_value": "${NO_NAME_0:%SERVER%}",
                     "folders": {},
                     "attributes": {
                         "MaxStuckThreadTime": [ {"version": "[10,)",           "wlst_mode": "both",     "wlst_name": "MaxStuckThreadTime", "wlst_path": "WP001", "value": {"default": 600    }, "wlst_type": "integer"} ],
@@ -364,7 +364,7 @@
                     },
                     "wlst_attributes_path": "WP001",
                     "wlst_paths": {
-                        "WP001": "/Server${:s}/%SERVER%/OverloadProtection/${NO_NAME_0:%SERVER%}/ServerFailureTrigger/${NO_NAME_0:%SERVER%}"
+                        "WP001": "/Server${:s}/%SERVER%/OverloadProtection/%OVERLOADPROTECTION%/ServerFailureTrigger/%SERVERFAILURETRIGGER%"
                     }
                 }
             },
@@ -379,12 +379,11 @@
             },
             "wlst_attributes_path": "WP001",
             "wlst_paths": {
-                "WP001": "/Server${:s}/%SERVER%/OverloadProtection/${NO_NAME_0:%SERVER%}"
+                "WP001": "/Server${:s}/%SERVER%/OverloadProtection/%OVERLOADPROTECTION%"
             }
         },
         "ServerDebug": {
             "wlst_type": "ServerDebug",
-            "child_folders_type": "single_unpredictable",
             "default_name_value": "${NO_NAME_0:%SERVER%}",
             "folders": {},
             "attributes": {
@@ -883,11 +882,12 @@
             },
             "wlst_attributes_path": "WP001",
             "wlst_paths": {
-                "WP001": "/Server${:s}/%SERVER%/ServerDebug/%SERVER_DEBUG%"
+                "WP001": "/Server${:s}/%SERVER%/ServerDebug/%SERVERDEBUG%"
             }
         },
         "ServerDiagnosticConfig": {
             "wlst_type": "ServerDiagnosticConfig",
+            "default_name_value": "${NO_NAME_0:%SERVER%}",
             "folders": {},
             "attributes": {
                 "DataRetirementEnabled":                 [ {"version": "[10,)"       ,  "wlst_mode": "both",    "wlst_name": "DataRetirementEnabled",                "wlst_path": "WP001", "value": {"default": "true"                  }, "wlst_type": "boolean"} ],
@@ -925,12 +925,11 @@
             },
             "wlst_attributes_path": "WP001",
             "wlst_paths": {
-                "WP001": "/Server${:s}/%SERVER%/ServerDiagnosticConfig/${NO_NAME_0:%SERVER%}"
+                "WP001": "/Server${:s}/%SERVER%/ServerDiagnosticConfig/%SERVERDIAGNOSTICCONFIG%"
             }
         },
         "ServerStart": {
             "wlst_type": "ServerStart",
-            "child_folders_type": "single_unpredictable",
             "default_name_value": "${NO_NAME_0:%SERVER%}",
             "folders": {},
             "attributes": {
@@ -951,12 +950,13 @@
             },
             "wlst_attributes_path": "WP001",
             "wlst_paths": {
-                "WP001": "/Server${:s}/%SERVER%/ServerStart/%SERVER_START%"
+                "WP001": "/Server${:s}/%SERVER%/ServerStart/%SERVERSTART%"
             }
         },
         "SingleSignOnServices" : {
             "wlst_type" : "SingleSignOnServices",
             "version" : "[12.2.1,)",
+            "default_name_value": "${NO_NAME_0:%SERVER%}",
             "folders" : {},
             "attributes" : {
                 "AllowedTargetHost":                                     [ {"version": "[12.2.1.4,)",  "wlst_mode": "both", "wlst_name": "AllowedTargetHost${:s}",                              "wlst_path": "WP001", "value": {"default": "None"             }, "wlst_type": "${list:jarray}", "wlst_read_type": "delimited_string", "preferred_model_type": "list", "get_method": "LSA" } ],
@@ -1013,12 +1013,11 @@
                 "WantTransportLayerSecurityClientAuthentication":        [ {"version": "[12.2.1,)",    "wlst_mode": "both", "wlst_name": "WantTransportLayerSecurityClientAuthentication",      "wlst_path": "WP001", "value": {"default": "false"            }, "wlst_type": "boolean"         } ]            },
             "wlst_attributes_path": "WP001",
             "wlst_paths": {
-                "WP001": "/Server${:s}/%SERVER%/SingleSignOnServices/${NO_NAME_0:%SERVER%}"
+                "WP001": "/Server${:s}/%SERVER%/SingleSignOnServices/%SINGLESIGNONSERVICES%"
             }
         },
         "SSL": {
             "wlst_type": "SSL",
-            "child_folders_type": "single_unpredictable",
             "default_name_value": "${NO_NAME_0:%SERVER%}",
             "short_name": "SSL",
             "folders": {},
@@ -1079,11 +1078,12 @@
             },
             "wlst_attributes_path": "WP001",
             "wlst_paths": {
-                "WP001": "/Server${:s}/%SERVER%/SSL/%SERVER_SSL%"
+                "WP001": "/Server${:s}/%SERVER%/SSL/%SSL%"
             }
         },
         "TransactionLogJDBCStore": {
             "wlst_type": "TransactionLogJDBCStore",
+            "default_name_value": "${NO_NAME_0:%SERVER%}",
             "folders": {},
             "attributes": {
                 "ConnectionCachingPolicy":             [ {"version": "[12.2.1.1,)", "wlst_mode": "both",    "wlst_name": "ConnectionCachingPolicy",             "wlst_path": "WP001", "value": {"default": "${None:DEFAULT}"      }, "wlst_type": "string",          "restart_required": "true" } ],
@@ -1126,18 +1126,16 @@
             },
             "wlst_attributes_path": "WP001",
             "wlst_paths": {
-                "WP001": "/Server${:s}/%SERVER%/TransactionLogJDBCStore/${NO_NAME_0:%SERVER%}",
-                "WP002": "/Server${:s}/%SERVER%/TransactionLogJDBCStore/${NO_NAME_0:%SERVER%}/Targets"
+                "WP001": "/Server${:s}/%SERVER%/TransactionLogJDBCStore/%TRANSACTIONLOGJDBCSTORE%",
+                "WP002": "/Server${:s}/%SERVER%/TransactionLogJDBCStore/%TRANSACTIONLOGJDBCSTORE%/Targets"
             }
         },
         "WebServer": {
             "wlst_type": "WebServer",
-            "child_folders_type": "single_unpredictable",
             "default_name_value": "${NO_NAME_0:%SERVER%}",
             "folders": {
                 "WebServerLog": {
                     "wlst_type": "WebServerLog",
-                    "child_folders_type": "single_unpredictable",
                     "default_name_value": "%SERVER%",
                     "folders": {},
                     "attributes": {
@@ -1166,7 +1164,7 @@
                     },
                     "wlst_attributes_path": "WP001",
                     "wlst_paths": {
-                        "WP001": "/Server${:s}/%SERVER%/WebServer/%SERVER_WEBSERVER%/WebServerLog/%WEBSERVERLOG%"
+                        "WP001": "/Server${:s}/%SERVER%/WebServer/%WEBSERVER%/WebServerLog/%WEBSERVERLOG%"
                     }
                 }
             },
@@ -1205,17 +1203,17 @@
             },
             "wlst_attributes_path": "WP001",
             "wlst_paths": {
-                "WP001": "/Server${:s}/%SERVER%/WebServer/%SERVER_WEBSERVER%",
-                "WP002": "/Server${:s}/%SERVER%/WebServer/%SERVER_WEBSERVER%/Targets"
+                "WP001": "/Server${:s}/%SERVER%/WebServer/%WEBSERVER%",
+                "WP002": "/Server${:s}/%SERVER%/WebServer/%WEBSERVER%/Targets"
             }
         },
         "WebService": {
             "wlst_type": "WebService",
-            "child_folders_type": "single_unpredictable",
             "default_name_value": "${NO_NAME_0:%SERVER%}",
             "folders": {
                 "WebServiceReliability": {
                     "wlst_type": "WebServiceReliability",
+                    "default_name_value": "${NO_NAME_0:%SERVER%}",
                     "folders": {},
                     "attributes": {
                         "AcknowledgementInterval":          [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "AcknowledgementInterval",          "wlst_path": "WP001", "value": {"default": "P0DT0.2S"}, "wlst_type": "string"   } ],
@@ -1229,11 +1227,12 @@
                     },
                     "wlst_attributes_path": "WP001",
                     "wlst_paths": {
-                        "WP001": "/Server${:s}/%SERVER%/WebService/%SERVER_WEBSERVICE%/WebServiceReliability/${NO_NAME_0:%SERVER%}"
+                        "WP001": "/Server${:s}/%SERVER%/WebService/%WEBSERVICE%/WebServiceReliability/%WEBSERVICERELIABILITY%"
                     }
                 },
                 "WebServicePersistence": {
                     "wlst_type": "WebServicePersistence",
+                    "default_name_value": "${NO_NAME_0:%SERVER%}",
                     "folders": {
                         "WebServiceLogicalStore": {
                             "wlst_type": "WebServiceLogicalStore${:s}",
@@ -1250,7 +1249,7 @@
                             },
                             "wlst_attributes_path": "WP001",
                             "wlst_paths": {
-                                "WP001": "/Server${:s}/%SERVER%/WebService/%SERVER_WEBSERVICE%/WebServicePersistence/${NO_NAME_0:%SERVER%}/WebServiceLogicalStore${:s}/%STORE%"
+                                "WP001": "/Server${:s}/%SERVER%/WebService/%WEBSERVICE%/WebServicePersistence/%WEBSERVICEPERSISTENCE%/WebServiceLogicalStore${:s}/%STORE%"
                             }
                         },
                         "WebServicePhysicalStore": {
@@ -1266,7 +1265,7 @@
                             },
                             "wlst_attributes_path": "WP001",
                             "wlst_paths": {
-                                "WP001": "/Server${:s}/%SERVER%/WebService/%SERVER_WEBSERVICE%/WebServicePersistence/${NO_NAME_0:%SERVER%}/WebServicePhysicalStore${:s}/%STORE%"
+                                "WP001": "/Server${:s}/%SERVER%/WebService/%WEBSERVICE%/WebServicePersistence/%WEBSERVICEPERSISTENCE%/WebServicePhysicalStore${:s}/%STORE%"
                             }
                         }
                     },
@@ -1276,14 +1275,16 @@
                     },
                     "wlst_attributes_path": "WP001",
                     "wlst_paths": {
-                        "WP001": "/Server${:s}/%SERVER%/WebService/%SERVER_WEBSERVICE%/WebServicePersistence/${NO_NAME_0:%SERVER%}"
+                        "WP001": "/Server${:s}/%SERVER%/WebService/%WEBSERVICE%/WebServicePersistence/%WEBSERVICEPERSISTENCE%"
                     }
                 },
                 "WebServiceBuffering": {
                     "wlst_type": "WebServiceBuffering",
+                    "default_name_value": "${NO_NAME_0:%SERVER%}",
                     "folders": {
                         "WebServiceRequestBufferingQueue": {
                             "wlst_type": "WebServiceRequestBufferingQueue",
+                            "default_name_value": "${NO_NAME_0:%SERVER%}",
                             "folders": {},
                             "attributes": {
                                 "ConnectionFactoryJndiName": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "ConnectionFactoryJndiName", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string" } ],
@@ -1293,11 +1294,12 @@
                             },
                             "wlst_attributes_path": "WP001",
                             "wlst_paths": {
-                                "WP001": "/Server${:s}/%SERVER%/WebService/%SERVER_WEBSERVICE%/WebServiceBuffering/${NO_NAME_0:%SERVER%}/WebServiceRequestBufferingQueue/${NO_NAME_0:%SERVER%}"
+                                "WP001": "/Server${:s}/%SERVER%/WebService/%WEBSERVICE%/WebServiceBuffering/%WEBSERVICEBUFFERING%/WebServiceRequestBufferingQueue/%WEBSERVICEREQUESTBUFFERINGQUEUE%"
                             }
                         },
                         "WebServiceResponseBufferingQueue": {
                             "wlst_type": "WebServiceResponseBufferingQueue",
+                            "default_name_value": "${NO_NAME_0:%SERVER%}",
                             "folders": {},
                             "attributes": {
                                 "ConnectionFactoryJndiName": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "ConnectionFactoryJndiName", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string" } ],
@@ -1307,7 +1309,7 @@
                             },
                             "wlst_attributes_path": "WP001",
                             "wlst_paths": {
-                                "WP001": "/Server${:s}/%SERVER%/WebService/%SERVER_WEBSERVICE%/WebServiceBuffering/${NO_NAME_0:%SERVER%}/WebServiceResponseBufferingQueue/${NO_NAME_0:%SERVER%}"
+                                "WP001": "/Server${:s}/%SERVER%/WebService/%WEBSERVICE%/WebServiceBuffering/%WEBSERVICEBUFFERING%/WebServiceResponseBufferingQueue/%WEBSERVICERESPONSEBUFFERINGQUEUE%"
                             }
                         }
                     },
@@ -1318,12 +1320,11 @@
                     },
                     "wlst_attributes_path": "WP001",
                     "wlst_paths": {
-                        "WP001": "/Server${:s}/%SERVER%/WebService/%SERVER_WEBSERVICE%/WebServiceBuffering/${NO_NAME_0:%SERVER%}"
+                        "WP001": "/Server${:s}/%SERVER%/WebService/%WEBSERVICE%/WebServiceBuffering/%WEBSERVICEBUFFERING%"
                     }
                 },
                 "WebServiceResiliency": {
                     "wlst_type": "WebServiceResiliency",
-                    "child_folders_type": "single_unpredictable",
                     "default_name_value": "${NO_NAME_0:%SERVER%}",
                     "version": "[12.2.1.4,)",
                     "folders": {},
@@ -1334,7 +1335,7 @@
                     },
                     "wlst_attributes_path": "WP001",
                     "wlst_paths": {
-                        "WP001": "/Server${:s}/%SERVER%/WebService/%SERVER_WEBSERVICE%/WebServiceResiliency/%SERVER_WEBSERVICERESILIENCY%"
+                        "WP001": "/Server${:s}/%SERVER%/WebService/%WEBSERVICE%/WebServiceResiliency/%WEBSERVICERESILIENCY%"
                     }
                 }
             },
@@ -1348,7 +1349,7 @@
             },
             "wlst_attributes_path": "WP001",
             "wlst_paths": {
-                "WP001": "/Server${:s}/%SERVER%/WebService/%SERVER_WEBSERVICE%"
+                "WP001": "/Server${:s}/%SERVER%/WebService/%WEBSERVICE%"
             }
         }
     },
diff --git a/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/ServerTemplate.json b/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/ServerTemplate.json
index 5d89a1852..0ad89e29d 100644
--- a/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/ServerTemplate.json
+++ b/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/ServerTemplate.json
@@ -9,6 +9,7 @@
         "CoherenceMemberConfig": {
             "wlst_type": "CoherenceMemberConfig",
             "version": "[12.1.2,)",
+            "default_name_value": "${NO_NAME_0:%SERVERTEMPLATE%}",
             "folders": {},
             "attributes": {
                 "CoherenceWebFederatedStorageEnabled": [ {"version": "[12.2.1.1,)",         "wlst_mode": "both",   "wlst_name": "CoherenceWebFederatedStorageEnabled", "wlst_path": "WP001", "value": {"default": "false" }, "wlst_type": "boolean"  } ],
@@ -28,12 +29,11 @@
             },
             "wlst_attributes_path": "WP001",
             "wlst_paths": {
-                "WP001": "/ServerTemplate${:s}/%SERVERTEMPLATE%/CoherenceMemberConfig/${NO_NAME_0:%SERVERTEMPLATE%}"
+                "WP001": "/ServerTemplate${:s}/%SERVERTEMPLATE%/CoherenceMemberConfig/%COHERENCEMEMBERCONFIG%"
             }
         },
         "COM": {
             "wlst_type": "COM",
-            "child_folders_type": "single_unpredictable",
             "default_name_value": "${NO_NAME_0:%SERVERTEMPLATE%}",
             "version": "[12.1.2,)",
             "folders": {},
@@ -48,7 +48,7 @@
             },
             "wlst_attributes_path": "WP001",
             "wlst_paths": {
-                "WP001": "/ServerTemplate${:s}/%SERVERTEMPLATE%/COM/%SERVERTEMPLATE_COM%"
+                "WP001": "/ServerTemplate${:s}/%SERVERTEMPLATE%/COM/%COM%"
             }
         },
         "ConfigurationProperty" : {
@@ -72,6 +72,7 @@
         "DataSource": {
             "wlst_type": "DataSource",
             "version": "[12.1.2,)",
+            "default_name_value": "${NO_NAME_0:%SERVERTEMPLATE%}",
             "folders": {},
             "attributes": {
                 "DefaultDatasource": [ {"version": "[12.2.1,)", "wlst_mode": "both",    "wlst_name": "DefaultDatasource", "wlst_path": "WP001", "value": {"default": "None"          }, "wlst_type": "string",          "restart_required": "true" } ],
@@ -83,13 +84,12 @@
             },
             "wlst_attributes_path": "WP001",
             "wlst_paths": {
-                "WP001": "/ServerTemplate${:s}/%SERVERTEMPLATE%/DataSource/${NO_NAME_0:%SERVERTEMPLATE%}",
-                "WP003": "/ServerTemplate${:s}/%SERVERTEMPLATE%/DataSource/${NO_NAME_0:%SERVERTEMPLATE%}/Targets"
+                "WP001": "/ServerTemplate${:s}/%SERVERTEMPLATE%/DataSource/%DATASOURCE%",
+                "WP003": "/ServerTemplate${:s}/%SERVERTEMPLATE%/DataSource/%DATASOURCE%/Targets"
             }
         },
         "DefaultFileStore": {
             "wlst_type": "DefaultFileStore",
-            "child_folders_type": "single_unpredictable",
             "default_name_value": "${NO_NAME_0:%SERVERTEMPLATE%}",
             "version": "[12.1.2,)",
             "folders": {},
@@ -108,7 +108,7 @@
             },
             "wlst_attributes_path": "WP001",
             "wlst_paths": {
-                "WP001": "/ServerTemplate${:s}/%SERVERTEMPLATE%/DefaultFileStore/%SERVERTEMPLATE_DEFAULTFILESTORE%"
+                "WP001": "/ServerTemplate${:s}/%SERVERTEMPLATE%/DefaultFileStore/%DEFAULTFILESTORE%"
             }
         },
         "ExecuteQueue": {
@@ -135,6 +135,7 @@
         "FederationServices" : {
             "wlst_type" : "FederationServices",
             "version" : "[12.2.1,)",
+            "default_name_value": "${NO_NAME_0:%SERVERTEMPLATE%}",
             "folders" : {},
             "attributes" : {
                 "AcsRequiresSsl":                       [ {"version": "[12.2.1,)",         "wlst_mode": "both",    "wlst_name": "${Acs:ACS}Requires${Ssl:SSL}",                 "wlst_path": "WP001", "value": {"default": "true"  }, "wlst_type": "boolean"         } ],
@@ -166,12 +167,11 @@
             },
             "wlst_attributes_path": "WP001",
             "wlst_paths": {
-                "WP001": "/ServerTemplate${:s}/%SERVERTEMPLATE%/FederationServices/${NO_NAME_0:%SERVERTEMPLATE%}"
+                "WP001": "/ServerTemplate${:s}/%SERVERTEMPLATE%/FederationServices/%FEDERATIONSERVICES%"
             }
         },
         "IIOP": {
             "wlst_type": "IIOP",
-            "child_folders_type": "single_unpredictable",
             "default_name_value": "${NO_NAME_0:%SERVERTEMPLATE%}",
             "version": "[12.1.2,)",
             "folders": {},
@@ -195,13 +195,12 @@
             },
             "wlst_attributes_path": "WP001",
             "wlst_paths": {
-                "WP001": "/ServerTemplate${:s}/%SERVERTEMPLATE%/IIOP/%SERVERTEMPLATE_IIOP%"
+                "WP001": "/ServerTemplate${:s}/%SERVERTEMPLATE%/IIOP/%IIOP%"
             }
         },
         "JTAMigratableTarget": {
             "wlst_type": "JTAMigratableTarget",
             "version": "[12.1.2,)",
-            "child_folders_type": "single_unpredictable",
             "default_name_value": "${serverName}",
             "folders": {},
             "attributes": {
@@ -235,7 +234,6 @@
         },
         "Log": {
             "wlst_type": "Log",
-            "child_folders_type": "single_unpredictable",
             "default_name_value": "${serverName}",
             "version": "[12.1.2,)",
             "folders": {},
@@ -286,7 +284,7 @@
             },
             "wlst_attributes_path": "WP001",
             "wlst_paths": {
-                "WP001": "/ServerTemplate${:s}/%SERVERTEMPLATE%/Log/%SERVERTEMPLATE_LOG%"
+                "WP001": "/ServerTemplate${:s}/%SERVERTEMPLATE%/Log/%LOG%"
             }
         },
         "NetworkAccessPoint": {
@@ -363,10 +361,12 @@
         "OverloadProtection": {
             "wlst_type": "OverloadProtection",
             "version": "[12.1.2,)",
+            "default_name_value": "${NO_NAME_0:%SERVERTEMPLATE%}",
             "folders": {
                 "ServerFailureTrigger": {
                     "wlst_type": "ServerFailureTrigger",
                     "version": "[12.1.2,)",
+                    "default_name_value": "${NO_NAME_0:%SERVERTEMPLATE%}",
                     "folders": {},
                     "attributes": {
                         "MaxStuckThreadTime": [ {"version": "[12.1.2,)",       "wlst_mode": "both",    "wlst_name": "MaxStuckThreadTime", "wlst_path": "WP001", "value": {"default": 600    }, "wlst_type": "integer"} ],
@@ -375,7 +375,7 @@
                     },
                     "wlst_attributes_path": "WP001",
                     "wlst_paths": {
-                        "WP001": "/ServerTemplate${:s}/%SERVERTEMPLATE%/OverloadProtection/${NO_NAME_0:%SERVERTEMPLATE%}/ServerFailureTrigger/${NO_NAME_0:%SERVERTEMPLATE%}"
+                        "WP001": "/ServerTemplate${:s}/%SERVERTEMPLATE%/OverloadProtection/%OVERLOADPROTECTION%/ServerFailureTrigger/%SERVERFAILURETRIGGER%"
                     }
                 }
             },
@@ -390,12 +390,11 @@
             },
             "wlst_attributes_path": "WP001",
             "wlst_paths": {
-                "WP001": "/ServerTemplate${:s}/%SERVERTEMPLATE%/OverloadProtection/${NO_NAME_0:%SERVERTEMPLATE%}"
+                "WP001": "/ServerTemplate${:s}/%SERVERTEMPLATE%/OverloadProtection/%OVERLOADPROTECTION%"
             }
         },
         "ServerDebug": {
             "wlst_type": "ServerDebug",
-            "child_folders_type": "single_unpredictable",
             "default_name_value": "${NO_NAME_0:%SERVERTEMPLATE%}",
             "version": "[12.1.2,)",
             "folders": {},
@@ -893,11 +892,12 @@
             },
             "wlst_attributes_path": "WP001",
             "wlst_paths": {
-                "WP001": "/ServerTemplate${:s}/%SERVERTEMPLATE%/ServerDebug/%SERVERTEMPLATE_DEBUG%"
+                "WP001": "/ServerTemplate${:s}/%SERVERTEMPLATE%/ServerDebug/%SERVERDEBUG%"
             }
         },
         "ServerDiagnosticConfig": {
             "wlst_type": "ServerDiagnosticConfig",
+            "default_name_value": "${NO_NAME_0:%SERVERTEMPLATE%}",
             "version": "[12.1.2,)",
             "folders": {},
             "attributes": {
@@ -935,12 +935,11 @@
             },
             "wlst_attributes_path": "WP001",
             "wlst_paths": {
-                "WP001": "/ServerTemplate${:s}/%SERVERTEMPLATE%/ServerDiagnosticConfig/${NO_NAME_0:%SERVERTEMPLATE%}"
+                "WP001": "/ServerTemplate${:s}/%SERVERTEMPLATE%/ServerDiagnosticConfig/%SERVERDIAGNOSTICCONFIG%"
             }
         },
         "ServerStart": {
             "wlst_type": "ServerStart",
-            "child_folders_type": "single_unpredictable",
             "default_name_value": "${NO_NAME_0:%SERVERTEMPLATE%}",
             "version": "[12.1.2,)",
             "folders": {},
@@ -962,11 +961,12 @@
             },
             "wlst_attributes_path": "WP001",
             "wlst_paths": {
-                "WP001": "/ServerTemplate${:s}/%SERVERTEMPLATE%/ServerStart/%SERVERTEMPLATE_START%"
+                "WP001": "/ServerTemplate${:s}/%SERVERTEMPLATE%/ServerStart/%SERVERSTART%"
             }
         },
         "SingleSignOnServices" : {
             "wlst_type" : "SingleSignOnServices",
+            "default_name_value": "${NO_NAME_0:%SERVERTEMPLATE%}",
             "version" : "[12.2.1,)",
             "folders" : {},
             "attributes" : {
@@ -1024,12 +1024,11 @@
                 "WantTransportLayerSecurityClientAuthentication":        [ {"version": "[12.2.1,)",    "wlst_mode": "both", "wlst_name": "WantTransportLayerSecurityClientAuthentication",      "wlst_path": "WP001", "value": {"default": "false"            }, "wlst_type": "boolean"         } ]            },
             "wlst_attributes_path": "WP001",
             "wlst_paths": {
-                "WP001": "/ServerTemplate${:s}/%SERVERTEMPLATE%/SingleSignOnServices/${NO_NAME_0:%SERVERTEMPLATE%}"
+                "WP001": "/ServerTemplate${:s}/%SERVERTEMPLATE%/SingleSignOnServices/%SINGLESIGNONSERVICES%"
             }
         },
         "SSL": {
             "wlst_type": "SSL",
-            "child_folders_type": "single_unpredictable",
             "default_name_value": "${NO_NAME_0:%SERVERTEMPLATE%}",
             "version": "[12.1.2,)",
             "short_name": "SSL",
@@ -1088,12 +1087,13 @@
             },
             "wlst_attributes_path": "WP001",
             "wlst_paths": {
-                "WP001": "/ServerTemplate${:s}/%SERVERTEMPLATE%/SSL/%SERVERTEMPLATE_SSL%"
+                "WP001": "/ServerTemplate${:s}/%SERVERTEMPLATE%/SSL/%SSL%"
             }
         },
         "TransactionLogJDBCStore": {
             "wlst_type": "TransactionLogJDBCStore",
             "version": "[12.1.2,)",
+            "default_name_value": "${NO_NAME_0:%SERVERTEMPLATE%}",
             "folders": {},
             "attributes": {
                 "ConnectionCachingPolicy":              [ {"version": "[12.2.1.1,)", "wlst_mode": "both",    "wlst_name": "ConnectionCachingPolicy",            "wlst_path": "WP001", "value": {"default": "${None:DEFAULT}" },"wlst_type": "string","restart_required": "true" } ],
@@ -1136,20 +1136,18 @@
             },
             "wlst_attributes_path": "WP001",
             "wlst_paths": {
-                "WP001": "/ServerTemplate${:s}/%SERVERTEMPLATE%/TransactionLogJDBCStore/${NO_NAME_0:%SERVERTEMPLATE%}",
-                "WP002": "/ServerTemplate${:s}/%SERVERTEMPLATE%/TransactionLogJDBCStore/${NO_NAME_0:%SERVERTEMPLATE%}/Targets"
+                "WP001": "/ServerTemplate${:s}/%SERVERTEMPLATE%/TransactionLogJDBCStore/%TRANSACTIONLOGJDBCSTORE%",
+                "WP002": "/ServerTemplate${:s}/%SERVERTEMPLATE%/TransactionLogJDBCStore/%TRANSACTIONLOGJDBCSTORE%/Targets"
             }
         },
         "WebServer": {
             "wlst_type": "WebServer",
-            "child_folders_type": "single_unpredictable",
             "default_name_value": "${NO_NAME_0:%SERVERTEMPLATE%}",
             "version": "[12.1.2,)",
             "folders": {
                 "WebServerLog": {
                     "wlst_type": "WebServerLog",
-                    "child_folders_type": "single_unpredictable",
-                    "default_name_value": "%SERVERTEMPLATE_WEBSERVER%",
+                    "default_name_value": "%WEBSERVER%",
                     "version": "[12.1.2,)",
                     "folders": {},
                     "attributes": {
@@ -1178,7 +1176,7 @@
                     },
                     "wlst_attributes_path": "WP001",
                     "wlst_paths": {
-                        "WP001": "/ServerTemplate${:s}/%SERVERTEMPLATE%/WebServer/%SERVERTEMPLATE_WEBSERVER%/WebServerLog/%WEBSERVERLOG%"
+                        "WP001": "/ServerTemplate${:s}/%SERVERTEMPLATE%/WebServer/%WEBSERVER%/WebServerLog/%WEBSERVERLOG%"
                     }
                 }
             },
@@ -1217,19 +1215,19 @@
             },
             "wlst_attributes_path": "WP001",
             "wlst_paths": {
-                "WP001": "/ServerTemplate${:s}/%SERVERTEMPLATE%/WebServer/%SERVERTEMPLATE_WEBSERVER%",
-                "WP002": "/ServerTemplate${:s}/%SERVERTEMPLATE%/WebServer/%SERVERTEMPLATE_WEBSERVER%/Targets"
+                "WP001": "/ServerTemplate${:s}/%SERVERTEMPLATE%/WebServer/%WEBSERVER%",
+                "WP002": "/ServerTemplate${:s}/%SERVERTEMPLATE%/WebServer/%WEBSERVER%/Targets"
             }
         },
         "WebService": {
             "wlst_type": "WebService",
-            "child_folders_type": "single_unpredictable",
             "default_name_value": "${NO_NAME_0:%SERVERTEMPLATE%}",
             "version": "[12.1.2,)",
             "folders": {
                 "WebServiceReliability": {
                     "wlst_type": "WebServiceReliability",
                     "version": "[12.1.2,)",
+                    "default_name_value": "${NO_NAME_0:%SERVERTEMPLATE%}",
                     "folders": {},
                     "attributes": {
                         "AcknowledgementInterval":          [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "AcknowledgementInterval",          "wlst_path": "WP001", "value": {"default": "P0DT0.2S"}, "wlst_type": "string"   } ],
@@ -1243,12 +1241,13 @@
                     },
                     "wlst_attributes_path": "WP001",
                     "wlst_paths": {
-                        "WP001": "/ServerTemplate${:s}/%SERVERTEMPLATE%/WebService/%SERVERTEMPLATE_WEBSERVICE%/WebServiceReliability/${NO_NAME_0:%SERVERTEMPLATE%}"
+                        "WP001": "/ServerTemplate${:s}/%SERVERTEMPLATE%/WebService/%WEBSERVICE%/WebServiceReliability/%WEBSERVICERELIABILITY%"
                     }
                 },
                 "WebServicePersistence": {
                     "wlst_type": "WebServicePersistence",
                     "version": "[12.1.2,)",
+                    "default_name_value": "${NO_NAME_0:%SERVERTEMPLATE%}",
                     "folders": {
                         "WebServiceLogicalStore": {
                             "wlst_type": "WebServiceLogicalStore${:s}",
@@ -1266,7 +1265,7 @@
                             },
                             "wlst_attributes_path": "WP001",
                             "wlst_paths": {
-                                "WP001": "/ServerTemplate${:s}/%SERVERTEMPLATE%/WebService/%SERVERTEMPLATE_WEBSERVICE%/WebServicePersistence/${NO_NAME_0:%SERVERTEMPLATE%}/WebServiceLogicalStore${:s}/%STORE%"
+                                "WP001": "/ServerTemplate${:s}/%SERVERTEMPLATE%/WebService/%WEBSERVICE%/WebServicePersistence/%WEBSERVICEPERSISTENCE%/WebServiceLogicalStore${:s}/%STORE%"
                             }
                         },
                         "WebServicePhysicalStore": {
@@ -1283,7 +1282,7 @@
                             },
                             "wlst_attributes_path": "WP001",
                             "wlst_paths": {
-                                "WP001": "/ServerTemplate${:s}/%SERVERTEMPLATE%/WebService/%SERVERTEMPLATE_WEBSERVICE%/WebServicePersistence/${NO_NAME_0:%SERVERTEMPLATE%}/WebServicePhysicalStore${:s}/%STORE%"
+                                "WP001": "/ServerTemplate${:s}/%SERVERTEMPLATE%/WebService/%WEBSERVICE%/WebServicePersistence/%WEBSERVICEPERSISTENCE%/WebServicePhysicalStore${:s}/%STORE%"
                             }
                         }
                     },
@@ -1293,16 +1292,18 @@
                     },
                     "wlst_attributes_path": "WP001",
                     "wlst_paths": {
-                        "WP001": "/ServerTemplate${:s}/%SERVERTEMPLATE%/WebService/%SERVERTEMPLATE_WEBSERVICE%/WebServicePersistence/${NO_NAME_0:%SERVERTEMPLATE%}"
+                        "WP001": "/ServerTemplate${:s}/%SERVERTEMPLATE%/WebService/%WEBSERVICE%/WebServicePersistence/%WEBSERVICEPERSISTENCE%"
                     }
                 },
                 "WebServiceBuffering": {
                     "wlst_type": "WebServiceBuffering",
                     "version": "[12.1.2,)",
+                    "default_name_value": "${NO_NAME_0:%SERVERTEMPLATE%}",
                     "folders": {
                         "WebServiceRequestBufferingQueue": {
                             "wlst_type": "WebServiceRequestBufferingQueue",
                             "version": "[12.1.2,)",
+                            "default_name_value": "${NO_NAME_0:%SERVERTEMPLATE%}",
                             "folders": {},
                             "attributes": {
                                 "ConnectionFactoryJndiName": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "ConnectionFactoryJndiName", "wlst_path": "WP001", "value": {"default": "None" },  "wlst_type": "string" } ],
@@ -1312,12 +1313,13 @@
                             },
                             "wlst_attributes_path": "WP001",
                             "wlst_paths": {
-                                "WP001": "/ServerTemplate${:s}/%SERVERTEMPLATE%/WebService/%SERVERTEMPLATE_WEBSERVICE%/WebServiceBuffering/${NO_NAME_0:%SERVERTEMPLATE%}/WebServiceRequestBufferingQueue/${NO_NAME_0:%SERVERTEMPLATE%}"
+                                "WP001": "/ServerTemplate${:s}/%SERVERTEMPLATE%/WebService/%WEBSERVICE%/WebServiceBuffering/%WEBSERVICEBUFFERING%/WebServiceRequestBufferingQueue/%WEBSERVICEREQUESTBUFFERINGQUEUE%"
                             }
                         },
                         "WebServiceResponseBufferingQueue": {
                             "wlst_type": "WebServiceResponseBufferingQueue",
                             "version": "[12.1.2,)",
+                            "default_name_value": "${NO_NAME_0:%SERVERTEMPLATE%}",
                             "folders": {},
                             "attributes": {
                                 "ConnectionFactoryJndiName": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "ConnectionFactoryJndiName", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string" } ],
@@ -1327,7 +1329,7 @@
                             },
                             "wlst_attributes_path": "WP001",
                             "wlst_paths": {
-                                "WP001": "/ServerTemplate${:s}/%SERVERTEMPLATE%/WebService/%SERVERTEMPLATE_WEBSERVICE%/WebServiceBuffering/${NO_NAME_0:%SERVERTEMPLATE%}/WebServiceResponseBufferingQueue/${NO_NAME_0:%SERVERTEMPLATE%}"
+                                "WP001": "/ServerTemplate${:s}/%SERVERTEMPLATE%/WebService/%WEBSERVICE%/WebServiceBuffering/%WEBSERVICEBUFFERING%/WebServiceResponseBufferingQueue/%WEBSERVICERESPONSEBUFFERINGQUEUE%"
                             }
                         }
                     },
@@ -1338,12 +1340,11 @@
                     },
                     "wlst_attributes_path": "WP001",
                     "wlst_paths": {
-                        "WP001": "/ServerTemplate${:s}/%SERVERTEMPLATE%/WebService/%SERVERTEMPLATE_WEBSERVICE%/WebServiceBuffering/${NO_NAME_0:%SERVERTEMPLATE%}"
+                        "WP001": "/ServerTemplate${:s}/%SERVERTEMPLATE%/WebService/%WEBSERVICE%/WebServiceBuffering/%WEBSERVICEBUFFERING%"
                     }
                 },
                 "WebServiceResiliency": {
                     "wlst_type": "WebServiceResiliency",
-                    "child_folders_type": "single_unpredictable",
                     "default_name_value": "${NO_NAME_0:%SERVERTEMPLATE%}",
                     "version": "[12.2.1.4,)",
                     "folders": {},
@@ -1354,7 +1355,7 @@
                     },
                     "wlst_attributes_path": "WP001",
                     "wlst_paths": {
-                        "WP001": "/ServerTemplate${:s}/%SERVERTEMPLATE%/WebService/%SERVERTEMPLATE_WEBSERVICE%/WebServiceResiliency/%SERVERTEMPLATE_WEBSERVICERESILIENCY%"
+                        "WP001": "/ServerTemplate${:s}/%SERVERTEMPLATE%/WebService/%WEBSERVICE%/WebServiceResiliency/%WEBSERVICERESILIENCY%"
                     }
                 }
             },
@@ -1368,7 +1369,7 @@
             },
             "wlst_attributes_path": "WP001",
             "wlst_paths": {
-                "WP001": "/ServerTemplate${:s}/%SERVERTEMPLATE%/WebService/%SERVERTEMPLATE_WEBSERVICE%"
+                "WP001": "/ServerTemplate${:s}/%SERVERTEMPLATE%/WebService/%WEBSERVICE%"
             }
         }
     },
diff --git a/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/Spec.json b/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/Spec.json
index ac03b3971..497c9d7c7 100644
--- a/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/Spec.json
+++ b/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/Spec.json
@@ -39,7 +39,7 @@
             },
             "wlst_attributes_path": "WP001",
             "wlst_paths": {
-                "WP001": "/NO_ADMIN_FOLDER"
+                "WP001": "/NO_FOLDER"
             },
             "contains": [
                 "serverPod"
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 5fafb7ef3..4ab1f9cbd 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
@@ -6,7 +6,6 @@
     "folders": {
         "SystemComponentStart": {
             "wlst_type": "SystemComponentStart",
-            "child_folders_type": "single_unpredictable",
             "default_name_value": "${NO_NAME_0:%SYSTEMCOMPONENT%}",
             "folders": {},
             "attributes": {
diff --git a/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/UnixMachine.json b/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/UnixMachine.json
index ef538c7bd..13b09141b 100644
--- a/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/UnixMachine.json
+++ b/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/UnixMachine.json
@@ -7,7 +7,6 @@
     "folders": {
         "NodeManager" : {
             "wlst_type": "NodeManager",
-            "child_folders_type": "single_unpredictable",
             "default_name_value": "%MACHINE%",
             "folders" : {},
             "attributes": {
@@ -45,9 +44,7 @@
         "PostBindUIDEnabled": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "PostBindUIDEnabled", "wlst_path": "WP001", "value": {"default": "false"  }, "wlst_type": "boolean"          } ]
     },
     "wlst_attributes_path": "WP001",
-    "wlst_list_path": "WP002",
     "wlst_paths": {
-        "WP001": "/${Machine:Machines}/%MACHINE%",
-        "WP002": "/${UnixMachine:Machines}"
+        "WP001": "/${UnixMachine:Machines}/%MACHINE%"
     }
 }
diff --git a/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/VirtualHost.json b/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/VirtualHost.json
index 99aa187e6..e077ee39b 100644
--- a/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/VirtualHost.json
+++ b/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/VirtualHost.json
@@ -7,7 +7,6 @@
     "folders": {
         "WebServerLog": {
             "wlst_type": "WebServerLog",
-            "child_folders_type": "single_unpredictable",
             "default_name_value": "%VIRTUALHOST%",
             "folders": {},
             "attributes": {
diff --git a/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/VirtualTarget.json b/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/VirtualTarget.json
index e8e7bfe64..9db778a56 100644
--- a/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/VirtualTarget.json
+++ b/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/VirtualTarget.json
@@ -8,13 +8,11 @@
     "folders": {
         "WebServer": {
             "wlst_type": "WebServer",
-            "child_folders_type": "single_unpredictable",
             "default_name_value": "${NO_NAME_0:%VIRTUALTARGET%}",
             "version": "[12.2.1,)",
             "folders": {
                 "WebServerLog": {
                     "wlst_type": "WebServerLog",
-                    "child_folders_type": "single_unpredictable",
                     "default_name_value": "%VIRTUALTARGET%",
                     "version": "[12.2.1,)",
                     "folders": {},
diff --git a/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/WLDFSystemResource.json b/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/WLDFSystemResource.json
index 966f635f7..2cfbbe6be 100644
--- a/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/WLDFSystemResource.json
+++ b/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/WLDFSystemResource.json
@@ -1,5 +1,5 @@
 {
-    "copyright": "Copyright (c) 2017, 2019, Oracle Corporation and/or its affiliates.  All rights reserved.",
+    "copyright": "Copyright (c) 2017, 2020, Oracle Corporation and/or its affiliates.  All rights reserved.",
     "license": "Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl",
     "wlst_type": "WLDFSystemResource${:s}",
     "child_folders_type": "multiple",
@@ -7,10 +7,10 @@
     "folders": {
         "WLDFResource" : {
             "wlst_type" : "WLDFResource",
+            "default_name_value": "%WLDFSYSTEMRESOURCE%",
             "folders" : {
                 "Harvester": {
                     "wlst_type": "Harvester",
-                    "child_folders_type": "single_unpredictable",
                     "default_name_value": "${NO_NAME_0:%WLDFRESOURCE%}",
                     "folders": {
                         "HarvestedType": {
@@ -26,7 +26,7 @@
                             },
                             "wlst_attributes_path": "WP001",
                             "wlst_paths": {
-                                "WP001": "/WLDFSystemResource${:s}/%WLDFRESOURCE%/WLDFResource/%WLDFRESOURCE%/Harvester/%HARVESTER%/HarvestedType${:s}/%HARVESTEDTYPE%"
+                                "WP001": "/WLDFSystemResource${:s}/%WLDFSYSTEMRESOURCE%/WLDFResource/%WLDFRESOURCE%/Harvester/%HARVESTER%/HarvestedType${:s}/%HARVESTEDTYPE%"
                             }
                         }
                     },
@@ -36,12 +36,11 @@
                     },
                     "wlst_attributes_path": "WP001",
                     "wlst_paths": {
-                        "WP001": "/WLDFSystemResource${:s}/%WLDFRESOURCE%/WLDFResource/%WLDFRESOURCE%/Harvester/%HARVESTER%"
+                        "WP001": "/WLDFSystemResource${:s}/%WLDFSYSTEMRESOURCE%/WLDFResource/%WLDFRESOURCE%/Harvester/%HARVESTER%"
                     }
                 },
                 "Instrumentation": {
                     "wlst_type": "Instrumentation",
-                    "child_folders_type": "single_unpredictable",
                     "default_name_value": "${NO_NAME_0:%WLDFRESOURCE%}",
                     "folders": {
                         "WLDFInstrumentationMonitor": {
@@ -62,7 +61,7 @@
                             },
                             "wlst_attributes_path": "WP001",
                             "wlst_paths": {
-                                "WP001": "/WLDFSystemResource${:s}/%WLDFRESOURCE%/WLDFResource/%WLDFRESOURCE%/Instrumentation/%INSTRUMENTATION%/WLDFInstrumentationMonitor${:s}/%INSTRUMENTATIONMONITOR%"
+                                "WP001": "/WLDFSystemResource${:s}/%WLDFSYSTEMRESOURCE%/WLDFResource/%WLDFRESOURCE%/Instrumentation/%INSTRUMENTATION%/WLDFInstrumentationMonitor${:s}/%INSTRUMENTATIONMONITOR%"
                             }
                         }
                     },
@@ -73,12 +72,11 @@
                     },
                     "wlst_attributes_path": "WP001",
                     "wlst_paths": {
-                        "WP001": "/WLDFSystemResource${:s}/%WLDFRESOURCE%/WLDFResource/%WLDFRESOURCE%/Instrumentation/%INSTRUMENTATION%"
+                        "WP001": "/WLDFSystemResource${:s}/%WLDFSYSTEMRESOURCE%/WLDFResource/%WLDFRESOURCE%/Instrumentation/%INSTRUMENTATION%"
                     }
                 },
                 "WatchNotification": {
                     "wlst_type": "WatchNotification",
-                    "child_folders_type": "single_unpredictable",
                     "default_name_value": "${NO_NAME_0:%WLDFRESOURCE%}",
                     "folders": {
                         "HeapDumpAction": {
@@ -93,7 +91,7 @@
                             },
                             "wlst_attributes_path": "WP001",
                             "wlst_paths": {
-                                "WP001": "/WLDFSystemResource${:s}/%WLDFRESOURCE%/WLDFResource/%WLDFRESOURCE%/WatchNotification/%WATCHNOTIFICATION%/HeapDumpAction${:s}/%HEAPDUMPACTION%"
+                                "WP001": "/WLDFSystemResource${:s}/%WLDFSYSTEMRESOURCE%/WLDFResource/%WLDFRESOURCE%/WatchNotification/%WATCHNOTIFICATION%/HeapDumpAction${:s}/%HEAPDUMPACTION%"
                             }
                         },
                         "ImageNotification": {
@@ -108,7 +106,7 @@
                             },
                             "wlst_attributes_path": "WP001",
                             "wlst_paths": {
-                                "WP001": "/WLDFSystemResource${:s}/%WLDFRESOURCE%/WLDFResource/%WLDFRESOURCE%/WatchNotification/%WATCHNOTIFICATION%/ImageNotification${:s}/%IMAGENOTIFICATION%"
+                                "WP001": "/WLDFSystemResource${:s}/%WLDFSYSTEMRESOURCE%/WLDFResource/%WLDFRESOURCE%/WatchNotification/%WATCHNOTIFICATION%/ImageNotification${:s}/%IMAGENOTIFICATION%"
                             }
                         },
                         "JMSNotification": {
@@ -123,7 +121,7 @@
                             },
                             "wlst_attributes_path": "WP001",
                             "wlst_paths": {
-                                "WP001": "/WLDFSystemResource${:s}/%WLDFRESOURCE%/WLDFResource/%WLDFRESOURCE%/WatchNotification/%WATCHNOTIFICATION%/JMSNotification${:s}/%JMSNOTIFICATION%"
+                                "WP001": "/WLDFSystemResource${:s}/%WLDFSYSTEMRESOURCE%/WLDFResource/%WLDFRESOURCE%/WatchNotification/%WATCHNOTIFICATION%/JMSNotification${:s}/%JMSNOTIFICATION%"
                             }
                         },
                         "JMXNotification": {
@@ -137,7 +135,7 @@
                             },
                             "wlst_attributes_path": "WP001",
                             "wlst_paths": {
-                                "WP001": "/WLDFSystemResource${:s}/%WLDFRESOURCE%/WLDFResource/%WLDFRESOURCE%/WatchNotification/%WATCHNOTIFICATION%/JMXNotification${:s}/%JMXNOTIFICATION%"
+                                "WP001": "/WLDFSystemResource${:s}/%WLDFSYSTEMRESOURCE%/WLDFResource/%WLDFRESOURCE%/WatchNotification/%WATCHNOTIFICATION%/JMXNotification${:s}/%JMXNOTIFICATION%"
                             }
                         },
                         "LogAction": {
@@ -154,7 +152,7 @@
                             },
                             "wlst_attributes_path": "WP001",
                             "wlst_paths": {
-                                "WP001": "/WLDFSystemResource${:s}/%WLDFRESOURCE%/WLDFResource/%WLDFRESOURCE%/WatchNotification/%WATCHNOTIFICATION%/LogAction${:s}/%LOGACTION%"
+                                "WP001": "/WLDFSystemResource${:s}/%WLDFSYSTEMRESOURCE%/WLDFResource/%WLDFRESOURCE%/WatchNotification/%WATCHNOTIFICATION%/LogAction${:s}/%LOGACTION%"
                             }
                         },
                         "RestNotification": {
@@ -175,7 +173,7 @@
                             },
                             "wlst_attributes_path": "WP001",
                             "wlst_paths": {
-                                "WP001": "/WLDFSystemResource${:s}/%WLDFRESOURCE%/WLDFResource/%WLDFRESOURCE%/WatchNotification/%WATCHNOTIFICATION%/${RestNotification:RESTNotifications}/%RESTNOTIFICATION%"
+                                "WP001": "/WLDFSystemResource${:s}/%WLDFSYSTEMRESOURCE%/WLDFResource/%WLDFRESOURCE%/WatchNotification/%WATCHNOTIFICATION%/${RestNotification:RESTNotifications}/%RESTNOTIFICATION%"
                             }
                         },
                         "ScaleDownAction": {
@@ -191,7 +189,7 @@
                             },
                             "wlst_attributes_path": "WP001",
                             "wlst_paths": {
-                                "WP001": "/WLDFSystemResource${:s}/%WLDFRESOURCE%/WLDFResource/%WLDFRESOURCE%/WatchNotification/%WATCHNOTIFICATION%/ScaleDownAction${:s}/%SCALEDOWNACTION%"
+                                "WP001": "/WLDFSystemResource${:s}/%WLDFSYSTEMRESOURCE%/WLDFResource/%WLDFRESOURCE%/WatchNotification/%WATCHNOTIFICATION%/ScaleDownAction${:s}/%SCALEDOWNACTION%"
                             }
                         },
                         "ScaleUpAction": {
@@ -207,7 +205,7 @@
                             },
                             "wlst_attributes_path": "WP001",
                             "wlst_paths": {
-                                "WP001": "/WLDFSystemResource${:s}/%WLDFRESOURCE%/WLDFResource/%WLDFRESOURCE%/WatchNotification/%WATCHNOTIFICATION%/ScaleUpAction${:s}/%SCALEUPACTION%"
+                                "WP001": "/WLDFSystemResource${:s}/%WLDFSYSTEMRESOURCE%/WLDFResource/%WLDFRESOURCE%/WatchNotification/%WATCHNOTIFICATION%/ScaleUpAction${:s}/%SCALEUPACTION%"
                             }
                         },
                         "ScriptAction": {
@@ -225,7 +223,7 @@
                             },
                             "wlst_attributes_path": "WP001",
                             "wlst_paths": {
-                                "WP001": "/WLDFSystemResource${:s}/%WLDFRESOURCE%/WLDFResource/%WLDFRESOURCE%/WatchNotification/%WATCHNOTIFICATION%/ScriptAction${:s}/%SCRIPTACTION%"
+                                "WP001": "/WLDFSystemResource${:s}/%WLDFSYSTEMRESOURCE%/WLDFResource/%WLDFRESOURCE%/WatchNotification/%WATCHNOTIFICATION%/ScriptAction${:s}/%SCRIPTACTION%"
                             }
                         },
                         "SMTPNotification": {
@@ -242,7 +240,7 @@
                             },
                             "wlst_attributes_path": "WP001",
                             "wlst_paths": {
-                                "WP001": "/WLDFSystemResource${:s}/%WLDFRESOURCE%/WLDFResource/%WLDFRESOURCE%/WatchNotification/%WATCHNOTIFICATION%/SMTPNotification${:s}/%SMTPNOTIFICATION%"
+                                "WP001": "/WLDFSystemResource${:s}/%WLDFSYSTEMRESOURCE%/WLDFResource/%WLDFRESOURCE%/WatchNotification/%WATCHNOTIFICATION%/SMTPNotification${:s}/%SMTPNOTIFICATION%"
                             }
                         },
                         "SNMPNotification": {
@@ -255,7 +253,7 @@
                             },
                             "wlst_attributes_path": "WP001",
                             "wlst_paths": {
-                                "WP001": "/WLDFSystemResource${:s}/%WLDFRESOURCE%/WLDFResource/%WLDFRESOURCE%/WatchNotification/%WATCHNOTIFICATION%/SNMPNotification${:s}/%SNMPNOTIFICATION%"
+                                "WP001": "/WLDFSystemResource${:s}/%WLDFSYSTEMRESOURCE%/WLDFResource/%WLDFRESOURCE%/WatchNotification/%WATCHNOTIFICATION%/SNMPNotification${:s}/%SNMPNOTIFICATION%"
                             }
                         },
                         "ThreadDumpAction": {
@@ -271,7 +269,7 @@
                             },
                             "wlst_attributes_path": "WP001",
                             "wlst_paths": {
-                                "WP001": "/WLDFSystemResource${:s}/%WLDFRESOURCE%/WLDFResource/%WLDFRESOURCE%/WatchNotification/%WATCHNOTIFICATION%/ThreadDumpAction${:s}/%THREADDUMPACTION%"
+                                "WP001": "/WLDFSystemResource${:s}/%WLDFSYSTEMRESOURCE%/WLDFResource/%WLDFRESOURCE%/WatchNotification/%WATCHNOTIFICATION%/ThreadDumpAction${:s}/%THREADDUMPACTION%"
                             }
                         },
                         "Watch": {
@@ -280,7 +278,6 @@
                             "folders": {
                                 "Schedule": {
                                     "wlst_type": "Schedule",
-                                    "child_folders_type": "single_unpredictable",
                                     "default_name_value": "${NO_NAME_0:%WATCH%}",
                                     "version": "[12.2.1,)",
                                     "folders": {},
@@ -297,7 +294,7 @@
                                     },
                                     "wlst_attributes_path": "WP001",
                                     "wlst_paths": {
-                                        "WP001": "/WLDFSystemResource${:s}/%WLDFRESOURCE%/WLDFResource/%WLDFRESOURCE%/WatchNotification/%WATCHNOTIFICATION%/Watch${:es}/%WATCH%/Schedule/%SCHEDULE%"
+                                        "WP001": "/WLDFSystemResource${:s}/%WLDFSYSTEMRESOURCE%/WLDFResource/%WLDFRESOURCE%/WatchNotification/%WATCHNOTIFICATION%/Watch${:es}/%WATCH%/Schedule/%SCHEDULE%"
                                     }
                                 }
                             },
@@ -314,7 +311,7 @@
                             },
                             "wlst_attributes_path": "WP001",
                             "wlst_paths": {
-                                "WP001": "/WLDFSystemResource${:s}/%WLDFRESOURCE%/WLDFResource/%WLDFRESOURCE%/WatchNotification/%WATCHNOTIFICATION%/Watch${:es}/%WATCH%"
+                                "WP001": "/WLDFSystemResource${:s}/%WLDFSYSTEMRESOURCE%/WLDFResource/%WLDFRESOURCE%/WatchNotification/%WATCHNOTIFICATION%/Watch${:es}/%WATCH%"
                             }
                         }
                     },
@@ -325,14 +322,14 @@
                     },
                     "wlst_attributes_path": "WP001",
                     "wlst_paths": {
-                        "WP001": "/WLDFSystemResource${:s}/%WLDFRESOURCE%/WLDFResource/%WLDFRESOURCE%/WatchNotification/%WATCHNOTIFICATION%"
+                        "WP001": "/WLDFSystemResource${:s}/%WLDFSYSTEMRESOURCE%/WLDFResource/%WLDFRESOURCE%/WatchNotification/%WATCHNOTIFICATION%"
                     }
                 }
             },
             "attributes": {},
             "wlst_attributes_path": "WP001",
             "wlst_paths": {
-                "WP001": "/WLDFSystemResource${:s}/%WLDFRESOURCE%/WLDFResource/%WLDFRESOURCE%"
+                "WP001": "/WLDFSystemResource${:s}/%WLDFSYSTEMRESOURCE%/WLDFResource/%WLDFRESOURCE%"
             }
         },
         "SubDeployment" : {
@@ -349,8 +346,8 @@
             },
             "wlst_attributes_path": "WP001",
             "wlst_paths": {
-                "WP001": "/WLDFSystemResource${:s}/%WLDFRESOURCE%/SubDeployment${:s}/%SUBDEPLOYMENT%",
-                "WP002": "/WLDFSystemResource${:s}/%WLDFRESOURCE%/SubDeployment${:s}/%SUBDEPLOYMENT%/Targets"
+                "WP001": "/WLDFSystemResource${:s}/%WLDFSYSTEMRESOURCE%/SubDeployment${:s}/%SUBDEPLOYMENT%",
+                "WP002": "/WLDFSystemResource${:s}/%WLDFSYSTEMRESOURCE%/SubDeployment${:s}/%SUBDEPLOYMENT%/Targets"
             }
         }
     },
@@ -369,7 +366,7 @@
     },
     "wlst_attributes_path": "WP001",
     "wlst_paths": {
-        "WP001": "/WLDFSystemResource${:s}/%WLDFRESOURCE%",
-        "WP002": "/WLDFSystemResource${:s}/%WLDFRESOURCE%/Targets"
+        "WP001": "/WLDFSystemResource${:s}/%WLDFSYSTEMRESOURCE%",
+        "WP002": "/WLDFSystemResource${:s}/%WLDFSYSTEMRESOURCE%/Targets"
     }
 }
diff --git a/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/WTCServer.json b/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/WTCServer.json
index 2cea67e9f..53e51c479 100644
--- a/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/WTCServer.json
+++ b/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/WTCServer.json
@@ -142,7 +142,6 @@
     },
     "WTCResources": {
       "wlst_type": "WTCResources",
-      "child_folders_type": "single_unpredictable",
       "default_name_value": "${NO_NAME_0:%WTCSERVER%}",
       "short_name": "Resources",
       "folders": {},
@@ -165,7 +164,6 @@
     },
     "WTCtBridgeGlobal": {
       "wlst_type": "WTCtBridgeGlobal",
-      "child_folders_type": "single_unpredictable",
       "default_name_value": "${NO_NAME_0:%WTCSERVER%}",
       "short_name": "Global",
       "folders": {},
@@ -189,7 +187,7 @@
       },
       "wlst_attributes_path": "WP001",
       "wlst_paths": {
-        "WP001": "/WTCServer${:s}/%WTCSERVER%/WTCtBridgeGlobal/%WTCBRIDGEGLOBAL%"
+        "WP001": "/WTCServer${:s}/%WTCSERVER%/WTCtBridgeGlobal/%WTCTBRIDGEGLOBAL%"
       }
     },
     "WTCtBridgeRedirect": {
diff --git a/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/WebAppContainer.json b/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/WebAppContainer.json
index d632ddf9e..b3ba6339e 100644
--- a/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/WebAppContainer.json
+++ b/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/WebAppContainer.json
@@ -2,29 +2,24 @@
     "copyright": "Copyright (c) 2019, 2020, Oracle Corporation and/or its affiliates.  All rights reserved.",
     "license": "Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl",
     "wlst_type": "WebAppContainer",
-    "child_folders_type": "single_unpredictable",
     "default_name_value": "${NO_NAME_0:%DOMAIN%}",
     "short_name": "WebApp",
     "folders": {
         "GzipCompression" : {
             "wlst_type": "GzipCompression",
             "version": "[12.2,)",
-            "child_folders_type": "single_unpredictable",
             "default_name_value": "${NO_NAME_0:%DOMAIN%}",
             "folders": {},
             "attributes": {
-                "DynamicallyCreated":                  [ {"version": "[12.2,)",       "wlst_mode": "both",    "wlst_name": "DynamicallyCreated",                 "wlst_path": "WP002", "value": {"default": false    }, "wlst_type": "boolean"           } ],
-                "GzipCompressionContentType":          [ {"version": "[12.2,)",       "wlst_mode": "both",    "wlst_name": "GzipCompressionContentType",         "wlst_path": "WP002", "value": {"default": "None"   }, "wlst_type": "${list:jarray}",  "wlst_read_type": "delimited_string[semicolon]", "get_method": "${LSA:GET}", "preferred_model_type": "list" } ],
-                "GzipCompressionEnabled":              [ {"version": "[12.2,)",       "wlst_mode": "both",    "wlst_name": "GzipCompressionEnabled",             "wlst_path": "WP002", "value": {"default": false    }, "wlst_type": "boolean"           } ],
-                "GzipCompressionMinContentLength":     [ {"version": "[12.2,)",       "wlst_mode": "both",    "wlst_name": "GzipCompressionMinContentLength",    "wlst_path": "WP002", "value": {"default": 2048     }, "wlst_type": "integer"           } ],
-                "Notes":                               [ {"version": "[12.2,)",       "wlst_mode": "both",    "wlst_name": "Notes",                              "wlst_path": "WP002", "value": {"default": "None"   }, "wlst_type": "string"            } ]
+                "GzipCompressionContentType":          [ {"version": "[12.2,)",       "wlst_mode": "both",    "wlst_name": "GzipCompressionContentType",         "wlst_path": "WP001", "value": {"default": "None"   }, "wlst_type": "${list:jarray}",  "wlst_read_type": "delimited_string[semicolon]", "get_method": "${LSA:GET}", "preferred_model_type": "list" } ],
+                "GzipCompressionEnabled":              [ {"version": "[12.2,)",       "wlst_mode": "both",    "wlst_name": "GzipCompressionEnabled",             "wlst_path": "WP001", "value": {"default": false    }, "wlst_type": "boolean"           } ],
+                "GzipCompressionMinContentLength":     [ {"version": "[12.2,)",       "wlst_mode": "both",    "wlst_name": "GzipCompressionMinContentLength",    "wlst_path": "WP001", "value": {"default": 2048     }, "wlst_type": "integer"           } ],
+                "Notes":                               [ {"version": "[12.2,)",       "wlst_mode": "both",    "wlst_name": "Notes",                              "wlst_path": "WP001", "value": {"default": "None"   }, "wlst_type": "string"            } ]
             },
-            "wlst_attributes_path": "WP002",
+            "wlst_attributes_path": "WP001",
             "wlst_paths": {
-                "WP002": "/WebAppContainer/%WEBAPPCONTAINER%/GzipCompression/%GZIPCOMPRESSION%"
+                "WP001": "/WebAppContainer/%WEBAPPCONTAINER%/GzipCompression/%GZIPCOMPRESSION%"
             }
-
-
         }
     },
     "attributes": {
@@ -32,7 +27,6 @@
         "AuthCookieEnabled":                   [ {"version": "[10,)",       "wlst_mode": "both",    "wlst_name": "AuthCookieEnabled",                  "wlst_path": "WP001", "value": {"default": false                              }, "wlst_type": "boolean"           } ],
         "ChangeSessionIDOnAuthentication":     [ {"version": "[10,)",       "wlst_mode": "both",    "wlst_name": "ChangeSessionIDOnAuthentication",    "wlst_path": "WP001", "value": {"default": false                              }, "wlst_type": "boolean"           } ],
         "ClientCertProxyEnabled":              [ {"version": "[10,)",       "wlst_mode": "both",    "wlst_name": "ClientCertProxyEnabled",             "wlst_path": "WP001", "value": {"default": false                              }, "wlst_type": "boolean"           } ],
-        "DynamicallyCreated":                  [ {"version": "[10,)",       "wlst_mode": "both",    "wlst_name": "DynamicallyCreated",                 "wlst_path": "WP001", "value": {"default": false                              }, "wlst_type": "boolean"           } ],
         "FilterDispatchedRequestsEnabled":     [ {"version": "[10,)",       "wlst_mode": "both",    "wlst_name": "FilterDispatchedRequestsEnabled",    "wlst_path": "WP001", "value": {"default": false                              }, "wlst_type": "boolean"           } ],
         "HttpTraceSupportEnabled":             [ {"version": "[10,)",       "wlst_mode": "both",    "wlst_name": "HttpTraceSupportEnabled",            "wlst_path": "WP001", "value": {"default": false                              }, "wlst_type": "boolean"           } ],
         "JSPCompilerBackwardsCompatible":      [ {"version": "[10,)",       "wlst_mode": "both",    "wlst_name": "JSPCompilerBackwardsCompatible",     "wlst_path": "WP001", "value": {"default": false                              }, "wlst_type": "boolean"           } ],
diff --git a/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/XMLRegistry.json b/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/XMLRegistry.json
index 331e3ce19..e477654b3 100644
--- a/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/XMLRegistry.json
+++ b/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/XMLRegistry.json
@@ -1,5 +1,5 @@
 {
-    "copyright": "Copyright (c) 2017, 2019, Oracle Corporation and/or its affiliates.  All rights reserved.",
+    "copyright": "Copyright (c) 2017, 2020, Oracle Corporation and/or its affiliates.  All rights reserved.",
     "license": "Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl",
     "wlst_type": "XMLRegistr${y:ies}",
     "child_folders_type": "multiple",
@@ -20,7 +20,7 @@
             },
             "wlst_attributes_path": "WP001",
             "wlst_paths": {
-                "WP001": "//XMLRegistr${y:ies}/%XMLREGISTRY%/XMLEntitySpecRegistryEntr${y:ies}/%XMLSPECENTRY%"
+                "WP001": "/XMLRegistr${y:ies}/%XMLREGISTRY%/XMLEntitySpecRegistryEntr${y:ies}/%XMLSPECENTRY%"
             }
         },
         "XMLParserSelectRegistryEntry": {
diff --git a/core/src/main/resources/oracle/weblogic/deploy/messages/wlsdeploy_rb.properties b/core/src/main/resources/oracle/weblogic/deploy/messages/wlsdeploy_rb.properties
index 0da80048c..7875d0be2 100644
--- a/core/src/main/resources/oracle/weblogic/deploy/messages/wlsdeploy_rb.properties
+++ b/core/src/main/resources/oracle/weblogic/deploy/messages/wlsdeploy_rb.properties
@@ -1378,6 +1378,7 @@ WLSDPLY-19037=Failed to decrypt password: {0}
 WLSDPLY-19038=List of attribute names to ignore for all MBeans {0}
 WLSDPLY-19039=Failed to convert the wlst attribute name to the model name at location ({0}) : {1}
 WLSDPLY-19040=Failed to determine if the model attributes {0} is a password for location ({0}): {1}
+WLSDPLY-19041=Failed to get the flattened folder information for location ({0}): {1}
 
 # wlsdeploy/tool/util/attribute_setter.py
 WLSDPLY-19200=No target found with name {0}
diff --git a/core/src/test/python/alias_encrypted_model_test.py b/core/src/test/python/alias_encrypted_model_test.py
index 4b5ce9e49..a60d5731e 100644
--- a/core/src/test/python/alias_encrypted_model_test.py
+++ b/core/src/test/python/alias_encrypted_model_test.py
@@ -1,14 +1,11 @@
 """
-Copyright (c) 2019, Oracle Corporation and/or its affiliates.  All rights reserved.
+Copyright (c) 2019, 2020, Oracle Corporation and/or its affiliates.  All rights reserved.
 Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 """
 import unittest
 
+import aliases_test
 from wlsdeploy.aliases.aliases import Aliases
-from wlsdeploy.aliases.location_context import LocationContext
-from wlsdeploy.aliases.model_constants import JDBC_DRIVER_PARAMS
-from wlsdeploy.aliases.model_constants import JDBC_RESOURCE
-from wlsdeploy.aliases.model_constants import JDBC_SYSTEM_RESOURCE
 from wlsdeploy.aliases.model_constants import PASSWORD_ENCRYPTED
 from wlsdeploy.aliases.wlst_modes import WlstModes
 from wlsdeploy.logging.platform_logger import PlatformLogger
@@ -37,11 +34,7 @@ def setUp(self):
         self.aliases = Aliases(model_context, wlst_mode=WlstModes.OFFLINE, wls_version=self._wls_version)
         self.online_aliases = Aliases(model_context, wlst_mode=WlstModes.ONLINE, wls_version=self._wls_version)
 
-        self.location = LocationContext()
-        self.location.append_location(JDBC_SYSTEM_RESOURCE)
-        self.location.add_name_token(self.aliases.get_name_token(self.location), "Mine")
-        self.location.append_location(JDBC_RESOURCE)
-        self.location.append_location(JDBC_DRIVER_PARAMS)
+        self.location = aliases_test.get_jdbc_driver_params_location("Mine", self.aliases)
 
     def testOfflineWlstNames(self):
         # Using offline WLST, the PasswordEncrypted model attribute should translate to the PasswordEncrypted WLST
diff --git a/core/src/test/python/alias_json_file_test.py b/core/src/test/python/alias_json_file_test.py
index e33e045bc..3ed456d71 100644
--- a/core/src/test/python/alias_json_file_test.py
+++ b/core/src/test/python/alias_json_file_test.py
@@ -1,8 +1,10 @@
 """
-Copyright (c) 2017, 2019, Oracle Corporation and/or its affiliates.  All rights reserved.
+Copyright (c) 2017, 2020, Oracle Corporation and/or its affiliates.  All rights reserved.
 Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 """
 import copy
+import re
+
 import os
 import pprint
 import unittest
@@ -11,6 +13,8 @@
 from oracle.weblogic.deploy.util import FileUtils
 
 from wlsdeploy.aliases.alias_constants import ChildFoldersTypes
+from wlsdeploy.aliases.alias_constants import PATH_TOKEN
+from wlsdeploy.aliases.alias_constants import SINGLE
 from wlsdeploy.aliases.alias_entries import AliasEntries
 from wlsdeploy.aliases.wlst_modes import WlstModes
 
@@ -52,6 +56,8 @@
 
 from wlsdeploy.exception.expection_types import ExceptionType
 from wlsdeploy.tool.util.attribute_setter import AttributeSetter
+from wlsdeploy.util import dictionary_utils
+
 
 class ListTestCase(unittest.TestCase):
     _resources_dir = '../../test-classes/'
@@ -135,6 +141,9 @@ class ListTestCase(unittest.TestCase):
         FOLDERS
     ]
 
+    _token_pattern = re.compile("^%([\\w-]+)%$")
+    _base_wlst_path_name = 'WP001'
+
     def setUp(self):
         self.alias_entries = AliasEntries(wls_version='12.2.1.3')
         self.online_alias_entries = AliasEntries(wls_version='12.2.1.3', wlst_mode=WlstModes.ONLINE)
@@ -145,12 +154,15 @@ def setUp(self):
 
     def testForJsonFileTypos(self):
         category_results = dict()
-        for category_name, category_file_path in self.category_file_map.iteritems():
+        category_names = self.category_file_map.keys()
+        category_names.sort()
+        for category_name in category_names:
+            category_file_path = self.category_file_map[category_name]
             category_dict = self._load_category_file(category_file_path)
             results = self._scan_category_dict_for_unknown_fields(category_name, category_dict)
             if len(results) > 0:
                 category_results[category_name] = results
-        message = pprint.pformat(category_results)
+        message = 'Messages:\n' + pprint.pformat(category_results)
         self.assertEqual(len(category_results), 0, message)
 
     def testTestFilesForJsonFileTypos(self):
@@ -160,7 +172,7 @@ def testTestFilesForJsonFileTypos(self):
             results = self._scan_category_dict_for_unknown_fields(category_name, category_dict)
             if len(results) > 0:
                 category_results[category_name] = results
-        message = pprint.pformat(category_results)
+        message = 'Messages:\n' + pprint.pformat(category_results)
         self.assertEqual(len(category_results), 0, message)
 
     def _load_category_file(self, category_file_path):
@@ -178,7 +190,7 @@ def _load_test_category_file(self, category_file_path):
     def _scan_category_dict_for_unknown_fields(self, category_name, category_dict):
         return self._process_folder(category_name, category_dict, True)
 
-    def _process_folder(self, folder_path, folder_dict, top_level_folder=False):
+    def _process_folder(self, folder_path, folder_dict, top_level_folder=False, parent_path=""):
         result = []
 
         folder_keys = folder_dict.keys()
@@ -198,6 +210,14 @@ def _process_folder(self, folder_path, folder_dict, top_level_folder=False):
                 result.extend(verify_function(folder_path, folder_dict[key]))
             else:
                 result.append(self._get_unknown_folder_key_message(folder_path, key))
+
+        result.extend(self._check_folder_type(folder_path, folder_dict, parent_path))
+        wlst_paths = dictionary_utils.get_dictionary_element(folder_dict, WLST_PATHS)
+        next_parent = dictionary_utils.get_element(wlst_paths, self._base_wlst_path_name)
+        if next_parent is None:
+            result.append("Folder at path %s does not have %s entry named \"%s\"" %
+                          (folder_path, WLST_PATHS, self._base_wlst_path_name))
+
         #
         # Now, verify the dictionary attribute types
         #
@@ -206,10 +226,10 @@ def _process_folder(self, folder_path, folder_dict, top_level_folder=False):
             new_folder_path = folder_path + '/' + FOLDERS
             if type(subfolder_value) is not dict:
                 result.append(self._get_invalid_dictionary_type_message(new_folder_path, subfolder_name,
-                                                                         subfolder_value))
+                                                                        subfolder_value))
             else:
                 new_folder_path += '/' + subfolder_name
-                result.extend(self._process_folder(new_folder_path, subfolder_value))
+                result.extend(self._process_folder(new_folder_path, subfolder_value, parent_path=next_parent))
 
         attributes = folder_dict[ATTRIBUTES]
         for attribute_name, attribute_value in attributes.iteritems():
@@ -359,7 +379,7 @@ def _verify_folder_flattened_folder_data_attribute_value(self, folder_name, attr
         result = []
         if type(attribute_value) is not dict:
             result.append(self._get_invalid_dictionary_type_message(folder_name, FLATTENED_FOLDER_DATA,
-                                                                     attribute_value))
+                                                                    attribute_value))
         else:
             if WLST_TYPE not in attribute_value:
                 new_folder_name = folder_name + '/' + FLATTENED_FOLDER_DATA
@@ -367,7 +387,7 @@ def _verify_folder_flattened_folder_data_attribute_value(self, folder_name, attr
             elif type(attribute_value[WLST_TYPE]) is not str:
                 new_folder_name = folder_name + '/' + FLATTENED_FOLDER_DATA
                 result.append(self._get_invalid_string_type_message(new_folder_name, WLST_TYPE,
-                                                                     attribute_value[WLST_TYPE]))
+                                                                    attribute_value[WLST_TYPE]))
 
             if NAME_VALUE not in attribute_value:
                 new_folder_name = folder_name + '/' + FLATTENED_FOLDER_DATA
@@ -375,7 +395,15 @@ def _verify_folder_flattened_folder_data_attribute_value(self, folder_name, attr
             elif type(attribute_value[NAME_VALUE]) is not str:
                 new_folder_name = folder_name + '/' + FLATTENED_FOLDER_DATA
                 result.append(self._get_invalid_string_type_message(new_folder_name, NAME_VALUE,
-                                                                     attribute_value[NAME_VALUE]))
+                                                                    attribute_value[NAME_VALUE]))
+
+            if PATH_TOKEN not in attribute_value:
+                new_folder_name = folder_name + '/' + FLATTENED_FOLDER_DATA
+                result.append(self._get_missing_required_folder_key_message(new_folder_name, PATH_TOKEN))
+            elif type(attribute_value[PATH_TOKEN]) is not str:
+                new_folder_name = folder_name + '/' + FLATTENED_FOLDER_DATA
+                result.append(self._get_invalid_string_type_message(new_folder_name, PATH_TOKEN,
+                                                                    attribute_value[PATH_TOKEN]))
         return result
 
     def _verify_folder_folder_params_attribute_value(self, folder_name, attribute_value):
@@ -668,7 +696,6 @@ def _verify_constrained_values(self, folder_name, attribute_name, alias_attribut
 
         return result
 
-
     def _process_constrained_value_value(self, folder_name, attribute_name, alias_attribute_name,
                                          alias_attribute_value, constrained_values, wlst_mode, empty_allowed=True):
         result = []
@@ -684,7 +711,63 @@ def _process_constrained_value_value(self, folder_name, attribute_name, alias_at
                                                                     constrained_values, wlst_mode))
         return result
 
+    def _check_folder_type(self, folder_path, folder_dict, parent_path):
+        """
+        Verify that the folder is correctly configured for the specified child folder type.
+        All folder types should have tokens for folder names.
+        Single MBean folders should have create_name, and a unique token at the end of each path.
+        :param folder_path: the folder path, used for logging
+        :param folder_dict: the dictionary for the folder
+        :param parent_path: the WLST path of the parent folder
+        :return: an array containing any error messages
+        """
+        result = []
+
+        folders_type = dictionary_utils.get_element(folder_dict, CHILD_FOLDERS_TYPE)
+        is_single_folder = folders_type in (SINGLE, None)
+        required_last_token = folder_path.split('/')[-1].upper()
+        tokens_found = False
+
+        # verify that each wlst_path value has an alternating token pattern, such as:
+        # /Folder1/%TOKEN1%/Folder2/%TOKEN2%/Folder3/%TOKEN3%
+        wlst_paths = dictionary_utils.get_dictionary_element(folder_dict, WLST_PATHS)
+        for key, wlst_path in wlst_paths.iteritems():
+            # skip the first empty element, since path starts with /
+            elements = wlst_path.split('/')[1:]
+
+            # verify that each even-numbered element in each path is a token.
+            last_token = None
+            token_required = False
+            for element in elements:
+                if token_required:
+                    matches = self._token_pattern.findall(element)
+                    if len(matches) != 1:
+                        result.append("Folder at path %s: %s %s has a name that should be a token: %s" %
+                                      (folder_path, WLST_PATHS, key, element))
+                    else:
+                        last_token = matches[0]
+                        tokens_found = True
+                # toggle the token required flag
+                token_required = not token_required
+
+            if not wlst_path.startswith(parent_path):
+                result.append("Folder at path %s: %s %s should start with \"%s\"" %
+                              (folder_path, WLST_PATHS, key, parent_path))
 
+            # for single folder, the final token in each wlst_path should be correspond to the folder name.
+            # this will ensure that the final token is unique in the path.
+            if is_single_folder and (last_token is not None) and (last_token != required_last_token):
+                result.append("Folder at path %s: %s %s last token should reflect folder name: %s" %
+                              (folder_path, WLST_PATHS, key, required_last_token))
+
+        # for single folder, if any tokens were found, a create name should be provided.
+        if is_single_folder and tokens_found:
+            default_name = dictionary_utils.get_element(folder_dict, DEFAULT_NAME_VALUE)
+            if default_name is None:
+                result.append("Folder at path %s: %s is required for single MBean folder with path tokens" %
+                              (folder_path, DEFAULT_NAME_VALUE))
+
+        return result
 
     ###########################################################################
     #                  Error messages helper methods                          #
diff --git a/core/src/test/python/alias_password_test.py b/core/src/test/python/alias_password_test.py
index 7fead9412..04995beba 100644
--- a/core/src/test/python/alias_password_test.py
+++ b/core/src/test/python/alias_password_test.py
@@ -1,14 +1,11 @@
 """
-Copyright (c) 2018, 2019, Oracle Corporation and/or its affiliates.  All rights reserved.
+Copyright (c) 2018, 2020, Oracle Corporation and/or its affiliates.  All rights reserved.
 Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 """
 import unittest
 
+import aliases_test
 from wlsdeploy.aliases.aliases import Aliases
-from wlsdeploy.aliases.location_context import LocationContext
-from wlsdeploy.aliases.model_constants import JDBC_DRIVER_PARAMS
-from wlsdeploy.aliases.model_constants import JDBC_RESOURCE
-from wlsdeploy.aliases.model_constants import JDBC_SYSTEM_RESOURCE
 from wlsdeploy.aliases.model_constants import PASSWORD_ENCRYPTED
 from wlsdeploy.aliases.wlst_modes import WlstModes
 from wlsdeploy.logging.platform_logger import PlatformLogger
@@ -33,11 +30,7 @@ def setUp(self):
         self.aliases = Aliases(model_context, wlst_mode=WlstModes.OFFLINE, wls_version=self._wls_version)
         self.online_aliases = Aliases(model_context, wlst_mode=WlstModes.ONLINE, wls_version=self._wls_version)
 
-        self.location = LocationContext()
-        self.location.append_location(JDBC_SYSTEM_RESOURCE)
-        self.location.add_name_token(self.aliases.get_name_token(self.location), "Mine")
-        self.location.append_location(JDBC_RESOURCE)
-        self.location.append_location(JDBC_DRIVER_PARAMS)
+        self.location = aliases_test.get_jdbc_driver_params_location("Mine", self.aliases)
 
     def testOfflineModelNames(self):
         # Using offline WLST, only PasswordEncrypted is an attribute, and its value is encrypted.
diff --git a/core/src/test/python/aliases_test.py b/core/src/test/python/aliases_test.py
index 3888c0ff3..3b5cbaafb 100644
--- a/core/src/test/python/aliases_test.py
+++ b/core/src/test/python/aliases_test.py
@@ -86,36 +86,23 @@ def testDatasourceRootPath(self):
 
     def testDatasourceParamsPath(self):
         expected = '/JDBCSystemResource/my-datasource/JdbcResource/my-datasource/JDBCDataSourceParams/NO_NAME_0'
-        location = LocationContext()
-        location.append_location(FOLDERS.JDBC_SYSTEM_RESOURCE)
-        token = self.aliases.get_name_token(location)
-        if token:
-            location.add_name_token(token, 'my-datasource')
-        location.append_location(FOLDERS.JDBC_RESOURCE)
-        location.append_location(FOLDERS.JDBC_DATASOURCE_PARAMS)
+        location = get_jdbc_ds_params_location('my-datasource', self.aliases)
 
         path = self.aliases.get_wlst_attributes_path(location)
         self.assertEqual(path, expected)
         return
 
     def testDatasourceDriverPropertiesPath(self):
-        location = LocationContext()
-        location.append_location(FOLDERS.JDBC_SYSTEM_RESOURCE)
-        token = self.aliases.get_name_token(location)
-        if token:
-            location.add_name_token(token, 'my-datasource')
-
-        location.append_location(FOLDERS.JDBC_RESOURCE)
-        location.append_location(FOLDERS.JDBC_DRIVER_PARAMS)
-        location.append_location(FOLDERS.JDBC_DRIVER_PARAMS_PROPERTIES)
+        location = get_jdbc_params_properties_location('my-datasource', self.aliases)
         expected = '/JDBCSystemResource/my-datasource/JdbcResource/my-datasource/' \
                    'JDBCDriverParams/NO_NAME_0/Properties/NO_NAME_0/Property'
         path1 = self.aliases.get_wlst_list_path(location)
         self.assertEqual(path1, expected)
 
+        online_location = get_jdbc_params_properties_location('my-datasource', self.online_aliases)
         expected = '/JDBCSystemResources/my-datasource/JDBCResource/my-datasource/' \
                    'JDBCDriverParams/my-datasource/Properties/my-datasource/Properties'
-        path2 = self.online_aliases.get_wlst_list_path(location)
+        path2 = self.online_aliases.get_wlst_list_path(online_location)
         self.assertEqual(path2, expected)
 
         # Path to access a single property by name (user in this example)
@@ -129,7 +116,8 @@ def testDatasourceDriverPropertiesPath(self):
 
         expected = '/JDBCSystemResources/my-datasource/JDBCResource/my-datasource/' \
                    'JDBCDriverParams/my-datasource/Properties/my-datasource/Properties/user'
-        path2 = self.online_aliases.get_wlst_attributes_path(location)
+        online_location.add_name_token(self.aliases.get_name_token(online_location), 'user')
+        path2 = self.online_aliases.get_wlst_attributes_path(online_location)
         self.assertEqual(path2, expected)
         return
 
@@ -143,13 +131,7 @@ def testDatasourceMbeanListPath(self):
 
     def testDatasourceSubfoldersPath(self):
         expected = '/JDBCSystemResource/my-datasource/JdbcResource/my-datasource'
-        location = LocationContext()
-        location.append_location(FOLDERS.JDBC_SYSTEM_RESOURCE)
-        token = self.aliases.get_name_token(location)
-        if token:
-            location.add_name_token(token, 'my-datasource')
-
-        location.append_location(FOLDERS.JDBC_RESOURCE)
+        location = get_jdbc_resource_location('my-datasource', self.aliases)
         path = self.aliases.get_wlst_subfolders_path(location)
         self.assertEqual(path, expected)
         return
@@ -172,28 +154,14 @@ def testDatasourceMbeanType(self):
 
     def testDatasourceSubfolderMbeanType(self):
         expected = 'JDBCDriverParams'
-        location = LocationContext()
-        location.append_location(FOLDERS.JDBC_SYSTEM_RESOURCE)
-        token = self.aliases.get_name_token(location)
-        if token:
-            location.add_name_token(token, 'my-datasource')
-
-        location.append_location(FOLDERS.JDBC_RESOURCE)
-        location.append_location(FOLDERS.JDBC_DRIVER_PARAMS)
+        location = get_jdbc_driver_params_location('my-datasource', self.aliases)
         mbean_type = self.aliases.get_wlst_mbean_type(location)
         self.assertEqual(mbean_type, expected)
         return
 
     def testDatasourceSubFolderMbeanName(self):
         expected = 'NO_NAME_0'
-        location = LocationContext()
-        location.append_location(FOLDERS.JDBC_SYSTEM_RESOURCE)
-        token = self.aliases.get_name_token(location)
-        if token:
-            location.add_name_token(token, 'my-datasource')
-
-        location.append_location(FOLDERS.JDBC_RESOURCE)
-        location.append_location(FOLDERS.JDBC_DATASOURCE_PARAMS)
+        location = get_jdbc_ds_params_location('my-datasource', self.aliases)
         mbean_name = self.aliases.get_wlst_mbean_name(location)
         self.assertEqual(mbean_name, expected)
         return
@@ -201,13 +169,7 @@ def testDatasourceSubFolderMbeanName(self):
     def testGetModelSubFolders(self):
         expected = ['JDBCOracleParams', 'JDBCConnectionPoolParams', 'JDBCXAParams',
                     'JDBCDataSourceParams', 'JDBCDriverParams']
-        location = LocationContext()
-        location.append_location(FOLDERS.JDBC_SYSTEM_RESOURCE)
-        token = self.aliases.get_name_token(location)
-        if token:
-            location.add_name_token(token, 'Generic1')
-
-        location.append_location(FOLDERS.JDBC_RESOURCE)
+        location = get_jdbc_resource_location('my-datasource', self.aliases)
         names = self.aliases.get_model_subfolder_names(location)
         self.assertEqual(len(names), len(expected))
         for name in names:
@@ -258,13 +220,7 @@ def testReadOnlyAttributeAccess(self):
         return
 
     def testWlstAttributeValueConversion(self):
-        location = LocationContext()
-        location.append_location(FOLDERS.JDBC_SYSTEM_RESOURCE)
-        token = self.aliases.get_name_token(location)
-        if token:
-            location.add_name_token(token, 'my-datasource')
-        location.append_location(FOLDERS.JDBC_RESOURCE)
-        location.append_location(FOLDERS.JDBC_DATASOURCE_PARAMS)
+        location = get_jdbc_ds_params_location('my-datasource', self.aliases)
 
         string_value = ['Hello', 'Hello']
         model_attribute_name = 'AlgorithmType'
@@ -283,17 +239,14 @@ def testWlstAttributeValueConversion(self):
         string_value = ['3600', Long(3600)]
         jms_location = LocationContext()
         jms_location.append_location(FOLDERS.JMS_SYSTEM_RESOURCE)
-        token = self.aliases.get_name_token(jms_location)
-        if token:
-            jms_location.add_name_token(token, 'my-module')
-
+        jms_location.add_name_token(self.aliases.get_name_token(jms_location), 'my-module')
         jms_location.append_location(FOLDERS.JMS_RESOURCE)
+        add_default_token_value(jms_location, self.aliases)
         jms_location.append_location(FOLDERS.CONNECTION_FACTORY)
-        token = self.aliases.get_name_token(jms_location)
-        if token:
-            jms_location.add_name_token(token, 'my-connectionfactory')
-
+        jms_location.add_name_token(self.aliases.get_name_token(jms_location), 'my-connectionfactory')
         jms_location.append_location(FOLDERS.DEFAULT_DELIVERY_PARAMS)
+        add_default_token_value(jms_location, self.aliases)
+
         model_attribute_name = 'DefaultTimeToLive'
         model_attribute_value = string_value[0]
         wlst_attribute_name, wlst_attribute_value = \
@@ -310,13 +263,7 @@ def testWlstAttributeValueConversion(self):
         return
 
     def testWlstAttributeListValueConversion(self):
-        location = LocationContext()
-        location.append_location(FOLDERS.JDBC_SYSTEM_RESOURCE)
-        token = self.aliases.get_name_token(location)
-        if token:
-            location.add_name_token(token, 'my-datasource')
-        location.append_location(FOLDERS.JDBC_RESOURCE)
-        location.append_location(FOLDERS.JDBC_DATASOURCE_PARAMS)
+        location = get_jdbc_ds_params_location('my-datasource', self.aliases)
 
         model_attribute_name = 'JNDIName'
         model_attribute_value = 'com.bea.datasource1, com.bea.datasource2'
@@ -386,13 +333,7 @@ def testConvertToTypeJarray(self):
         return
 
     def testGetWlstAttributeNameAndValue(self):
-        location = LocationContext()
-        location.append_location(FOLDERS.JDBC_SYSTEM_RESOURCE)
-        token = self.aliases.get_name_token(location)
-        if token:
-            location.add_name_token(token, 'my-datasource')
-        location.append_location(FOLDERS.JDBC_RESOURCE)
-        location.append_location(FOLDERS.JDBC_DATASOURCE_PARAMS)
+        location = get_jdbc_ds_params_location('my-datasource', self.aliases)
 
         # get wlst attribute value should return the value even if its the default
         string_value = ['0', 0]
@@ -404,13 +345,7 @@ def testGetWlstAttributeNameAndValue(self):
         return
 
     def testGetModelAttributeNameAndValue(self):
-        location = LocationContext()
-        location.append_location(FOLDERS.JDBC_SYSTEM_RESOURCE)
-        token = self.aliases.get_name_token(location)
-        if token:
-            location.add_name_token(token, 'my-datasource')
-        location.append_location(FOLDERS.JDBC_RESOURCE)
-        location.append_location(FOLDERS.JDBC_DATASOURCE_PARAMS)
+        location = get_jdbc_ds_params_location('my-datasource', self.aliases)
 
         # get model attribute value should return the value only if its NOT the default
         boolean_values = ['false', None]
@@ -455,12 +390,11 @@ def testGetWlstAttributeName(self):
 
     def testGetWlstAttributeName2(self):
         location=LocationContext().append_location(FOLDERS.JMS_SYSTEM_RESOURCE)
-        token = self.aliases.get_name_token(location)
-        location.add_name_token(token, 'TheModule')
+        location.add_name_token(self.aliases.get_name_token(location), 'TheModule')
         location.append_location(FOLDERS.JMS_RESOURCE)
+        add_default_token_value(location, self.aliases)
         location.append_location(FOLDERS.DISTRIBUTED_TOPIC)
-        token = self.aliases.get_name_token(location)
-        location.add_name_token(token, 'TheTopic')
+        location.add_name_token(self.aliases.get_name_token(location), 'TheTopic')
 
         model_attribute_name = 'SafExportPolicy'
         result = self.aliases.get_wlst_attribute_name(location, model_attribute_name)
@@ -474,13 +408,7 @@ def testGetWlstAttributeName2(self):
     def testIsWlstModelAttributeName(self):
         wls_version = '10.3.6'
         online_aliases = Aliases(self.model_context, WlstModes.ONLINE, wls_version)
-        location = LocationContext()
-        location.append_location(FOLDERS.JDBC_SYSTEM_RESOURCE)
-        token = self.aliases.get_name_token(location)
-        if token:
-            location.add_name_token(token, 'my-datasource')
-        location.append_location(FOLDERS.JDBC_RESOURCE)
-        location.append_location(FOLDERS.JDBC_DRIVER_PARAMS)
+        location = get_jdbc_driver_params_location('my-datasource', self.aliases)
         model_attribute_name = 'QosDegradationAllowed'
         path = self.aliases.get_model_folder_path(location)
         expected = exception_helper.get_message('WLSDPLY-08408', model_attribute_name, path, wls_version)
@@ -491,6 +419,7 @@ def testIsWlstModelAttributeName(self):
         offline_aliases = Aliases(self.model_context, WlstModes.OFFLINE, wls_version)
         location.pop_location()
         location.append_location(FOLDERS.JDBC_ORACLE_PARAMS)
+        add_default_token_value(location, self.aliases)
         model_attribute_name = 'OnsWalletPasswordEncrypted'
         path = self.aliases.get_model_folder_path(location)
         expected = exception_helper.get_message('WLSDPLY-08407', model_attribute_name, path, wls_version)
@@ -500,6 +429,7 @@ def testIsWlstModelAttributeName(self):
 
         location.pop_location()
         location.append_location(FOLDERS.JDBC_CONNECTION_POOL_PARAMS)
+        add_default_token_value(location, self.aliases)
         model_attribute_name = 'CountOfTestFailuresTillFlush'
         earliest_version = '12.1.2'
         path = self.aliases.get_model_folder_path(location)
@@ -530,13 +460,7 @@ def testNewGetWlstPaths(self):
         list_expected = '/JDBCSystemResource/my-datasource/JdbcResource/my-datasource/JDBCDriverParams'
         create_expected = '/JDBCSystemResource/my-datasource/JdbcResource/my-datasource'
 
-        location = LocationContext()
-        location.append_location(FOLDERS.JDBC_SYSTEM_RESOURCE)
-        token = self.aliases.get_name_token(location)
-        if token:
-            location.add_name_token(token, 'my-datasource')
-
-        location.append_location(FOLDERS.JDBC_RESOURCE, FOLDERS.JDBC_DRIVER_PARAMS)
+        location = get_jdbc_driver_params_location('my-datasource', self.aliases)
 
         result = self.aliases.get_wlst_attributes_path(location)
         self.assertEqual(result, attr_expected)
@@ -558,7 +482,7 @@ def testNewGetWlstPaths(self):
         create_expected = '/JDBCSystemResource/my-datasource/JdbcResource/my-datasource/JDBCDriverParams' \
                           '/NO_NAME_0/Properties/NO_NAME_0'
 
-        location.append_location(FOLDERS.JDBC_DRIVER_PARAMS_PROPERTIES)
+        add_jdbc_params_properties(location, self.aliases)
         token = self.aliases.get_name_token(location)
         if token:
             location.add_name_token(token, 'user')
@@ -633,12 +557,7 @@ def testMTAliasLoading(self):
         list_expected = '/JDBCSystemResource/my-datasource/JdbcResource/my-datasource/JDBCDriverParams'
         create_expected = '/JDBCSystemResource/my-datasource/JdbcResource/my-datasource'
 
-        location = LocationContext()
-        location.append_location(FOLDERS.JDBC_SYSTEM_RESOURCE)
-        token = self.aliases.get_name_token(location)
-        if token:
-            location.add_name_token(token, 'my-datasource')
-        location.append_location(FOLDERS.JDBC_RESOURCE, FOLDERS.JDBC_DRIVER_PARAMS)
+        location = get_jdbc_driver_params_location('my-datasource', self.aliases)
 
         result = aliases.get_wlst_attributes_path(location)
         self.assertEqual(result, attr_expected)
@@ -664,11 +583,11 @@ def testMTAliasLoading(self):
             location.add_name_token(token, 'MyResourceGroupTemplate')
 
         location.append_location(FOLDERS.JDBC_SYSTEM_RESOURCE)
-        token = self.aliases.get_name_token(location)
-        if token:
-            location.add_name_token(token, 'my-datasource')
-        location.append_location(FOLDERS.JDBC_RESOURCE, FOLDERS.JDBC_DRIVER_PARAMS)
-
+        location.add_name_token(self.aliases.get_name_token(location), 'my-datasource')
+        location.append_location(FOLDERS.JDBC_RESOURCE)
+        add_default_token_value(location, self.aliases)
+        location.append_location(FOLDERS.JDBC_DRIVER_PARAMS)
+        add_default_token_value(location, self.aliases)
 
         result = aliases.get_wlst_attributes_path(location)
         self.assertEqual(result, attr_expected)
@@ -692,10 +611,11 @@ def testMTAliasLoading(self):
         if token:
             location.add_name_token(token, 'MyResourceGroup')
         location.append_location(FOLDERS.JDBC_SYSTEM_RESOURCE)
-        token = self.aliases.get_name_token(location)
-        if token:
-            location.add_name_token(token, 'my-datasource')
-        location.append_location(FOLDERS.JDBC_RESOURCE, FOLDERS.JDBC_DRIVER_PARAMS)
+        location.add_name_token(self.aliases.get_name_token(location), 'my-datasource')
+        location.append_location(FOLDERS.JDBC_RESOURCE)
+        add_default_token_value(location, self.aliases)
+        location.append_location(FOLDERS.JDBC_DRIVER_PARAMS)
+        add_default_token_value(location, self.aliases)
 
         result = aliases.get_wlst_attributes_path(location)
         self.assertEqual(result, attr_expected)
@@ -726,11 +646,11 @@ def testMTAliasLoading(self):
             location.add_name_token(token, 'MyResourceGroup')
 
         location.append_location(FOLDERS.JDBC_SYSTEM_RESOURCE)
-        token = self.aliases.get_name_token(location)
-        if token:
-            location.add_name_token(token, 'my-datasource')
-
-        location.append_location(FOLDERS.JDBC_RESOURCE, FOLDERS.JDBC_DRIVER_PARAMS)
+        location.add_name_token(self.aliases.get_name_token(location), 'my-datasource')
+        location.append_location(FOLDERS.JDBC_RESOURCE)
+        add_default_token_value(location, self.aliases)
+        location.append_location(FOLDERS.JDBC_DRIVER_PARAMS)
+        add_default_token_value(location, self.aliases)
 
         result = aliases.get_wlst_attributes_path(location)
         self.assertEqual(result, attr_expected)
@@ -774,13 +694,12 @@ def testChildNodeTypes(self):
         self.assertEqual(mbean_name, 'MyWorkManager')
 
         location.append_location('WorkManagerShutdownTrigger')
-        result = self.aliases.requires_unpredictable_single_name_handling(location)
-        self.assertEqual(result, False)
+        location.add_name_token(self.aliases.get_name_token(location), 'MyWorkManager')
         result = self.aliases.supports_multiple_mbean_instances(location)
         self.assertEqual(result, False)
 
         name_token = self.aliases.get_name_token(location)
-        self.assertEqual(name_token, None)
+        self.assertEqual(name_token, 'WORKMANAGERSHUTDOWNTRIGGER')
         mbean_name = self.aliases.get_wlst_mbean_name(location)
         self.assertEqual(mbean_name, 'NO_NAME_0')
         mbean_name = self.online_aliases.get_wlst_mbean_name(location)
@@ -792,17 +711,13 @@ def testChildNodeTypes(self):
         return
 
     def testFlattenedFolders(self):
-        location = LocationContext().append_location(FOLDERS.JDBC_SYSTEM_RESOURCE)
-        token_name = self.aliases.get_name_token(location)
-        if token_name is not None:
-            location.add_name_token(token_name, 'my-datasource')
-        location.append_location(FOLDERS.JDBC_RESOURCE, FOLDERS.JDBC_DRIVER_PARAMS,
-                                 FOLDERS.JDBC_DRIVER_PARAMS_PROPERTIES)
-        result = self.aliases.is_flattened_folder(location)
-        self.assertEqual(result, True)
-        name = self.aliases.get_wlst_flattened_mbean_name(location)
-        online_name = self.online_aliases.get_wlst_flattened_mbean_name(location)
-        type = self.aliases.get_wlst_flattened_mbean_type(location)
+        location = get_jdbc_params_properties_location('my-datasource', self.aliases)
+        flattened_info = self.aliases.get_wlst_flattened_folder_info(location)
+        online_flattened_info = self.online_aliases.get_wlst_flattened_folder_info(location)
+        self.assertNotEqual(flattened_info, None)
+        name = flattened_info.get_mbean_name()
+        online_name = online_flattened_info.get_mbean_name()
+        type = flattened_info.get_mbean_type()
         self.assertEqual(name, 'NO_NAME_0')
         self.assertEqual(online_name, 'my-datasource')
         self.assertEqual(type, 'Properties')
@@ -817,12 +732,7 @@ def testFlattenedFolders(self):
         return
 
     def testModelFolderPath(self):
-        location = LocationContext().append_location(FOLDERS.JDBC_SYSTEM_RESOURCE)
-        token_name = self.aliases.get_name_token(location)
-        if token_name is not None:
-            location.add_name_token(token_name, 'my-datasource')
-        location.append_location(FOLDERS.JDBC_RESOURCE, FOLDERS.JDBC_DRIVER_PARAMS,
-                                 FOLDERS.JDBC_DRIVER_PARAMS_PROPERTIES)
+        location = get_jdbc_params_properties_location('my-datasource', self.aliases)
 
         expected = 'resources:/JDBCSystemResource/my-datasource/JdbcResource/JDBCDriverParams/Properties'
         path = self.aliases.get_model_folder_path(location)
@@ -1277,12 +1187,11 @@ def testIssue91Fix(self):
 
     def testGetModelAttributeName(self):
         location=LocationContext().append_location(FOLDERS.JMS_SYSTEM_RESOURCE)
-        token = self.aliases.get_name_token(location)
-        location.add_name_token(token, 'TheModule')
+        location.add_name_token(self.aliases.get_name_token(location), 'TheModule')
         location.append_location(FOLDERS.JMS_RESOURCE)
+        add_default_token_value(location, self.aliases)
         location.append_location(FOLDERS.DISTRIBUTED_TOPIC)
-        token = self.aliases.get_name_token(location)
-        location.add_name_token(token, 'TheTopic')
+        location.add_name_token(self.aliases.get_name_token(location), 'TheTopic')
 
         # model name should be the same, whether online or offline
         expected_model_name = 'SafExportPolicy'
@@ -1366,5 +1275,49 @@ def testReadOnlyDiscoverAttribute(self):
         self.assertEquals(None, wlst_value)
 
 
+def get_jdbc_ds_params_location(name, aliases):
+    location = get_jdbc_resource_location(name, aliases)
+    location.append_location(FOLDERS.JDBC_DATASOURCE_PARAMS)
+    add_default_token_value(location, aliases)
+    return location
+
+
+def get_jdbc_params_properties_location(name, aliases):
+    location = get_jdbc_driver_params_location(name, aliases)
+    add_jdbc_params_properties(location, aliases)
+    return location
+
+
+def add_jdbc_params_properties(location, aliases):
+    location.append_location(FOLDERS.JDBC_DRIVER_PARAMS_PROPERTIES)
+    # don't add the token for property name
+
+    # token for flattened Properties folder
+    flat_info = aliases.get_wlst_flattened_folder_info(location)
+    location.add_name_token(flat_info.get_path_token(), flat_info.get_mbean_name())
+
+
+def get_jdbc_driver_params_location(name, aliases):
+    location = get_jdbc_resource_location(name, aliases)
+    location.append_location(FOLDERS.JDBC_DRIVER_PARAMS)
+    add_default_token_value(location, aliases)
+    return location
+
+
+def get_jdbc_resource_location(name, aliases):
+    location = LocationContext()
+    location.append_location(FOLDERS.JDBC_SYSTEM_RESOURCE)
+    location.add_name_token(aliases.get_name_token(location), name)
+    location.append_location(FOLDERS.JDBC_RESOURCE)
+    add_default_token_value(location, aliases)
+    return location
+
+
+def add_default_token_value(location, aliases):
+    token = aliases.get_name_token(location)
+    name = aliases.get_wlst_mbean_name(location)
+    location.add_name_token(token, name)
+
+
 if __name__ == '__main__':
     unittest.main()
diff --git a/core/src/test/resources/Test.json b/core/src/test/resources/Test.json
index 5d1ecba54..90f4ec2d7 100644
--- a/core/src/test/resources/Test.json
+++ b/core/src/test/resources/Test.json
@@ -1,5 +1,5 @@
 {
-  "copyright": "Copyright (c) 2019, Oracle Corporation and/or its affiliates.  All rights reserved.",
+  "copyright": "Copyright (c) 2019, 2020, Oracle Corporation and/or its affiliates.  All rights reserved.",
   "license": "Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl",
   "folder_params": [],
   "wlst_type": "Test",
@@ -20,12 +20,13 @@
       "wlst_type": "ChildFolder-1",
       "folders": {},
       "child_folders_type": "single",
+      "default_name_value": "NO_NAME_0",
       "attributes": {
         "Notes": [{"version": "[12.2.1.3,)", "wlst_mode": "both", "wlst_name": "Notes", "wlst_path": "WP001", "value": {"default": "None"}, "wlst_type": "string"}]
       },
       "wlst_attributes_path": "WP001",
       "wlst_paths": {
-        "WP001": "/Test/%TEST%/ChildFolder-1/"
+        "WP001": "/Test/%TEST%/ChildFolder-1/%CHILDFOLDER-12213%"
       }
     },
     "ChildFolder-2": {