From 592d31636c6dea105bcdff572f0bf9ce81afdc39 Mon Sep 17 00:00:00 2001
From: arnaud_lacour <arnaud_lacour@localhost>
Date: Wed, 15 Aug 2007 21:01:41 +0000
Subject: [PATCH] 1. refactored core test suite 2. added getTestCaseName function to return a well-formed name

---
 opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci1.xml                                 |    2 
 opendj-sdk/opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_def_policy.xml     |    6 
 opendj-sdk/opends/tests/functional-tests/testcases/security/client_auth/client_auth_teardown.xml                        |    2 
 opendj-sdk/opends/tests/functional-tests/testcases/backends/export-tasks.xml                                            |    2 
 opendj-sdk/opends/tests/functional-tests/testcases/dsconfig/dsconfig_list.xml                                           |    2 
 opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA384.xml                        |    6 
 opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_min_pwd_age.xml                         |    6 
 opendj-sdk/opends/tests/functional-tests/testcases/security/startTLS/security_force_pwd_change_startTLS.xml             |   38 
 opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_disable_max_pwd_age.xml                 |    2 
 opendj-sdk/opends/tests/functional-tests/testcases/aci/multiple_aci_tests.xml                                           |   50 
 opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci11.xml                                |    2 
 opendj-sdk/opends/tests/functional-tests/testcases/core/core_setup.xml                                                  |  158 +-
 opendj-sdk/opends/tests/functional-tests/testcases/security/jks/security_setup_jks.xml                                  |    2 
 opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_validator/security_pwd_length.xml                       |   20 
 opendj-sdk/opends/tests/functional-tests/testcases/core/core_search_sizelimit.xml                                       |  353 ++---
 opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_validator/security_skip_val_for_admins.xml              |   12 
 opendj-sdk/opends/tests/functional-tests/testcases/backends/backup.xml                                                  |   10 
 opendj-sdk/opends/tests/functional-tests/testcases/backends/import.xml                                                  |   56 
 opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_validator/security_repeat_chars.xml                     |   20 
 opendj-sdk/opends/tests/functional-tests/testcases/replication/totalupdate/replication_binarycopy.xml                   |    4 
 opendj-sdk/opends/tests/functional-tests/testcases/sample/sample.xml                                                    |    6 
 opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_enable_max_pwd_age.xml                  |    4 
 opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci26.xml                                |    2 
 opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_validator/security_dictionary.xml                       |   12 
 opendj-sdk/opends/tests/functional-tests/testcases/backends/export.xml                                                  |   48 
 opendj-sdk/opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_SHA384_policy.xml  |   10 
 opendj-sdk/opends/tests/functional-tests/testcases/security/client_auth/equal_dn_mapper.xml                             |    4 
 opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_targetattr.xml                                               |   26 
 opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA.xml                           |    8 
 opendj-sdk/opends/tests/functional-tests/testcases/security/sasl/security_setup_sasl.xml                                |    2 
 opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_teardown_pwd_policy.xml                 |    2 
 opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA256.xml                        |    6 
 opendj-sdk/opends/tests/functional-tests/testcases/security/client_auth/subject_dn_mapper.xml                           |    6 
 opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci13.xml                                |    2 
 opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_lockout_duration.xml                    |   12 
 opendj-sdk/opends/tests/functional-tests/testcases/replication/totalupdate/totalupdate.xml                              |    2 
 opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci15.xml                                |    2 
 opendj-sdk/opends/tests/functional-tests/testcases/clu/cluSearch.xml                                                    |   52 
 opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_setup_pwd_policy.xml                    |    2 
 opendj-sdk/opends/tests/functional-tests/testcases/clu/cluDelete.xml                                                    |    2 
 opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci23.xml                                |    2 
 opendj-sdk/opends/tests/functional-tests/testcases/replication/totalupdate/replication_schema.xml                       |    6 
 opendj-sdk/opends/tests/functional-tests/testcases/groups/group_static_member.xml                                       |   20 
 opendj-sdk/opends/tests/functional-tests/testcases/security/bind_no_pwd/security_setup_bind_no_pwd.xml                  |    2 
 opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_multiple_schemes.xml                   |   14 
 opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_targetfilter.xml                                             |   42 
 opendj-sdk/opends/tests/functional-tests/testcases/core/core_search_timelimit.xml                                       |  389 +++---
 opendj-sdk/opends/tests/functional-tests/testcases/clu/cluModify.xml                                                    |   40 
 opendj-sdk/opends/tests/functional-tests/testcases/core/core_cleanup.xml                                                |   69 
 opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_mult_pwd_policies.xml                   |   14 
 opendj-sdk/opends/tests/functional-tests/testcases/clu/cluCompare.xml                                                   |    2 
 opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci5.xml                                 |    2 
 opendj-sdk/opends/tests/functional-tests/testcases/security/jks/security_teardown_jks.xml                               |    2 
 opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_entry.xml                                             |   56 
 opendj-sdk/opends/tests/functional-tests/testcases/backends/backup-tasks.xml                                            |    2 
 opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_force_pwd_change_all_users.xml          |   10 
 opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_validator/security_attribute_value.xml                  |   28 
 opendj-sdk/opends/tests/functional-tests/testcases/backends/import-tasks.xml                                            |   52 
 opendj-sdk/opends/tests/functional-tests/testcases/security/client_auth/client_auth_setup.xml                           |    8 
 opendj-sdk/opends/tests/functional-tests/testcases/replication/basic/replication_basic.xml                              |   40 
 opendj-sdk/opends/tests/functional-tests/testcases/security/client_auth/subject_attribute_mapper.xml                    |    4 
 opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci21.xml                                |    2 
 opendj-sdk/opends/tests/functional-tests/testcases/schema/schema_dynamic.xml                                            |    8 
 opendj-sdk/opends/tests/functional-tests/testcases/security/account_activation/security_setup_account_activation.xml    |    2 
 opendj-sdk/opends/tests/functional-tests/testcases/privileges/privileges_restore_task.xml                               |    6 
 opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_last_login.xml                          |   40 
 opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci3.xml                                 |    2 
 opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_lockout_fail_cnt.xml                    |    8 
 opendj-sdk/opends/tests/functional-tests/testcases/security/sasl/security_sasl_anon.xml                                 |    6 
 opendj-sdk/opends/tests/functional-tests/testcases/security/sasl/security_teardown_sasl.xml                             |    2 
 opendj-sdk/opends/tests/functional-tests/testcases/security/sasl/security_sasl_plain.xml                                |   20 
 opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_targetscope.xml                                              |   18 
 opendj-sdk/opends/tests/functional-tests/testcases/groups/group_static_uniquemember.xml                                 |   20 
 opendj-sdk/opends/tests/functional-tests/testcases/groups/group_virtual_static.xml                                      |   22 
 opendj-sdk/opends/tests/functional-tests/testcases/privileges/privileges_backup_task.xml                                |    6 
 opendj-sdk/opends/tests/functional-tests/testcases/backends/restore-tasks.xml                                           |    2 
 opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_targattrfilter.xml                                           |   40 
 opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_user_pwd_policy.xml                     |   14 
 opendj-sdk/opends/tests/functional-tests/testcases/core/core_tf_filters.xml                                             |  144 +-
 opendj-sdk/opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_teardown_auth_pwd_syntax.xml       |    2 
 opendj-sdk/opends/tests/functional-tests/testcases/backends/backendsetup.xml                                            |    2 
 opendj-sdk/opends/tests/functional-tests/testcases/security/jks/security_bob_jks.xml                                    |   10 
 opendj-sdk/opends/tests/functional-tests/testcases/groups/group_dynamic.xml                                             |   14 
 opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_validator/security_teardown_pwd_validator.xml           |    2 
 opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_MD5.xml                            |    6 
 opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_force_pwd_change.xml                    |   38 
 opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_grace_login.xml                         |    8 
 opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA512.xml                        |    6 
 opendj-sdk/opends/tests/functional-tests/testcases/security/account_activation/security_test_account.xml                |    8 
 opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_rdn.xml                                               |   30 
 opendj-sdk/opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_SHA256_policy.xml  |   10 
 opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_CLEAR.xml                          |    8 
 opendj-sdk/opends/tests/functional-tests/testcases/security/bind_no_pwd/security_teardown_bind_no_pwd.xml               |    2 
 opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_compare_tests.xml                                            |   30 
 opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_delete_entry.xml                                             |   40 
 opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_add_entry.xml                                                |   32 
 opendj-sdk/opends/tests/functional-tests/testcases/runFuncTests.xml                                                     |    4 
 opendj-sdk/opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_setup_auth_pwd_syntax.xml          |    2 
 opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_validator/security_character_set.xml                    |   20 
 opendj-sdk/opends/tests/functional-tests/testcases/core/core_version_report.xml                                         |   66 
 opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci25.xml                                |    2 
 opendj-sdk/opends/tests/functional-tests/testcases/security/startTLS/security_teardown_startTLS.xml                     |    2 
 opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci12.xml                                |    2 
 opendj-sdk/opends/tests/functional-tests/testcases/privileges/privileges_export_task.xml                                |    6 
 opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_effective_rights.xml                                         |   38 
 opendj-sdk/opends/tests/functional-tests/testcases/privileges/privileges_users.xml                                      |   30 
 opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SHA.xml                            |    6 
 opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SMD5.xml                           |    6 
 opendj-sdk/opends/tests/functional-tests/testcases/security/pkcs12/security_teardown_pkcs12.xml                         |    2 
 opendj-sdk/opends/tests/functional-tests/testcases/security/startTLS/security_setup_startTLS.xml                        |    2 
 opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_target.xml                                                   |   60 
 opendj-sdk/opends/tests/functional-tests/testcases/privileges/privileges_import_task.xml                                |    6 
 opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci6.xml                                 |    2 
 opendj-sdk/opends/tests/functional-tests/testcases/security/client_auth/fingerprint_mapper.xml                          |    6 
 opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy_root/security_root_user_tests.xml                |    6 
 opendj-sdk/opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_MD5_policy.xml     |   10 
 opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_validator/security_setup_pwd_validator.xml              |    2 
 opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_teardown_pwd_storage.xml               |    2 
 opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_rdn_wildcards.xml                                            |   40 
 opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_validator/security_unique_chars.xml                     |   22 
 opendj-sdk/opends/tests/functional-tests/testcases/replication/totalupdate/replication_resynchronization.xml            |    4 
 opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci14.xml                                |    2 
 opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci16.xml                                |    2 
 opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_setup_pwd_storage.xml                  |    2 
 opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_bindtypes.xml                                                |   66 
 opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_deprecated_schemes.xml                 |   14 
 opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_proxy_auth.xml                                               |   22 
 opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci24.xml                                |    2 
 opendj-sdk/opends/tests/functional-tests/testcases/security/account_activation/security_teardown_account_activation.xml |    2 
 opendj-sdk/opends/tests/functional-tests/testcases/aci/global_acis.xml                                                  |   30 
 opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci4.xml                                 |    2 
 opendj-sdk/opends/tests/functional-tests/testcases/security/sasl/security_sasl_cram-md5.xml                             |   14 
 opendj-sdk/opends/tests/functional-tests/testcases/core/core.xml                                                        |   66 
 opendj-sdk/opends/tests/functional-tests/testcases/security/pkcs12/security_bob_pkcs12.xml                              |   10 
 opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_validator/security_history_based.xml                    |   16 
 opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_import.xml                                                   |    2 
 opendj-sdk/opends/tests/functional-tests/testcases/security/account_activation/security_account_expiration.xml          |   12 
 opendj-sdk/opends/tests/functional-tests/testcases/core/core_entry_cache.xml                                            |  265 +--
 opendj-sdk/opends/tests/functional-tests/testcases/security/sasl/security_sasl_digest-md5.xml                           |   58 
 opendj-sdk/opends/tests/functional-tests/testcases/privileges/privileges_directory_manager.xml                          |   26 
 opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_preencoded_pwds.xml                     |   10 
 opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_BASE64.xml                         |    6 
 opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci22.xml                                |    2 
 opendj-sdk/opends/tests/functional-tests/testcases/security/startTLS/security_bob_startTLS.xml                          |    8 
 opendj-sdk/opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_SHA512_policy.xml  |   10 
 opendj-sdk/opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_SHA1_policy.xml    |   10 
 opendj-sdk/opends/tests/functional-tests/testcases/security/bind_no_pwd/security_pwd_null.xml                           |   16 
 opendj-sdk/opends/tests/functional-tests/testcases/replication/totalupdate/replication_ldifimport.xml                   |    4 
 opendj-sdk/opends/tests/functional-tests/testcases/backends/restore.xml                                                 |    4 
 opendj-sdk/opends/tests/functional-tests/testcases/security/pkcs12/security_setup_pkcs12.xml                            |    2 
 opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci2.xml                                 |    2 
 opendj-sdk/opends/tests/functional-tests/testcases/privileges/privileges_new_root_user.xml                              |   28 
 opendj-sdk/opends/tests/functional-tests/testcases/schema/schema_rfc_tests.xml                                          |   78 
 153 files changed, 1,645 insertions(+), 1,873 deletions(-)

diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_add_entry.xml b/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_add_entry.xml
index 8ede462..9de316d 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_add_entry.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_add_entry.xml
@@ -74,7 +74,7 @@
             -->
           <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
           <!-- cross reference to DS6 docs -->
-            <testcase name="'ACI: Add: Preamble'">
+            <testcase name="getTestCaseName('Preamble')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                 <message>
@@ -121,7 +121,7 @@
             -->
             <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
             <!-- cross reference to DS6 docs -->
-            <testcase name="'ACI: Add: Add Entry - userdn equals all'">
+            <testcase name="getTestCaseName('Add Entry - userdn equals all')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -250,7 +250,7 @@
             -->
             <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
             <!-- cross reference to DS6 docs -->
-            <testcase name="'ACI: Add: Add Entry - userdn equals a dn'">
+            <testcase name="getTestCaseName('Add Entry - userdn equals a dn')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -394,7 +394,7 @@
             <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
             <!-- cross reference to DS6 docs -->
             <!-- cross reference to deladd.ksh Test Cases tp4 -->
-            <testcase name="'ACI: Add: Add Entry - userdn not equals a dn'">
+            <testcase name="getTestCaseName('Add Entry - userdn not equals a dn')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -533,7 +533,7 @@
             -->
             <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
             <!-- cross reference to DS6 docs -->
-            <testcase name="'ACI: Add: Add Entry - add not allowed'">
+            <testcase name="getTestCaseName('Add Entry - add not allowed')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -629,7 +629,7 @@
             -->
             <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
             <!-- cross reference to DS6 docs -->
-            <testcase name="'ACI: Add: Add Entry - targetfilter equals one statement'">
+            <testcase name="getTestCaseName('Add Entry - targetfilter equals one statement')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -755,7 +755,7 @@
             -->
             <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
             <!-- cross reference to DS6 docs -->
-            <testcase name="'ACI: Add: Add Entry - targetfilter with non-existent attribute'">
+            <testcase name="getTestCaseName('Add Entry - targetfilter with non-existent attribute')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -866,7 +866,7 @@
             -->
             <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
             <!-- cross reference to DS6 docs -->
-            <testcase name="'ACI: Add: Add Entry - targetattr with one attribute'">
+            <testcase name="getTestCaseName('Add Entry - targetattr with one attribute')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -995,7 +995,7 @@
             -->
             <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
             <!-- cross reference to DS6 docs -->
-            <testcase name="'ACI: Add: Add Entry - targattrfilter with add:,del:'">
+            <testcase name="getTestCaseName('Add Entry - targattrfilter with add:,del:')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -1123,7 +1123,7 @@
             -->
             <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
             <!-- cross reference to DS6 docs -->
-            <testcase name="'ACI: Add: Add Entry - targattrfilter with add: only'">
+            <testcase name="getTestCaseName('Add Entry - targattrfilter with add: only')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -1249,7 +1249,7 @@
             -->
             <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
             <!-- cross reference to DS6 docs -->
-            <testcase name="'ACI: Add: Add Entry - targattrfilter with add: statement false'">
+            <testcase name="getTestCaseName('Add Entry - targattrfilter with add: statement false')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -1357,7 +1357,7 @@
             -->
             <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
             <!-- cross reference to DS6 docs -->
-            <testcase name="'ACI: Add: Add Entry - Multi ACIs 1, overall deny'">
+            <testcase name="getTestCaseName('Add Entry - Multi ACIs 1, overall deny')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -1465,7 +1465,7 @@
             -->
             <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
             <!-- cross reference to DS6 docs -->
-            <testcase name="'ACI: Add: Add Entry - Multi ACIs 2, overall allow'">
+            <testcase name="getTestCaseName('Add Entry - Multi ACIs 2, overall allow')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -1576,7 +1576,7 @@
             -->
             <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
             <!-- cross reference to DS6 docs -->
-            <testcase name="'ACI: Add: Add Entry - Multi ACIs 3, mixed allow and deny'">
+            <testcase name="getTestCaseName('Add Entry - Multi ACIs 3, mixed allow and deny')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -1700,7 +1700,7 @@
             -->
             <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
             <!-- cross reference to DS6 docs -->
-            <testcase name="'ACI: Add: Add Entry - Multi ACIs 4, overall allow with many ACIs'">
+            <testcase name="getTestCaseName('Add Entry - Multi ACIs 4, overall allow with many ACIs')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -1811,7 +1811,7 @@
             -->
             <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
             <!-- cross reference to DS6 docs -->
-            <testcase name="'ACI: Add: Add Entry - Multi ACIs 5, mixed allow and deny with many ACIs'">
+            <testcase name="getTestCaseName('Add Entry - Multi ACIs 5, mixed allow and deny with many ACIs')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_bindtypes.xml b/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_bindtypes.xml
index 3b6dee4..6993705 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_bindtypes.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_bindtypes.xml
@@ -81,7 +81,7 @@
             -->
           <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
           <!-- cross reference to DS6 docs -->
-            <testcase name="'ACI: Bind Types: Preamble'">
+            <testcase name="getTestCaseName('Preamble')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                 <message>
@@ -265,7 +265,7 @@
                                             for all ldap operations, and
                                             and entry is returned only for step 1.
             -->
-            <testcase name="'ACI: Bind Types: groupdn equals one static group'">
+            <testcase name="getTestCaseName('groupdn equals one static group')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -470,7 +470,7 @@
                                             for all ldap operations, and
                                             and entry is returned only for steps 1 and 4.
             -->
-            <testcase name="'ACI: Bind Types: groupdn equals two static groups'">
+            <testcase name="getTestCaseName('groupdn equals two static groups')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -684,7 +684,7 @@
                                             for all ldap operations, and
                                             and entry is returned only for steps 1 and 3.
             -->
-            <testcase name="'ACI: Bind Types: groupdn not equals one static group'">
+            <testcase name="getTestCaseName('groupdn not equals one static group')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -898,7 +898,7 @@
                                             for all ldap operations, and
                                             and entry is returned only for step 3.
             -->
-            <testcase name="'ACI: Bind Types: groupdn not equals two static groups'">
+            <testcase name="getTestCaseName('groupdn not equals two static groups')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -1103,7 +1103,7 @@
                                             for all ldap operations, and
                                             and entry is returned only for step 1.
             -->
-            <testcase name="'ACI: Bind Types: groupdn equals one dynamic group'">
+            <testcase name="getTestCaseName('groupdn equals one dynamic group')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -1308,7 +1308,7 @@
                                             for all ldap operations, and
                                             and entry is returned only for steps 1 and 4.
             -->
-            <testcase name="'ACI: Bind Types: groupdn equals two dynamic groups'">
+            <testcase name="getTestCaseName('groupdn equals two dynamic groups')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -1522,7 +1522,7 @@
                                             for all ldap operations, and
                                             and entry is returned only for steps 1 and 3.
             -->
-            <testcase name="'ACI: Bind Types: groupdn not equals one dynamic group'">
+            <testcase name="getTestCaseName('groupdn not equals one dynamic group')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -1736,7 +1736,7 @@
                                             for all ldap operations, and
                                             and entry is returned only for step 3.
             -->
-            <testcase name="'ACI: Bind Types: groupdn not equals two dynamic groups'">
+            <testcase name="getTestCaseName('groupdn not equals two dynamic groups')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -1941,7 +1941,7 @@
                                             for all ldap operations, and
                                             no entries are returned for any step.
             -->
-            <testcase name="'ACI: Bind Types: groupdn equals one static group with wildcard'">
+            <testcase name="getTestCaseName('groupdn equals one static group with wildcard')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -2137,7 +2137,7 @@
                                             for all ldap operations, and
                                             and entry is returned only for steps 1 and 4.
             -->
-            <testcase name="'ACI: Bind Types: groupdn equals one static and one dynamic group'">
+            <testcase name="getTestCaseName('groupdn equals one static and one dynamic group')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -2352,7 +2352,7 @@
                                             for all ldap operations, and
                                             entry is returned only for step 3.
             -->
-            <testcase name="'ACI: Bind Types: groupdn - selfwrite add member'">
+            <testcase name="getTestCaseName('groupdn - selfwrite add member')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -2556,7 +2556,7 @@
                                             for all ldap operations and
                                             entry returned in step 4.
             -->
-            <testcase name="'ACI: Bind Types: groupdn - selfwrite delete member'">
+            <testcase name="getTestCaseName('groupdn - selfwrite delete member')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -2733,7 +2733,7 @@
                                             for all ldap operations,
                                             50 for step 2, and the entry is returned in step 4.
             -->
-            <testcase name="'ACI: Bind Types: groupdn - selfwrite replace member'">
+            <testcase name="getTestCaseName('groupdn - selfwrite replace member')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -2908,7 +2908,7 @@
                                             for all ldap operations,
                                             50 for step 2, and the entry is returned in step 4.
             -->
-            <testcase name="'ACI: Bind Types: groupdn - selfwrite add description'">
+            <testcase name="getTestCaseName('groupdn - selfwrite add description')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -3086,7 +3086,7 @@
                                             and entries is returned only for steps 1, 2, and 3.
                                             Attribute values returned only for steps 1, 2 and 3.
             -->
-            <testcase name="'ACI: Bind Types: userattr equals one attr'">
+            <testcase name="getTestCaseName('userattr equals one attr')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -3356,7 +3356,7 @@
                                             and entries is returned only for steps 1, 2, 3, 5 and 6.
                                             Attribute values returned only for steps 1, 2 and 6.
             -->
-            <testcase name="'ACI: Bind Types: userattr not equals one attr'">
+            <testcase name="getTestCaseName('userattr not equals one attr')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -3654,7 +3654,7 @@
                                             for all ldap operations, and
                                             and entries is returned only for step 1.
             -->
-            <testcase name="'ACI: Bind Types: userattr equals one attr with bindtype'">
+            <testcase name="getTestCaseName('userattr equals one attr with bindtype')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -3841,7 +3841,7 @@
                                             for all ldap operations, and
                                             and entries is returned only for step 1.
             -->
-            <testcase name="'ACI: Bind Types: userattr equals one attr with groupdn'">
+            <testcase name="getTestCaseName('userattr equals one attr with groupdn')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -4053,7 +4053,7 @@
                                             for all ldap operations, and
                                             and entries is returned only for step 1.
             -->
-            <testcase name="'ACI: Bind Types: userattr equals one attr with groupdn, url expression'">
+            <testcase name="getTestCaseName('userattr equals one attr with groupdn, url expression')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -4225,7 +4225,7 @@
                                             for all ldap operations, and
                                             and entries is returned only for step 1.
             -->
-            <testcase name="'ACI: Bind Types: inheritance with bindtype, deny children'">
+            <testcase name="getTestCaseName('inheritance with bindtype, deny children')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -4443,7 +4443,7 @@
                                             for all ldap operations, and
                                             and entries is returned only for steps 1 and 2.
             -->
-            <testcase name="'ACI: Bind Types: inheritance with bindtype, allow one child level'">
+            <testcase name="getTestCaseName('inheritance with bindtype, allow one child level')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -4660,7 +4660,7 @@
                                             for all ldap operations, and
                                             and entries is returned only for steps 1, 2, and 3.
             -->
-            <testcase name="'ACI: Bind Types: inheritance with bindtype, allow two child levels'">
+            <testcase name="getTestCaseName('inheritance with bindtype, allow two child levels')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -4876,7 +4876,7 @@
                                             for all ldap operations, and
                                             and entries is returned only for step 1.
             -->
-            <testcase name="'ACI: Bind Types: userattr equals one operational attr with bindtype'">
+            <testcase name="getTestCaseName('userattr equals one operational attr with bindtype')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -5036,7 +5036,7 @@
                 #@TestPostamble             none
                 #@TestResult                Success if OpenDS returns 21.
             -->
-            <testcase name="'ACI: Bind Types: groupdn with missing slash'">
+            <testcase name="getTestCaseName('groupdn with missing slash')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -5076,7 +5076,7 @@
                 #@TestPostamble             none
                 #@TestResult                Success if OpenDS returns 21.
             -->
-            <testcase name="'ACI: Bind Types: groupdn with single quote'">
+            <testcase name="getTestCaseName('groupdn with single quote')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -5116,7 +5116,7 @@
                 #@TestPostamble             none
                 #@TestResult                Success if OpenDS returns 21.
             -->
-            <testcase name="'ACI: Bind Types: groupdn with null value'">
+            <testcase name="getTestCaseName('groupdn with null value')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -5156,7 +5156,7 @@
                 #@TestPostamble             none
                 #@TestResult                Success if OpenDS returns 21.
             -->
-            <testcase name="'ACI: Bind Types: userdn with null value'">
+            <testcase name="getTestCaseName('userdn with null value')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -5196,7 +5196,7 @@
                 #@TestPostamble             none
                 #@TestResult                Success if OpenDS returns 21.
             -->
-            <testcase name="'ACI: Bind Types: userattr with null value'">
+            <testcase name="getTestCaseName('userattr with null value')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -5236,7 +5236,7 @@
                 #@TestPostamble             none
                 #@TestResult                Success if OpenDS returns 21.
             -->
-            <testcase name="'ACI: Bind Types: roledn'">
+            <testcase name="getTestCaseName('roledn')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -5282,7 +5282,7 @@
                                             for all ldap operations, and
                                             and entry is returned only for step 1.
             -->
-            <testcase name="'ACI: Bind Types: groupdn equals userdn with filter'">
+            <testcase name="getTestCaseName('groupdn equals userdn with filter')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -5441,7 +5441,7 @@
             #@TestResult                Success if OpenDS returns 0 for all ldap operations.
                                         Entry returned for step 3.
         -->
-        <testcase name="'ACI: Bind Types: authmethod equals none'">
+        <testcase name="getTestCaseName('authmethod equals none')">
           <sequence>
             <call function="'testCase_Preamble'"/>
 
@@ -5580,7 +5580,7 @@
           -->
         <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
         <!-- cross reference to DS6 docs -->
-          <testcase name="'ACI: Bind Types Postamble'">
+          <testcase name="getTestCaseName('Bind Types Postamble')">
             <sequence>
               <call function="'testCase_Preamble'"/>
                 <message>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_compare_tests.xml b/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_compare_tests.xml
index 616f167..5ac5df6 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_compare_tests.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_compare_tests.xml
@@ -73,7 +73,7 @@
             -->
           <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
           <!-- cross reference to DS6 docs -->
-            <testcase name="'ACI: Compare: Preamble'">
+            <testcase name="getTestCaseName('Preamble')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                 <message>
@@ -116,7 +116,7 @@
             -->
             <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
             <!-- cross reference to DS6 docs -->
-            <testcase name="'ACI: Compare: Compare Attr - userdn equals all'">
+            <testcase name="getTestCaseName('Compare Attr - userdn equals all')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -240,7 +240,7 @@
             -->
             <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
             <!-- cross reference to DS6 docs -->
-            <testcase name="'ACI: Compare: Compare Attr - userdn not equals a dn'">
+            <testcase name="getTestCaseName('Compare Attr - userdn not equals a dn')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -377,7 +377,7 @@
             -->
             <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
             <!-- cross reference to DS6 docs -->
-            <testcase name="'ACI: Compare: Compare Attr - userdn equals a branch dn'">
+            <testcase name="getTestCaseName('Compare Attr - userdn equals a branch dn')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -505,7 +505,7 @@
             -->
             <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
             <!-- cross reference to DS6 docs -->
-            <testcase name="'ACI: Compare: Compare Attr - userdn not equals a branch dn'">
+            <testcase name="getTestCaseName('Compare Attr - userdn not equals a branch dn')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -655,7 +655,7 @@
             -->
             <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
             <!-- cross reference to DS6 docs -->
-            <testcase name="'ACI: Compare: Compare Attr - userdn equals two dns'">
+            <testcase name="getTestCaseName('Compare Attr - userdn equals two dns')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -803,7 +803,7 @@
             -->
             <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
             <!-- cross reference to DS6 docs -->
-            <testcase name="'ACI: Compare: Compare Attr - userdn not equals two dns'">
+            <testcase name="getTestCaseName('Compare Attr - userdn not equals two dns')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -927,7 +927,7 @@
             -->
             <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
             <!-- cross reference to DS6 docs -->
-            <testcase name="'ACI: Compare: Compare Attr - compare not allowed'">
+            <testcase name="getTestCaseName('Compare Attr - compare not allowed')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -1040,7 +1040,7 @@
             -->
             <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
             <!-- cross reference to DS6 docs -->
-            <testcase name="'ACI: Compare: Compare Attr - targetattr with one attribute'">
+            <testcase name="getTestCaseName('Compare Attr - targetattr with one attribute')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -1179,7 +1179,7 @@
             -->
             <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
             <!-- cross reference to DS6 docs -->
-            <testcase name="'ACI: Compare: Compare Attr - targetfilter with one statement'">
+            <testcase name="getTestCaseName('Compare Attr - targetfilter with one statement')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -1318,7 +1318,7 @@
             -->
             <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
             <!-- cross reference to DS6 docs -->
-            <testcase name="'ACI: Compare: Compare Attr - targetattrfilter with add:,del:'">
+            <testcase name="getTestCaseName('Compare Attr - targetattrfilter with add:,del:')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -1468,7 +1468,7 @@
             -->
             <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
             <!-- cross reference to DS6 docs -->
-            <testcase name="'ACI: Compare: Compare Attr - targetattrfilter with add:,del:, returns false'">
+            <testcase name="getTestCaseName('Compare Attr - targetattrfilter with add:,del:, returns false')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -1614,7 +1614,7 @@
             -->
             <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
             <!-- cross reference to DS6 docs -->
-            <testcase name="'ACI: Compare: Compare Attr - Multi ACIs 1, overall deny'">
+            <testcase name="getTestCaseName('Compare Attr - Multi ACIs 1, overall deny')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -1710,7 +1710,7 @@
             -->
             <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
             <!-- cross reference to DS6 docs -->
-            <testcase name="'ACI: Compare: Compare Attr - Multi ACIs 2, overall allow'">
+            <testcase name="getTestCaseName('Compare Attr - Multi ACIs 2, overall allow')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -1811,7 +1811,7 @@
             -->
             <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
             <!-- cross reference to DS6 docs -->
-            <testcase name="'ACI: Compare: Postamble'">
+            <testcase name="getTestCaseName('Postamble')">
             <sequence>
               <call function="'testCase_Preamble'"/>
                 <message>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_delete_entry.xml b/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_delete_entry.xml
index 45fc96a..987273c 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_delete_entry.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_delete_entry.xml
@@ -76,7 +76,7 @@
             -->
           <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
           <!-- cross reference to DS6 docs -->
-            <testcase name="'ACI: Delete: Preamble'">
+            <testcase name="getTestCaseName('Preamble')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                 <message>
@@ -160,7 +160,7 @@
             <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
             <!-- cross reference to DS6 docs -->
             <!-- cross reference to deladd.ksh Test Cases tp1 and tp3 -->
-            <testcase name="'ACI: Delete: Delete Entry - userdn equals all'">
+            <testcase name="getTestCaseName('Delete Entry - userdn equals all')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -288,7 +288,7 @@
             <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
             <!-- cross reference to DS6 docs -->
             <!-- cross reference to deladd.ksh Test Cases tp4 -->
-            <testcase name="'ACI: Delete: Delete Entry - userdn equals a dn'">
+            <testcase name="getTestCaseName('Delete Entry - userdn equals a dn')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -430,7 +430,7 @@
             <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
             <!-- cross reference to DS6 docs -->
             <!-- cross reference to deladd.ksh Test Cases tp4 -->
-            <testcase name="'ACI: Delete: Delete Entry - userdn not equals a dn'">
+            <testcase name="getTestCaseName('Delete Entry - userdn not equals a dn')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -568,7 +568,7 @@
             <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
             <!-- cross reference to DS6 docs -->
             <!-- cross reference to deladd.ksh Test Cases tp1 and tp3 -->
-            <testcase name="'ACI: Delete: Delete Entry - delete not allowed'">
+            <testcase name="getTestCaseName('Delete Entry - delete not allowed')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -664,7 +664,7 @@
             -->
             <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
             <!-- cross reference to DS6 docs -->
-            <testcase name="'ACI: Delete: Delete Entry - targetfilter equals one statement'">
+            <testcase name="getTestCaseName('Delete Entry - targetfilter equals one statement')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -788,7 +788,7 @@
             -->
             <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
             <!-- cross reference to DS6 docs -->
-            <testcase name="'ACI: Delete: Delete Entry - targetfilter equals three statements (or) all false'">
+            <testcase name="getTestCaseName('Delete Entry - targetfilter equals three statements (or) all false')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -896,7 +896,7 @@
             -->
             <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
             <!-- cross reference to DS6 docs -->
-            <testcase name="'ACI: Delete: Delete Entry - targetfilter not equals three statements (or) all false'">
+            <testcase name="getTestCaseName('Delete Entry - targetfilter not equals three statements (or) all false')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -1006,7 +1006,7 @@
             -->
             <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
             <!-- cross reference to DS6 docs -->
-            <testcase name="'ACI: Delete: Delete Entry - targetfilter equals three statements (and) all true'">
+            <testcase name="getTestCaseName('Delete Entry - targetfilter equals three statements (and) all true')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -1116,7 +1116,7 @@
             -->
             <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
             <!-- cross reference to DS6 docs -->
-            <testcase name="'ACI: Delete: Delete Entry - targetfilter contains attribute not present'">
+            <testcase name="getTestCaseName('Delete Entry - targetfilter contains attribute not present')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -1226,7 +1226,7 @@
             -->
             <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
             <!-- cross reference to DS6 docs -->
-            <testcase name="'ACI: Delete: Delete Entry - targetattr equals three attributes'">
+            <testcase name="getTestCaseName('Delete Entry - targetattr equals three attributes')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -1336,7 +1336,7 @@
             -->
             <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
             <!-- cross reference to DS6 docs -->
-            <testcase name="'ACI: Delete: Delete Entry - targetattr equals attribute not present'">
+            <testcase name="getTestCaseName('Delete Entry - targetattr equals attribute not present')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -1447,7 +1447,7 @@
             -->
             <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
             <!-- cross reference to DS6 docs -->
-            <testcase name="'ACI: Delete: Delete Entry - targetattr equals attr value'">
+            <testcase name="getTestCaseName('Delete Entry - targetattr equals attr value')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -1557,7 +1557,7 @@
             -->
             <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
             <!-- cross reference to DS6 docs -->
-            <testcase name="'ACI: Delete: Delete Entry - delete branch'">
+            <testcase name="getTestCaseName('Delete Entry - delete branch')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -1697,7 +1697,7 @@
             -->
             <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
             <!-- cross reference to DS6 docs -->
-            <testcase name="'ACI: Delete: Delete Entry - multi ACIs 1, overall deny'">
+            <testcase name="getTestCaseName('Delete Entry - multi ACIs 1, overall deny')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -1805,7 +1805,7 @@
             -->
             <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
             <!-- cross reference to DS6 docs -->
-            <testcase name="'ACI: Delete: Delete Entry - multi ACIs 2, overall allow'">
+            <testcase name="getTestCaseName('Delete Entry - multi ACIs 2, overall allow')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -1916,7 +1916,7 @@
             -->
             <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
             <!-- cross reference to DS6 docs -->
-            <testcase name="'ACI: Delete: Delete Entry - multi ACIs 3, mixed allow and deny'">
+            <testcase name="getTestCaseName('Delete Entry - multi ACIs 3, mixed allow and deny')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -2040,7 +2040,7 @@
             -->
             <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
             <!-- cross reference to DS6 docs -->
-            <testcase name="'ACI: Delete: Delete Entry - multi ACIs 4, overall allow with many ACIs'">
+            <testcase name="getTestCaseName('Delete Entry - multi ACIs 4, overall allow with many ACIs')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -2151,7 +2151,7 @@
             -->
             <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
             <!-- cross reference to DS6 docs -->
-            <testcase name="'ACI: Delete: Delete Entry - multi ACIs 5, mixed allow and deny with many ACIs'">
+            <testcase name="getTestCaseName('Delete Entry - multi ACIs 5, mixed allow and deny with many ACIs')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -2272,7 +2272,7 @@
             -->
           <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
           <!-- cross reference to DS6 docs -->
-            <testcase name="'ACI: Delete: Postamble'">
+            <testcase name="getTestCaseName('Postamble')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                 <message>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_effective_rights.xml b/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_effective_rights.xml
index 87bdd49..dd90c15 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_effective_rights.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_effective_rights.xml
@@ -71,7 +71,7 @@
                 #@TestResult                Success if OpenDS returns 0
                                             for all operations.
             -->
-            <testcase name="'ACI: Effective Rights: Preamble'">
+            <testcase name="getTestCaseName('Preamble')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
 
@@ -144,7 +144,7 @@
                                             for all ldap operations, and
                                             proper entries are returned for all steps.
             -->
-            <testcase name="'ACI: Effective Rights: Basic - wildcard'">
+            <testcase name="getTestCaseName('Basic - wildcard')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -222,7 +222,7 @@
                                             for all ldap operations, and
                                             no entries are returned for any step.
             -->
-            <testcase name="'ACI: Effective Rights: Basic - read'">
+            <testcase name="getTestCaseName('Basic - read')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -386,7 +386,7 @@
             -->
           <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
           <!-- cross reference to DS6 docs -->
-            <testcase name="'ACI: Effective Rights: Basic - search'">
+            <testcase name="getTestCaseName('Basic - search')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -552,7 +552,7 @@
                                             Also, for step 1, the entryLevel permission is 1 for read,
                                             and the attributeLevel permissions are 1 for search and read for uid and roomnumber. 
             -->
-            <testcase name="'ACI: Effective Rights: Basic - search-read'">
+            <testcase name="getTestCaseName('Basic - search-read')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -780,7 +780,7 @@
                                             Also, for step 1, the entryLevel permission is 1 for read,
                                             and the attributeLevel permissions are 1 for search and read for uid and roomnumber. 
             -->
-            <testcase name="'ACI: Effective Rights: Basic - search-read, separate ACIs'">
+            <testcase name="getTestCaseName('Basic - search-read, separate ACIs')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -943,7 +943,7 @@
                                             Also, for step 1, the entryLevel permission is 1 for read,
                                             and the attributeLevel permissions are 1 for search, read and compare for uid and roomnumber. 
             -->
-            <testcase name="'ACI: Effective Rights: Basic - compare'">
+            <testcase name="getTestCaseName('Basic - compare')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -1106,7 +1106,7 @@
                                             Also, for step 1, the entryLevel permission is 1 for read,
                                             and the attributeLevel permissions are 1 for search and read for uid and roomnumber. 
             -->
-            <testcase name="'ACI: Effective Rights: Basic - add'">
+            <testcase name="getTestCaseName('Basic - add')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -1274,7 +1274,7 @@
                                             Also, for step 1, the entryLevel permission is 1 for read and delete,
                                             and the attributeLevel permissions are 1 for search and read for uid and roomnumber. 
             -->
-            <testcase name="'ACI: Effective Rights: Basic - delete'">
+            <testcase name="getTestCaseName('Basic - delete')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -1442,7 +1442,7 @@
                                             Also, for step 1, the entryLevel permission is 1 for read and write,
                                             and the attributeLevel permissions are 1 for search, read, write, selfwrite_add and selfwrite_delete for uid and roomnumber. 
             -->
-            <testcase name="'ACI: Effective Rights: Basic - write'">
+            <testcase name="getTestCaseName('Basic - write')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -1610,7 +1610,7 @@
                                             Also, for step 1, the entryLevel permission is 1 for read and proxy,
                                             and the attributeLevel permissions are 1 for search, read, and proxy for uid and roomnumber. 
             -->
-            <testcase name="'ACI: Effective Rights: Basic - proxy'">
+            <testcase name="getTestCaseName('Basic - proxy')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -1778,7 +1778,7 @@
                                             Also, for step 1, the entryLevel permission is 1 for read and write,
                                             and the attributeLevel permissions are 1 for search, read, selfwrite_add and selfwrite_delete for uid and roomnumber. 
             -->
-            <testcase name="'ACI: Effective Rights: Basic - selfwrite'">
+            <testcase name="getTestCaseName('Basic - selfwrite')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -1948,7 +1948,7 @@
             -->
           <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
           <!-- cross reference to DS6 docs -->
-            <testcase name="'ACI: Effective Rights: Basic - all'">
+            <testcase name="getTestCaseName('Basic - all')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -2116,7 +2116,7 @@
                                             Also, for step 1, the entryLevel permission is 1 for read,
                                             and the attributeLevel permissions are 1 for search and read for uid and roomnumber. 
             -->
-            <testcase name="'ACI: Effective Rights: Basic - export'">
+            <testcase name="getTestCaseName('Basic - export')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -2279,7 +2279,7 @@
                                             Also, for step 1, the entryLevel permission is 1 for read,
                                             and the attributeLevel permissions are 1 for search and read for uid and roomnumber. 
             -->
-            <testcase name="'ACI: Effective Rights: Basic - import'">
+            <testcase name="getTestCaseName('Basic - import')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -2443,7 +2443,7 @@
                                             the attributeLevel permissions are 1 for search and read for roomnumber, 
                                             and all attribute permissions are 0 for uid.
             -->
-            <testcase name="'ACI: Effective Rights: targetattr with search,read'">
+            <testcase name="getTestCaseName('targetattr with search,read')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -2607,7 +2607,7 @@
                                             the attributeLevel permissions are 1 for search and read for uid, 
                                             and all attribute permissions are 0 for roomnumber.
             -->
-            <testcase name="'ACI: Effective Rights: targetattr with not equal and search,read'">
+            <testcase name="getTestCaseName('targetattr with not equal and search,read')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -2771,7 +2771,7 @@
                                             are returned.
             -->
             <!--
-            <testcase name="'ACI: Effective Rights: targetattr with not equal and search,read - aclRightsInfo'">
+            <testcase name="getTestCaseName('targetattr with not equal and search,read - aclRightsInfo')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -3020,7 +3020,7 @@
                 #@TestResult                Success if OpenDS returns 0
                                             for all operations.
             -->
-            <testcase name="'ACI: Effective Rights: Postamble'">
+            <testcase name="getTestCaseName('Postamble')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
 
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_import.xml b/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_import.xml
index 406175c..019d395 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_import.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_import.xml
@@ -81,7 +81,7 @@
                                             for all other ldap operations. 
                                             Proper entries returned for searches.
             -->
-          <testcase name="'ACI: Import: import-ldif with bad ACI'">
+          <testcase name="getTestCaseName('import-ldif with bad ACI')">
     
             <sequence>
     
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_entry.xml b/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_entry.xml
index f9b0829..5b9b1a0 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_entry.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_entry.xml
@@ -74,7 +74,7 @@
             -->
           <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
           <!-- cross reference to DS6 docs -->
-            <testcase name="'ACI: Modify: Preamble'">
+            <testcase name="getTestCaseName('Preamble')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                 <message>
@@ -121,7 +121,7 @@
             <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
             <!-- cross reference to DS6 docs -->
             <!-- cross reference to modify.ksh Test Cases tp3 -->
-            <testcase name="'ACI: Modify: Modify Attribute Value - userdn equals all'">
+            <testcase name="getTestCaseName('Modify Attribute Value - userdn equals all')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -233,7 +233,7 @@
             <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
             <!-- cross reference to DS6 docs -->
             <!-- cross reference to modify.ksh Test Cases tp1 and tp2 -->
-            <testcase name="'ACI: Modify: Modify Attribute Value - targetattr equals three attributes'">
+            <testcase name="getTestCaseName('Modify Attribute Value - targetattr equals three attributes')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -359,7 +359,7 @@
             <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
             <!-- cross reference to DS6 docs -->
             <!-- cross reference to modify.ksh Test Cases tp1 and tp2 -->
-            <testcase name="'ACI: Modify: Modify Attribute Value - targetattr not equals three attributes'">
+            <testcase name="getTestCaseName('Modify Attribute Value - targetattr not equals three attributes')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -483,7 +483,7 @@
             -->
             <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
             <!-- cross reference to DS6 docs -->
-            <testcase name="'ACI: Modify: Modify Attribute Value - write not allowed'">
+            <testcase name="getTestCaseName('Modify Attribute Value - write not allowed')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -609,7 +609,7 @@
             <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
             <!-- cross reference to DS6 docs -->
             <!-- cross reference to modify.ksh Test Cases tp1 and tp2 -->
-            <testcase name="'ACI: Modify: Modify Attribute Value - targetattr and targattrfilter'">
+            <testcase name="getTestCaseName('Modify Attribute Value - targetattr and targattrfilter')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -762,7 +762,7 @@
             -->
             <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
             <!-- cross reference to DS6 docs -->
-            <testcase name="'ACI: Modify: Modify Attribute Value - targetfilter with three statements with or, one statement true'">
+            <testcase name="getTestCaseName('Modify Attribute Value - targetfilter with three statements with or, one statement true')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -887,7 +887,7 @@
             -->
             <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
             <!-- cross reference to DS6 docs -->
-            <testcase name="'ACI: Modify: Modify Attribute Value - targetfilter not equals three statements with and, all statements true '">
+            <testcase name="getTestCaseName('Modify Attribute Value - targetfilter not equals three statements with and, all statements true ')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -1011,7 +1011,7 @@
             -->
             <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
             <!-- cross reference to DS6 docs -->
-            <testcase name="'ACI: Modify: Modify Attribute Value - multiple ACIs 1, overall deny'">
+            <testcase name="getTestCaseName('Modify Attribute Value - multiple ACIs 1, overall deny')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -1119,7 +1119,7 @@
             -->
             <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
             <!-- cross reference to DS6 docs -->
-            <testcase name="'ACI: Modify: Modify Attribute Value - multiple ACIs 2, overall allow '">
+            <testcase name="getTestCaseName('Modify Attribute Value - multiple ACIs 2, overall allow ')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -1230,7 +1230,7 @@
             -->
             <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
             <!-- cross reference to DS6 docs -->
-            <testcase name="'ACI: Modify: Modify Attribute Value - multiple ACIs 3, mixed allow and deny '">
+            <testcase name="getTestCaseName('Modify Attribute Value - multiple ACIs 3, mixed allow and deny ')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -1354,7 +1354,7 @@
             -->
             <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
             <!-- cross reference to DS6 docs -->
-            <testcase name="'ACI: Modify: Modify Attribute Value - multiple ACIs 4, overall allow with many ACIs'">
+            <testcase name="getTestCaseName('Modify Attribute Value - multiple ACIs 4, overall allow with many ACIs')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -1465,7 +1465,7 @@
             -->
             <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
             <!-- cross reference to DS6 docs -->
-            <testcase name="'ACI: Modify: Modify Attribute Value - multiple ACIs 5, mixed allow and deny with many ACIs'">
+            <testcase name="getTestCaseName('Modify Attribute Value - multiple ACIs 5, mixed allow and deny with many ACIs')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -1591,7 +1591,7 @@
             -->
             <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
             <!-- cross reference to DS6 docs -->
-            <testcase name="'ACI: Modify: Delete Attribute Value - userdn equals dn'">
+            <testcase name="getTestCaseName('Delete Attribute Value - userdn equals dn')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -1717,7 +1717,7 @@
             <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
             <!-- cross reference to DS6 docs -->
             <!-- cross reference to modify.ksh Test Cases tp1 and tp2 -->
-            <testcase name="'ACI: Modify: Delete Attribute Value - targetattr equals one attribute'">
+            <testcase name="getTestCaseName('Delete Attribute Value - targetattr equals one attribute')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -1843,7 +1843,7 @@
             <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
             <!-- cross reference to DS6 docs -->
             <!-- cross reference to modify.ksh Test Cases tp1 and tp2 -->
-            <testcase name="'ACI: Modify: Delete Attribute Value - targetattr not equals one attribute'">
+            <testcase name="getTestCaseName('Delete Attribute Value - targetattr not equals one attribute')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -1967,7 +1967,7 @@
             -->
             <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
             <!-- cross reference to DS6 docs -->
-            <testcase name="'ACI: Modify: Delete Attribute Value - write not allowed'">
+            <testcase name="getTestCaseName('Delete Attribute Value - write not allowed')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -2092,7 +2092,7 @@
             -->
             <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
             <!-- cross reference to DS6 docs -->
-            <testcase name="'ACI: Modify: Delete Attribute Value - targetattr and targattrfilter'">
+            <testcase name="getTestCaseName('Delete Attribute Value - targetattr and targattrfilter')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -2247,7 +2247,7 @@
             -->
             <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
             <!-- cross reference to DS6 docs -->
-            <testcase name="'ACI: Modify: Delete Attribute Value - targetfilter with three statements with or, none true'">
+            <testcase name="getTestCaseName('Delete Attribute Value - targetfilter with three statements with or, none true')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -2354,7 +2354,7 @@
             -->
             <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
             <!-- cross reference to DS6 docs -->
-            <testcase name="'ACI: Modify: Delete Attribute Value - targetfilter equals three statements with and, all statements false'">
+            <testcase name="getTestCaseName('Delete Attribute Value - targetfilter equals three statements with and, all statements false')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -2464,7 +2464,7 @@
             -->
             <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
             <!-- cross reference to DS6 docs -->
-            <testcase name="'ACI: Modify: Add Attribute Value - userdn not equals dn'">
+            <testcase name="getTestCaseName('Add Attribute Value - userdn not equals dn')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -2590,7 +2590,7 @@
             <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
             <!-- cross reference to DS6 docs -->
             <!-- cross reference to modify.ksh Test Cases tp1 and tp2 -->
-            <testcase name="'ACI: Modify: Add Attribute Value - targetattr equals one attribute not present'">
+            <testcase name="getTestCaseName('Add Attribute Value - targetattr equals one attribute not present')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -2717,7 +2717,7 @@
             <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
             <!-- cross reference to DS6 docs -->
             <!-- cross reference to modify.ksh Test Cases tp1 and tp2 -->
-            <testcase name="'ACI: Modify: Add Attribute Value - targetattr not equals attribute, add multi-values'">
+            <testcase name="getTestCaseName('Add Attribute Value - targetattr not equals attribute, add multi-values')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -2857,7 +2857,7 @@
             -->
             <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
             <!-- cross reference to DS6 docs -->
-            <testcase name="'ACI: Modify: Add Attribute Value - write not allowed'">
+            <testcase name="getTestCaseName('Add Attribute Value - write not allowed')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -2982,7 +2982,7 @@
             -->
             <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
             <!-- cross reference to DS6 docs -->
-            <testcase name="'ACI: Modify: Add Attribute Value - targetattr and targattrfilter'">
+            <testcase name="getTestCaseName('Add Attribute Value - targetattr and targattrfilter')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -3135,7 +3135,7 @@
             -->
             <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
             <!-- cross reference to DS6 docs -->
-            <testcase name="'ACI: Modify: Add Attribute Value - targetfilter not equals three statements with or, none true'">
+            <testcase name="getTestCaseName('Add Attribute Value - targetfilter not equals three statements with or, none true')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -3244,7 +3244,7 @@
             -->
             <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
             <!-- cross reference to DS6 docs -->
-            <testcase name="'ACI: Modify: Add Attribute Value - targetfilter not equals three statements with and, all statements false'">
+            <testcase name="getTestCaseName('Add Attribute Value - targetfilter not equals three statements with and, all statements false')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -3350,7 +3350,7 @@
             -->
             <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
             <!-- cross reference to DS6 docs -->
-            <testcase name="'ACI: Modify: Postamble'">
+            <testcase name="getTestCaseName('Postamble')">
             <sequence>
               <call function="'testCase_Preamble'"/>
                 <message>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci1.xml b/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci1.xml
index b3271a2..3a1a91f 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci1.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci1.xml
@@ -45,7 +45,7 @@
       
           <call function="'testSuite_Preamble'"/>
           
-            <testcase name="'ACI: Modify Filter: ACI 1'">
+            <testcase name="getTestCaseName('ACI 1')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                 <message>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci11.xml b/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci11.xml
index c6f977e..f2bd0af 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci11.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci11.xml
@@ -43,7 +43,7 @@
       
           <call function="'testSuite_Preamble'"/>
           
-            <testcase name="'ACI: Modify Filter: ACI 11'">
+            <testcase name="getTestCaseName('ACI 11')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                 <message>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci12.xml b/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci12.xml
index a5d996e..597d0e2 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci12.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci12.xml
@@ -43,7 +43,7 @@
       
           <call function="'testSuite_Preamble'"/>
           
-            <testcase name="'ACI: Modify Filter: ACI 12'">
+            <testcase name="getTestCaseName('ACI 12')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                 <message>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci13.xml b/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci13.xml
index a13b974..17c32c9 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci13.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci13.xml
@@ -43,7 +43,7 @@
       
           <call function="'testSuite_Preamble'"/>
           
-            <testcase name="'ACI: Modify Filter: ACI 13'">
+            <testcase name="getTestCaseName('ACI 13')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                 <message>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci14.xml b/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci14.xml
index 97704eb..60f095e 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci14.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci14.xml
@@ -43,7 +43,7 @@
       
           <call function="'testSuite_Preamble'"/>
           
-            <testcase name="'ACI: Modify Filter: ACI 14'">
+            <testcase name="getTestCaseName('ACI 14')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                 <message>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci15.xml b/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci15.xml
index 3ab0f71..580991d 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci15.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci15.xml
@@ -43,7 +43,7 @@
       
           <call function="'testSuite_Preamble'"/>
           
-            <testcase name="'ACI: Modify Filter: ACI 15'">
+            <testcase name="getTestCaseName('ACI 15')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                 <message>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci16.xml b/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci16.xml
index ce56fbf..ecbc3c9 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci16.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci16.xml
@@ -43,7 +43,7 @@
       
           <call function="'testSuite_Preamble'"/>
           
-            <testcase name="'ACI: Modify Filter: ACI 16'">
+            <testcase name="getTestCaseName('ACI 16')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                 <message>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci2.xml b/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci2.xml
index 8380e3d..5e41dcf 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci2.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci2.xml
@@ -43,7 +43,7 @@
       
           <call function="'testSuite_Preamble'"/>
           
-            <testcase name="'ACI: Modify Filter: ACI 2'">
+            <testcase name="getTestCaseName('ACI 2')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                 <message>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci21.xml b/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci21.xml
index 9349676..3e75492 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci21.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci21.xml
@@ -43,7 +43,7 @@
       
           <call function="'testSuite_Preamble'"/>
           
-            <testcase name="'ACI: Modify Filter: ACI 21'">
+            <testcase name="getTestCaseName('ACI 21')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                 <message>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci22.xml b/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci22.xml
index 11ef22f..cd79f9f 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci22.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci22.xml
@@ -43,7 +43,7 @@
       
           <call function="'testSuite_Preamble'"/>
           
-            <testcase name="'ACI: Modify Filter: ACI 22'">
+            <testcase name="getTestCaseName('ACI 22')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                 <message>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci23.xml b/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci23.xml
index 5ee970a..654acb2 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci23.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci23.xml
@@ -43,7 +43,7 @@
       
           <call function="'testSuite_Preamble'"/>
           
-            <testcase name="'ACI: Modify Filter: ACI 23'">
+            <testcase name="getTestCaseName('ACI 23')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                 <message>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci24.xml b/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci24.xml
index 2659823..c717ead 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci24.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci24.xml
@@ -43,7 +43,7 @@
       
           <call function="'testSuite_Preamble'"/>
           
-            <testcase name="'ACI: Modify Filter: ACI 24'">
+            <testcase name="getTestCaseName('ACI 24')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                 <message>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci25.xml b/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci25.xml
index b2a0aa5..783d0a0 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci25.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci25.xml
@@ -43,7 +43,7 @@
       
           <call function="'testSuite_Preamble'"/>
           
-            <testcase name="'ACI: Modify Filter: ACI 25'">
+            <testcase name="getTestCaseName('ACI 25')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                 <message>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci26.xml b/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci26.xml
index 7bc1167..327fab9 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci26.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci26.xml
@@ -43,7 +43,7 @@
       
           <call function="'testSuite_Preamble'"/>
           
-            <testcase name="'ACI: Modify Filter: ACI 26'">
+            <testcase name="getTestCaseName('ACI 26')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                 <message>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci3.xml b/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci3.xml
index a6c14da..2fa826b 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci3.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci3.xml
@@ -43,7 +43,7 @@
       
           <call function="'testSuite_Preamble'"/>
           
-            <testcase name="'ACI: Modify Filter: ACI 3'">
+            <testcase name="getTestCaseName('ACI 3')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                 <message>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci4.xml b/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci4.xml
index e097a2a..c4c6391 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci4.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci4.xml
@@ -43,7 +43,7 @@
       
           <call function="'testSuite_Preamble'"/>
           
-            <testcase name="'ACI: Modify Filter: ACI 4'">
+            <testcase name="getTestCaseName('ACI 4')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                 <message>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci5.xml b/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci5.xml
index df12e8d..fd9646f 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci5.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci5.xml
@@ -43,7 +43,7 @@
       
           <call function="'testSuite_Preamble'"/>
           
-            <testcase name="'ACI: Modify Filter: ACI 5'">
+            <testcase name="getTestCaseName('ACI 5')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                 <message>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci6.xml b/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci6.xml
index c9f09e7..8858086 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci6.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci6.xml
@@ -43,7 +43,7 @@
       
           <call function="'testSuite_Preamble'"/>
           
-            <testcase name="'ACI: Modify Filter: ACI 6'">
+            <testcase name="getTestCaseName('ACI 6')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                 <message>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_rdn.xml b/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_rdn.xml
index 1b32e9c..4484be5 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_rdn.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_modify_rdn.xml
@@ -75,7 +75,7 @@
             -->
           <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
           <!-- cross reference to DS6 docs -->
-            <testcase name="'ACI: Modify RDN: Preamble'">
+            <testcase name="getTestCaseName('Preamble')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                 <message>
@@ -123,7 +123,7 @@
             <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
             <!-- cross reference to DS6 docs -->
             <!-- cross reference to modrdn.ksh -->
-            <testcase name="'ACI: Modify RDN: Leaf - targetattr=* and userdn=all'">
+            <testcase name="getTestCaseName('Leaf - targetattr=* and userdn=all')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -280,7 +280,7 @@
             <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
             <!-- cross reference to DS6 docs -->
             <!-- cross reference to modrdn.ksh -->
-            <testcase name="'ACI: Modify RDN: Branch - targetattr=* and userdn=all'">
+            <testcase name="getTestCaseName('Branch - targetattr=* and userdn=all')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -452,7 +452,7 @@
             <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
             <!-- cross reference to DS6 docs -->
             <!-- cross reference to modrdn.ksh -->
-            <testcase name="'ACI: Modify RDN: Leaf - targetattr equals three attributes with uid'">
+            <testcase name="getTestCaseName('Leaf - targetattr equals three attributes with uid')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -606,7 +606,7 @@
             <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
             <!-- cross reference to DS6 docs -->
             <!-- cross reference to modrdn.ksh -->
-            <testcase name="'ACI: Modify RDN: Leaf - targetattr equals three attributes without uid'">
+            <testcase name="getTestCaseName('Leaf - targetattr equals three attributes without uid')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -718,7 +718,7 @@
             <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
             <!-- cross reference to DS6 docs -->
             <!-- cross reference to modrdn.ksh -->
-            <testcase name="'ACI: Modify RDN: Branch - targetattr with three attributes equals ou'">
+            <testcase name="getTestCaseName('Branch - targetattr with three attributes equals ou')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -887,7 +887,7 @@
             <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
             <!-- cross reference to DS6 docs -->
             <!-- cross reference to modrdn.ksh -->
-            <testcase name="'ACI: Modify RDN: Branch - targetattr with three attributes not equals ou'">
+            <testcase name="getTestCaseName('Branch - targetattr with three attributes not equals ou')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -999,7 +999,7 @@
             <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
             <!-- cross reference to DS6 docs -->
             <!-- cross reference to modrdn.ksh -->
-            <testcase name="'ACI: Modify RDN: Leaf - Multi ACIs, allow and deny'">
+            <testcase name="getTestCaseName('Leaf - Multi ACIs, allow and deny')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -1172,7 +1172,7 @@
             <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
             <!-- cross reference to DS6 docs -->
             <!-- cross reference to modrdn.ksh -->
-            <testcase name="'ACI: Modify RDN: Branch - Multi ACIs, deny write on new branch'">
+            <testcase name="getTestCaseName('Branch - Multi ACIs, deny write on new branch')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -1372,7 +1372,7 @@
             <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
             <!-- cross reference to DS6 docs -->
             <!-- cross reference to modrdn.ksh -->
-            <testcase name="'ACI: Modify RDN: Leaf - targetattr with three attributes not equals uid, delete old rdn'">
+            <testcase name="getTestCaseName('Leaf - targetattr with three attributes not equals uid, delete old rdn')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -1484,7 +1484,7 @@
             <!-- cross reference to DS6 docs -->
             <!-- cross reference to modrdn.ksh -->
      
-            <testcase name="'ACI: Modify RDN: Leaf - targetattr with three attributes not equals uid, dont delete old rdn'">
+            <testcase name="getTestCaseName('Leaf - targetattr with three attributes not equals uid, dont delete old rdn')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -1640,7 +1640,7 @@
             <!-- cross reference to DS6 docs -->
             <!-- cross reference to modrdn.ksh -->
      
-            <testcase name="'ACI: Modify RDN: Leaf - targetattr with three attributes not equals sn and cn, dont delete old rdn'">
+            <testcase name="getTestCaseName('Leaf - targetattr with three attributes not equals sn and cn, dont delete old rdn')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -1752,7 +1752,7 @@
             <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
             <!-- cross reference to DS6 docs -->
             <!-- cross reference to modrdn.ksh -->
-            <testcase name="'ACI: Modify RDN: Branch - Multi ACIs, targattrfilters add:ou, del:ou'">
+            <testcase name="getTestCaseName('Branch - Multi ACIs, targattrfilters add:ou, del:ou')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -1927,7 +1927,7 @@
             <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
             <!-- cross reference to DS6 docs -->
             <!-- cross reference to modrdn.ksh -->
-            <testcase name="'ACI: Modify RDN: Branch - Multi ACIs, targattrfilters add:ou, del:ou 2'">
+            <testcase name="getTestCaseName('Branch - Multi ACIs, targattrfilters add:ou, del:ou 2')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -2120,7 +2120,7 @@
             -->
             <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
             <!-- cross reference to DS6 docs -->
-            <testcase name="'ACI: Modify RDN: Postamble'">
+            <testcase name="getTestCaseName('Postamble')">
             <sequence>
               <call function="'testCase_Preamble'"/>
                 <message>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_proxy_auth.xml b/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_proxy_auth.xml
index 4963a60..2de0926 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_proxy_auth.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_proxy_auth.xml
@@ -73,7 +73,7 @@
                                           and no entries are returned 
                                           for all operations.
           -->
-          <testcase name="'ACI: Proxy Auth: Preamble'">
+          <testcase name="getTestCaseName('Preamble')">
             <sequence>
               <call function="'testCase_Preamble'"/>
                 <message>
@@ -180,7 +180,7 @@
                                           for all ldap operations. 
                                           No entries are returned for any steps.
           -->
-          <testcase name="'ACI: Proxy Auth: one proxied user'">
+          <testcase name="getTestCaseName('one proxied user')">
             <sequence>
               <call function="'testCase_Preamble'"/>
 
@@ -380,7 +380,7 @@
                                           Entry is returned only for steps 1 and 5 
                                           and only with the specified attribute.
           -->
-          <testcase name="'ACI: Proxy Auth: one user, one proxied user'">
+          <testcase name="getTestCaseName('one user, one proxied user')">
             <sequence>
               <call function="'testCase_Preamble'"/>
 
@@ -646,7 +646,7 @@
                                           for all ldap operations. 
                                           No entries returned for any step.
           -->
-          <testcase name="'ACI: Proxy Auth: one user for adds, one proxied user'">
+          <testcase name="getTestCaseName('one user for adds, one proxied user')">
             <sequence>
               <call function="'testCase_Preamble'"/>
 
@@ -895,7 +895,7 @@
                                           Entry is returned only for steps 1 and 5 
                                           and only with the specified attribute.
           -->
-          <testcase name="'ACI: Proxy Auth: one user for searches, one proxied user'">
+          <testcase name="getTestCaseName('one user for searches, one proxied user')">
             <sequence>
               <call function="'testCase_Preamble'"/>
 
@@ -1163,7 +1163,7 @@
                                           Entry is returned only for steps 1 and 5 
                                           and only with the specified attribute.
           -->
-          <testcase name="'ACI: Proxy Auth: one user for searches reads separate level, one proxied user'">
+          <testcase name="getTestCaseName('one user for searches reads separate level, one proxied user')">
             <sequence>
               <call function="'testCase_Preamble'"/>
 
@@ -1447,7 +1447,7 @@
                                           Entry is returned only for steps 1, 2, 5 and 6 
                                           and only with the specified attribute.
           -->
-          <testcase name="'ACI: Proxy Auth: many users with wildcard, one proxied user'">
+          <testcase name="getTestCaseName('many users with wildcard, one proxied user')">
             <sequence>
               <call function="'testCase_Preamble'"/>
 
@@ -1733,7 +1733,7 @@
                                           Entry is returned only for steps 1, 2, 5 and 6 
                                           and only with the specified attribute.
           -->
-          <testcase name="'ACI: Proxy Auth: many users one user, many proxied users with wildcard'">
+          <testcase name="getTestCaseName('many users one user, many proxied users with wildcard')">
             <sequence>
               <call function="'testCase_Preamble'"/>
 
@@ -2001,7 +2001,7 @@
                                           Entry is returned only for step 1  
                                           and only with the specified attribute.
           -->
-          <testcase name="'ACI: Proxy Auth: one user, one bad proxied user'">
+          <testcase name="getTestCaseName('one user, one bad proxied user')">
             <sequence>
               <call function="'testCase_Preamble'"/>
 
@@ -2289,7 +2289,7 @@
                                           and only with the specified attribute.
           -->
           <!--
-          <testcase name="'ACI: Proxy Auth: Directory Manager as proxy'">
+          <testcase name="getTestCaseName('Directory Manager as proxy')">
             <sequence>
               <call function="'testCase_Preamble'"/>
 
@@ -2592,7 +2592,7 @@
                                           and no entries are returned 
                                           for all operations.
           -->
-          <testcase name="'ACI: Proxy Auth: Postamble'">
+          <testcase name="getTestCaseName('Postamble')">
             <sequence>
               <call function="'testCase_Preamble'"/>
               <message>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_rdn_wildcards.xml b/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_rdn_wildcards.xml
index 1212771..3bbe59e 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_rdn_wildcards.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_rdn_wildcards.xml
@@ -78,7 +78,7 @@
           -->
           <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
           <!-- cross reference to DS6 docs -->
-            <testcase name="'ACI: RDN Wildcards: Preamble'">
+            <testcase name="getTestCaseName('Preamble')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                 <message>
@@ -198,7 +198,7 @@
                                             for all ldap operations, and
                                             and entry is returned only for the last step.
             -->
-            <testcase name="'ACI: RDN Wildcards: DN with whole-type wildcard, single entry'">
+            <testcase name="getTestCaseName('DN with whole-type wildcard, single entry')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -314,7 +314,7 @@
                                             are returned in step 2, and the appropriate entry
                                             is returned in the last step.
             -->
-            <testcase name="'ACI: RDN Wildcards: DN with whole-type wildcard, several entries'">
+            <testcase name="getTestCaseName('DN with whole-type wildcard, several entries')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -448,7 +448,7 @@
                                             are returned in step 2, and the appropriate entry
                                             is returned in the last step.
             -->
-            <testcase name="'ACI: RDN Wildcards: DN with whole-type wildcard, several entries, shorthand'">
+            <testcase name="getTestCaseName('DN with whole-type wildcard, several entries, shorthand')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -581,7 +581,7 @@
                                             and the appropriate entry
                                             is returned in the last step.
             -->
-            <testcase name="'ACI: RDN Wildcards: DN with whole-rdn wildcard, single entry'">
+            <testcase name="getTestCaseName('DN with whole-rdn wildcard, single entry')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -696,7 +696,7 @@
                                             and the appropriate entrries
                                             are returned in the step 1 and the last step.
             -->
-            <testcase name="'ACI: RDN Wildcards: DN with whole-rdn wildcard, single entry, two level allow'">
+            <testcase name="getTestCaseName('DN with whole-rdn wildcard, single entry, two level allow')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -811,7 +811,7 @@
                                             and the appropriate entry
                                             is returned in the last step.
             -->
-            <testcase name="'ACI: RDN Wildcards: DN with multiple-whole-rdn wildcard, single entry, two level deny'">
+            <testcase name="getTestCaseName('DN with multiple-whole-rdn wildcard, single entry, two level deny')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -926,7 +926,7 @@
                                             and the appropriate entry
                                             is returned in the last step.
             -->
-            <testcase name="'ACI: RDN Wildcards: DN with whole-rdn wildcard, single entry, two level deny'">
+            <testcase name="getTestCaseName('DN with whole-rdn wildcard, single entry, two level deny')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -1041,7 +1041,7 @@
                                             and the appropriate entry
                                             is returned in the last step.
             -->
-            <testcase name="'ACI: RDN Wildcards: DN with multiple-whole-rdn wildcard, single entry, three level deny'">
+            <testcase name="getTestCaseName('DN with multiple-whole-rdn wildcard, single entry, three level deny')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -1156,7 +1156,7 @@
                                             and the appropriate entry
                                             is returned in the last step.
             -->
-            <testcase name="'ACI: RDN Wildcards: DN with whole-rdn wildcard, single entry, three level deny'">
+            <testcase name="getTestCaseName('DN with whole-rdn wildcard, single entry, three level deny')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -1271,7 +1271,7 @@
                                             and the appropriate entry
                                             is returned in the last step.
             -->
-            <testcase name="'ACI: RDN Wildcards: DN with whole-type and multiple-whole-rdn wildcard, several entries, shorthand'">
+            <testcase name="getTestCaseName('DN with whole-type and multiple-whole-rdn wildcard, several entries, shorthand')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -1404,7 +1404,7 @@
                                             and the appropriate entry
                                             is returned in the last step.
             -->
-            <testcase name="'ACI: RDN Wildcards: DN with several multiple-whole-rdn wildcards, three level deny'">
+            <testcase name="getTestCaseName('DN with several multiple-whole-rdn wildcards, three level deny')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -1519,7 +1519,7 @@
                                             and the appropriate entry
                                             is returned in the last step.
             -->
-            <testcase name="'ACI: RDN Wildcards: DN with several multiple-whole-rdn wildcards with bad branch'">
+            <testcase name="getTestCaseName('DN with several multiple-whole-rdn wildcards with bad branch')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -1634,7 +1634,7 @@
                                             and the appropriate entry
                                             is returned in the last step.
             -->
-            <testcase name="'ACI: RDN Wildcards: DN with multiple-whole-rdn wildcard syntax, multiple spaces'">
+            <testcase name="getTestCaseName('DN with multiple-whole-rdn wildcard syntax, multiple spaces')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -1744,7 +1744,7 @@
                 #@TestPostamble             none
                 #@TestResult                Success if OpenDS returns 21.
             -->
-            <testcase name="'ACI: RDN Wildcards: DN with multiple-whole-rdn wildcard syntax, extra internal space'">
+            <testcase name="getTestCaseName('DN with multiple-whole-rdn wildcard syntax, extra internal space')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -1784,7 +1784,7 @@
                 #@TestPostamble             none
                 #@TestResult                Success if OpenDS returns 21.
             -->
-            <testcase name="'ACI: RDN Wildcards: DN with multiple-whole-rdn wildcard syntax, extra wildcard'">
+            <testcase name="getTestCaseName('DN with multiple-whole-rdn wildcard syntax, extra wildcard')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -1824,7 +1824,7 @@
                 #@TestPostamble             none
                 #@TestResult                Success if OpenDS returns 21.
             -->
-            <testcase name="'ACI: RDN Wildcards: DN with usrdn syntax, single wildcard for branch'">
+            <testcase name="getTestCaseName('DN with usrdn syntax, single wildcard for branch')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -1864,7 +1864,7 @@
                 #@TestPostamble             none
                 #@TestResult                Success if OpenDS returns 21.
             -->
-            <testcase name="'ACI: RDN Wildcards: DN with usrdn syntax, double wildcard notation for branch'">
+            <testcase name="getTestCaseName('DN with usrdn syntax, double wildcard notation for branch')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -1910,7 +1910,7 @@
                                             and the appropriate entry
                                             is returned in step 2 and the last step.
             -->
-            <testcase name="'ACI: RDN Wildcards: DN with usrdn syntax, wildcard notation for uid'">
+            <testcase name="getTestCaseName('DN with usrdn syntax, wildcard notation for uid')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -2050,7 +2050,7 @@
             -->
             <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
             <!-- cross reference to DS6 docs -->
-            <testcase name="'ACI: RDN Wildcards: Postamble'">
+            <testcase name="getTestCaseName('Postamble')">
             <sequence>
               <call function="'testCase_Preamble'"/>
                 <message>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_targattrfilter.xml b/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_targattrfilter.xml
index 75c2c73..2dd1c49 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_targattrfilter.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_targattrfilter.xml
@@ -75,7 +75,7 @@
             -->
           <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
           <!-- cross reference to DS6 docs -->
-            <testcase name="'ACI: Targattrfilter: Preamble'">
+            <testcase name="getTestCaseName('Preamble')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                 <message>
@@ -170,7 +170,7 @@
             <!-- cross reference to DS6 docs -->
             <!-- cross reference to valueacl.ksh Test Cases 2 and 3 -->
             <!-- Special note: when "del" is missing from targattrfilter, it should evaluate as true. -->
-            <testcase name="'ACI: Targattrfilter: Targattrfilter equals add:title'">
+            <testcase name="getTestCaseName('Targattrfilter equals add:title')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -314,7 +314,7 @@
             <!-- cross reference to DS6 docs -->
             <!-- cross reference to valueacl.ksh Test Cases 4 and 5 -->
             <!-- Special note: when "add" is missing from targattrfilter, it should evaluate as true. -->
-            <testcase name="'ACI: Targattrfilter: Targattrfilter equals del:roomnumber'">
+            <testcase name="getTestCaseName('Targattrfilter equals del:roomnumber')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -456,7 +456,7 @@
             <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
             <!-- cross reference to DS6 docs -->
             <!-- cross reference to valueacl.ksh Test Cases 6 and 8 -->
-            <testcase name="'ACI: Targattrfilter: Targattrfilter equals add:l,del:l'">
+            <testcase name="getTestCaseName('Targattrfilter equals add:l,del:l')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -582,7 +582,7 @@
             <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
             <!-- cross reference to DS6 docs -->
             <!-- cross reference to valueacl.ksh Test Cases 7 -->
-            <testcase name="'ACI: Targattrfilter: Targattrfilter equals add:st,del:st'">
+            <testcase name="getTestCaseName('Targattrfilter equals add:st,del:st')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -708,7 +708,7 @@
             <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
             <!-- cross reference to DS6 docs -->
             <!-- cross reference to valueacl.ksh Test Cases 6 and 8 -->
-            <testcase name="'ACI: Targattrfilter: Targattrfilter equals add:l,del:l wildcard only'">
+            <testcase name="getTestCaseName('Targattrfilter equals add:l,del:l wildcard only')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -835,7 +835,7 @@
             -->
             <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
             <!-- cross reference to DS6 docs -->
-            <testcase name="'ACI: Targattrfilter: Targattrfilter equals add:street,del:street wildcard only, street not present'">
+            <testcase name="getTestCaseName('Targattrfilter equals add:street,del:street wildcard only, street not present')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -960,7 +960,7 @@
             <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
             <!-- cross reference to DS6 docs -->
             <!-- cross reference to valueacl.ksh Test Cases 7 -->
-            <testcase name="'ACI: Targattrfilter: Targattrfilter equals add:title,del:title with wildcards'">
+            <testcase name="getTestCaseName('Targattrfilter equals add:title,del:title with wildcards')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -1062,7 +1062,7 @@
             -->
             <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
             <!-- cross reference to DS6 docs -->
-            <testcase name="'ACI: Targattrfilter: Targattrfilter with mispelled add'">
+            <testcase name="getTestCaseName('Targattrfilter with mispelled add')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -1104,7 +1104,7 @@
             -->
             <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
             <!-- cross reference to DS6 docs -->
-            <testcase name="'ACI: Targattrfilter: Targattrfilter with mispelled del'">
+            <testcase name="getTestCaseName('Targattrfilter with mispelled del')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -1146,7 +1146,7 @@
             -->
             <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
             <!-- cross reference to DS6 docs -->
-            <testcase name="'ACI: Targattrfilter: Targattrfilter with mispelled del with add'">
+            <testcase name="getTestCaseName('Targattrfilter with mispelled del with add')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -1188,7 +1188,7 @@
             -->
             <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
             <!-- cross reference to DS6 docs -->
-            <testcase name="'ACI: Targattrfilter: Targattrfilter with missing comma'">
+            <testcase name="getTestCaseName('Targattrfilter with missing comma')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -1249,7 +1249,7 @@
             -->
             <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
             <!-- cross reference to DS6 docs -->
-            <testcase name="'ACI: Targattrfilter: Targattrfilter with extra quotes'">
+            <testcase name="getTestCaseName('Targattrfilter with extra quotes')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -1291,7 +1291,7 @@
             -->
             <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
             <!-- cross reference to DS6 docs -->
-            <testcase name="'ACI: Targattrfilter: Targattrfilter with extra commas'">
+            <testcase name="getTestCaseName('Targattrfilter with extra commas')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -1352,7 +1352,7 @@
             -->
             <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
             <!-- cross reference to DS6 docs -->
-            <testcase name="'ACI: Targattrfilter: Targattrfilter with missing argument for add '">
+            <testcase name="getTestCaseName('Targattrfilter with missing argument for add ')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -1394,7 +1394,7 @@
             -->
             <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
             <!-- cross reference to DS6 docs -->
-            <testcase name="'ACI: Targattrfilter: Targattrfilter with missing argument for del'">
+            <testcase name="getTestCaseName('Targattrfilter with missing argument for del')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -1436,7 +1436,7 @@
             -->
             <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
             <!-- cross reference to DS6 docs -->
-            <testcase name="'ACI: Targattrfilter: Targattrfilter with missing argument for del with add'">
+            <testcase name="getTestCaseName('Targattrfilter with missing argument for del with add')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -1478,7 +1478,7 @@
             -->
             <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
             <!-- cross reference to DS6 docs -->
-            <testcase name="'ACI: Targattrfilter: Targattrfilter equals del:l,add:l'">
+            <testcase name="getTestCaseName('Targattrfilter equals del:l,add:l')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -1528,7 +1528,7 @@
             -->
             <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
             <!-- cross reference to DS6 docs -->
-           <testcase name="'ACI: Targattrfilter: Targattrfilter with very long comment portion'">
+           <testcase name="getTestCaseName('Targattrfilter with very long comment portion')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -1621,7 +1621,7 @@
           -->
           <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
           <!-- cross reference to DS6 docs -->
-            <testcase name="'ACI: Targattrfilter: Postamble'">
+            <testcase name="getTestCaseName('Postamble')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                 <message>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_target.xml b/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_target.xml
index bf4184a..782884c 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_target.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_target.xml
@@ -76,7 +76,7 @@
             -->
           <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
           <!-- cross reference to DS6 docs -->
-            <testcase name="'ACI: Target: Preamble'">
+            <testcase name="getTestCaseName('Preamble')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                 <message>
@@ -167,7 +167,7 @@
             -->
           <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
           <!-- cross reference to DS6 docs -->
-            <testcase name="'ACI: Target: Target Equals DN'">
+            <testcase name="getTestCaseName('Target Equals DN')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -310,7 +310,7 @@
           <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
           <!-- cross reference to DS6 docs -->
           
-            <testcase name="'ACI: Target: Target Equals DN - new branch'">
+            <testcase name="getTestCaseName('Target Equals DN - new branch')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
 
@@ -471,7 +471,7 @@
             -->
           <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
           <!-- cross reference to DS6 docs -->
-            <testcase name="'ACI: Target: Target Equals DN With Trailing Wildcard'">
+            <testcase name="getTestCaseName('Target Equals DN With Trailing Wildcard')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
 
@@ -613,7 +613,7 @@
             -->
           <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
           <!-- cross reference to DS6 docs -->
-            <testcase name="'ACI: Target: Target Equals DN With Leading Wildcard'">
+            <testcase name="getTestCaseName('Target Equals DN With Leading Wildcard')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
 
@@ -755,7 +755,7 @@
             -->
           <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
           <!-- cross reference to DS6 docs -->
-            <testcase name="'ACI: Target: Target Equals DN With Internal Wildcard'">
+            <testcase name="getTestCaseName('Target Equals DN With Internal Wildcard')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
 
@@ -897,7 +897,7 @@
             -->
           <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
           <!-- cross reference to DS6 docs -->
-            <testcase name="'ACI: Target: Target Equals DN With Multiple Wildcards'">
+            <testcase name="getTestCaseName('Target Equals DN With Multiple Wildcards')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
 
@@ -1036,7 +1036,7 @@
                                             and the aci has not been added.
             -->
             <!-- cross reference to syntax.ksh Test Case 1 -->
-            <testcase name="'ACI: Target: Target Equals DN With Keyword self'">
+            <testcase name="getTestCaseName('Target Equals DN With Keyword self')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
 
@@ -1104,7 +1104,7 @@
                                             and the aci has not been added.
             -->
             <!-- cross reference to syntax.ksh Test Case 2 -->
-            <testcase name="'ACI: Target: Target Equals DN Above Entry'">
+            <testcase name="getTestCaseName('Target Equals DN Above Entry')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
 
@@ -1173,7 +1173,7 @@
                                             and entry is returned only for step 1.
             -->
             <!-- cross reference to syntax.ksh Test Case 2 -->
-            <testcase name="'ACI: Target: Target Equals DN Below Entry'">
+            <testcase name="getTestCaseName('Target Equals DN Below Entry')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
 
@@ -1314,7 +1314,7 @@
                                           and the aci has not been added.
           -->
           <!-- cross reference to syntax.ksh Test Case 3 -->
-          <testcase name="'ACI: Target: Multiple Targets'">
+          <testcase name="getTestCaseName('Multiple Targets')">
             <sequence>
               <call function="'testCase_Preamble'"/>
 
@@ -1383,7 +1383,7 @@
                                           and the aci has not been added.
           -->
           <!-- cross reference to syntax.ksh Test Case 13 -->
-          <testcase name="'ACI: Target: Keyword Target Misspelled'">
+          <testcase name="getTestCaseName('Keyword Target Misspelled')">
             <sequence>
               <call function="'testCase_Preamble'"/>
 
@@ -1452,7 +1452,7 @@
                                           and the aci has not been added.
           -->
           <!-- cross reference to syntax.ksh Test Case 13 -->
-          <testcase name="'ACI: Target: Missing Leading ldap:'">
+          <testcase name="getTestCaseName('Missing Leading ldap:')">
             <sequence>
               <call function="'testCase_Preamble'"/>
 
@@ -1520,7 +1520,7 @@
               #@TestResult                Success if OpenDS returns 21, 
                                           and the aci has not been added.
           -->
-          <testcase name="'ACI: Target: With ldap:all'">
+          <testcase name="getTestCaseName('With ldap:all')">
             <sequence>
               <call function="'testCase_Preamble'"/>
 
@@ -1586,7 +1586,7 @@
               #@TestResult                Success if OpenDS returns 21, 
                                           and the aci has not been added.
           -->
-          <testcase name="'ACI: Target: Keyword version mispelled'">
+          <testcase name="getTestCaseName('Keyword version mispelled')">
             <sequence>
               <call function="'testCase_Preamble'"/>
 
@@ -1664,7 +1664,7 @@
                                             for all ldap operations, and
                                             and entry is returned only for steps 1 and 5.
             -->
-            <testcase name="'ACI: Target: Enable and disable ACIs'">
+            <testcase name="getTestCaseName('Enable and disable ACIs')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -1962,7 +1962,7 @@
                                             for all ldap operations, and
                                             and entry is returned only for step 3.
             -->
-            <testcase name="'ACI: Target: Enable and disable global ACIs'">
+            <testcase name="getTestCaseName('Enable and disable global ACIs')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -2115,7 +2115,7 @@
             -->
           <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
           <!-- cross reference to DS6 docs -->
-            <testcase name="'ACI: Target: Target Equals DN with userdn equals all'">
+            <testcase name="getTestCaseName('Target Equals DN with userdn equals all')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -2255,7 +2255,7 @@
             -->
           <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
           <!-- cross reference to DS6 docs -->
-            <testcase name="'ACI: Target: Target Equals DN with userdn equals anyone'">
+            <testcase name="getTestCaseName('Target Equals DN with userdn equals anyone')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -2395,7 +2395,7 @@
             -->
           <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
           <!-- cross reference to DS6 docs -->
-            <testcase name="'ACI: Target: Target Equals DN with userdn not equals all'">
+            <testcase name="getTestCaseName('Target Equals DN with userdn not equals all')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -2535,7 +2535,7 @@
             -->
           <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
           <!-- cross reference to DS6 docs -->
-            <testcase name="'ACI: Target: Target Equals DN with userdn equal self'">
+            <testcase name="getTestCaseName('Target Equals DN with userdn equal self')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -2677,7 +2677,7 @@
             -->
           <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
           <!-- cross reference to DS6 docs -->
-            <testcase name="'ACI: Target: Target Equals DN with userdn equal self with wildcard'">
+            <testcase name="getTestCaseName('Target Equals DN with userdn equal self with wildcard')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -2819,7 +2819,7 @@
             -->
           <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
           <!-- cross reference to DS6 docs -->
-            <testcase name="'ACI: Target: Target Equals DN with userdn equal self with wildcard and filter'">
+            <testcase name="getTestCaseName('Target Equals DN with userdn equal self with wildcard and filter')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -2961,7 +2961,7 @@
             -->
           <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
           <!-- cross reference to DS6 docs -->
-            <testcase name="'ACI: Target: Target Equals DN with userdn equal self with wildcard and filter, deny'">
+            <testcase name="getTestCaseName('Target Equals DN with userdn equal self with wildcard and filter, deny')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -3099,7 +3099,7 @@
             -->
           <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
           <!-- cross reference to DS6 docs -->
-            <testcase name="'ACI: Target: Target Equals DN with userdn equal self with wildcard and filter, allow and deny'">
+            <testcase name="getTestCaseName('Target Equals DN with userdn equal self with wildcard and filter, allow and deny')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -3241,7 +3241,7 @@
             -->
           <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
           <!-- cross reference to DS6 docs -->
-            <testcase name="'ACI: Target: userdn equals self - modify operational attributes'">
+            <testcase name="getTestCaseName('userdn equals self - modify operational attributes')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -3371,7 +3371,7 @@
             -->
           <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
           <!-- cross reference to DS6 docs -->
-            <testcase name="'ACI: Target: search for operational attributes'">
+            <testcase name="getTestCaseName('search for operational attributes')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -3675,7 +3675,7 @@
             -->
           <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
           <!-- cross reference to DS6 docs -->
-            <testcase name="'ACI: Target: Target Equals DN with comma'">
+            <testcase name="getTestCaseName('Target Equals DN with comma')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -3835,7 +3835,7 @@
             -->
           <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
           <!-- cross reference to DS6 docs -->
-            <testcase name="'ACI: Target: Target Equals DN, default targetattr'">
+            <testcase name="getTestCaseName('Target Equals DN, default targetattr')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -3976,7 +3976,7 @@
           -->
         <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
         <!-- cross reference to DS6 docs -->
-          <testcase name="'ACI: Target: Postamble'">
+          <testcase name="getTestCaseName('Postamble')">
             <sequence>
               <call function="'testCase_Preamble'"/>
               <message>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_targetattr.xml b/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_targetattr.xml
index 3126a02..457ed24 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_targetattr.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_targetattr.xml
@@ -73,7 +73,7 @@
                                           and no entries are returned 
                                           for all operations.
           -->
-          <testcase name="'ACI: Targetattr: Preamble'">
+          <testcase name="getTestCaseName('Preamble')">
             <sequence>
               <call function="'testCase_Preamble'"/>
               <message>
@@ -164,7 +164,7 @@
           -->
           <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
           <!-- cross reference to DS6 docs -->
-          <testcase name="'ACI: Targetattr: Targetattr Equals One Attribute'">
+          <testcase name="getTestCaseName('Targetattr Equals One Attribute')">
             <sequence>
               <call function="'testCase_Preamble'"/>
 
@@ -325,7 +325,7 @@
           -->
           <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
           <!-- cross reference to DS6 docs -->
-          <testcase name="'ACI: Targetattr: Targetattr Not Equals One Attribute'">
+          <testcase name="getTestCaseName('Targetattr Not Equals One Attribute')">
             <sequence>
               <call function="'testCase_Preamble'"/>
 
@@ -486,7 +486,7 @@
           -->
           <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
           <!-- cross reference to DS6 docs -->
-          <testcase name="'ACI: Targetattr: Targetattr Equals Three Attributes'">
+          <testcase name="getTestCaseName('Targetattr Equals Three Attributes')">
             <sequence>
               <call function="'testCase_Preamble'"/>
 
@@ -666,7 +666,7 @@
           -->
           <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
           <!-- cross reference to DS6 docs -->
-          <testcase name="'ACI: Targetattr: Targetattr Not Equals Three Attributes'">
+          <testcase name="getTestCaseName('Targetattr Not Equals Three Attributes')">
             <sequence>
               <call function="'testCase_Preamble'"/>
 
@@ -841,7 +841,7 @@
             #@TestResult                Success if OpenDS returns 0 for all ldap operations
                                         and no attributes are returned.
           -->
-          <testcase name="'ACI: Targetattr: Bad Targetattr'">
+          <testcase name="getTestCaseName('Bad Targetattr')">
             <sequence>
               <call function="'testCase_Preamble'"/>
 
@@ -987,7 +987,7 @@
               #@TestResult                Success if OpenDS returns 21
           -->
         <!-- cross reference to syntax.ksh Test Case 5 -->
-          <testcase name="'ACI: Targetattr: Multiple Targets'">
+          <testcase name="getTestCaseName('Multiple Targets')">
             <sequence>
               <call function="'testCase_Preamble'"/>
 
@@ -1051,7 +1051,7 @@
               #@TestPostamble             none
               #@TestResult                Success if OpenDS returns 21
           -->
-          <testcase name="'ACI: Targetattr: Keyword Targetattr Mispelled'">
+          <testcase name="getTestCaseName('Keyword Targetattr Mispelled')">
             <sequence>
               <call function="'testCase_Preamble'"/>
 
@@ -1115,7 +1115,7 @@
               #@TestPostamble             none
               #@TestResult                Success if OpenDS returns 21
           -->
-          <testcase name="'ACI: Targetattr: Targetattr With Missing Quotes'">
+          <testcase name="getTestCaseName('Targetattr With Missing Quotes')">
             <sequence>
               <call function="'testCase_Preamble'"/>
 
@@ -1184,7 +1184,7 @@
                                           Entry is returned only for step 1 
                                           and only with the specified attribute.
           -->
-          <testcase name="'ACI: Targetattr: Targetattr With Spaces'">
+          <testcase name="getTestCaseName('Targetattr With Spaces')">
             <sequence>
               <call function="'testCase_Preamble'"/>
 
@@ -1344,7 +1344,7 @@
             -->
           <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
           <!-- cross reference to DS6 docs -->
-            <testcase name="'ACI: Target: Targetattr Not Equals Wildcard'">
+            <testcase name="getTestCaseName('Targetattr Not Equals Wildcard')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -1480,7 +1480,7 @@
               #@TestPostamble             none
               #@TestResult                Success if OpenDS returns 21.
           -->
-          <testcase name="'ACI: Targetattr: Targetattr Equals One Attribute with wildcard'">
+          <testcase name="getTestCaseName('Targetattr Equals One Attribute with wildcard')">
             <sequence>
               <call function="'testCase_Preamble'"/>
 
@@ -1523,7 +1523,7 @@
                                           and no entries are returned 
                                           for all operations.
           -->
-          <testcase name="'ACI: Targetattr: Postamble'">
+          <testcase name="getTestCaseName('Postamble')">
             <sequence>
               <call function="'testCase_Preamble'"/>
               <message>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_targetfilter.xml b/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_targetfilter.xml
index aa9c84f..2acba6e 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_targetfilter.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_targetfilter.xml
@@ -73,7 +73,7 @@
                                             and no entries are returned 
                                             for all operations.
             -->
-            <testcase name="'ACI: Targetfilter: Preamble'">
+            <testcase name="getTestCaseName('Preamble')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                 <message>
@@ -165,7 +165,7 @@
             -->
           <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
           <!-- cross reference to DS6 docs -->
-            <testcase name="'ACI: Targetfilter: Targetfilter Equals One Statement'">
+            <testcase name="getTestCaseName('Targetfilter Equals One Statement')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -364,7 +364,7 @@
             -->
           <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
           <!-- cross reference to DS6 docs -->
-            <testcase name="'ACI: Targetfilter: Targetfilter Equals One Statement 2'">
+            <testcase name="getTestCaseName('Targetfilter Equals One Statement 2')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -561,7 +561,7 @@
             -->
           <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
           <!-- cross reference to DS6 docs -->
-            <testcase name="'ACI: Targetfilter: Targetfilter Equals One Statement 3'">
+            <testcase name="getTestCaseName('Targetfilter Equals One Statement 3')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -729,7 +729,7 @@
           -->
         <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
         <!-- cross reference to DS6 docs -->
-          <testcase name="'ACI: Targetfilter: Targetfilter Not Equals One Statement'">
+          <testcase name="getTestCaseName('Targetfilter Not Equals One Statement')">
             <sequence>
               <call function="'testCase_Preamble'"/>
                           
@@ -927,7 +927,7 @@
           -->
         <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
         <!-- cross reference to DS6 docs -->
-          <testcase name="'ACI: Targetfilter: Targetfilter Equals Three Statements With or, one true'">
+          <testcase name="getTestCaseName('Targetfilter Equals Three Statements With or, one true')">
             <sequence>
               <call function="'testCase_Preamble'"/>
                           
@@ -1125,7 +1125,7 @@
           -->
         <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
         <!-- cross reference to DS6 docs -->
-          <testcase name="'ACI: Targetfilter: Targetfilter Not Equals Three Statements With or, one true'">
+          <testcase name="getTestCaseName('Targetfilter Not Equals Three Statements With or, one true')">
             <sequence>
               <call function="'testCase_Preamble'"/>
                           
@@ -1321,7 +1321,7 @@
           -->
         <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
         <!-- cross reference to DS6 docs -->
-          <testcase name="'ACI: Targetfilter: Targetfilter Equals Three Statements With or, none true'">
+          <testcase name="getTestCaseName('Targetfilter Equals Three Statements With or, none true')">
             <sequence>
               <call function="'testCase_Preamble'"/>
                           
@@ -1464,7 +1464,7 @@
           -->
         <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
         <!-- cross reference to DS6 docs -->
-          <testcase name="'ACI: Targetfilter: Targetfilter Equals Three Statements With and, one true'">
+          <testcase name="getTestCaseName('Targetfilter Equals Three Statements With and, one true')">
             <sequence>
               <call function="'testCase_Preamble'"/>
                           
@@ -1608,7 +1608,7 @@
           -->
         <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
         <!-- cross reference to DS6 docs -->
-          <testcase name="'ACI: Targetfilter: Targetfilter Equals Three Statements With and, all true'">
+          <testcase name="getTestCaseName('Targetfilter Equals Three Statements With and, all true')">
             <sequence>
               <call function="'testCase_Preamble'"/>
                           
@@ -1806,7 +1806,7 @@
           -->
         <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
         <!-- cross reference to DS6 docs -->
-          <testcase name="'ACI: Targetfilter: Targetfilter Not Equals Three Statements With and, all true'">
+          <testcase name="getTestCaseName('Targetfilter Not Equals Three Statements With and, all true')">
             <sequence>
               <call function="'testCase_Preamble'"/>
                           
@@ -2004,7 +2004,7 @@
           -->
         <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
         <!-- cross reference to DS6 docs -->
-          <testcase name="'ACI: Targetfilter: Targetfilter Equals Three Statements With Wildcard and or, one true'">
+          <testcase name="getTestCaseName('Targetfilter Equals Three Statements With Wildcard and or, one true')">
             <sequence>
               <call function="'testCase_Preamble'"/>
                           
@@ -2202,7 +2202,7 @@
           -->
         <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
         <!-- cross reference to DS6 docs -->
-          <testcase name="'ACI: Targetfilter: Targetfilter Equals Three Statements With Two Wildcards and or, one true'">
+          <testcase name="getTestCaseName('Targetfilter Equals Three Statements With Two Wildcards and or, one true')">
             <sequence>
               <call function="'testCase_Preamble'"/>
                           
@@ -2400,7 +2400,7 @@
           -->
         <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
         <!-- cross reference to DS6 docs -->
-          <testcase name="'ACI: Targetfilter: Targetfilter Equals Three Statements With Wildcard With and, all true'">
+          <testcase name="getTestCaseName('Targetfilter Equals Three Statements With Wildcard With and, all true')">
             <sequence>
               <call function="'testCase_Preamble'"/>
                           
@@ -2598,7 +2598,7 @@
           -->
         <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
         <!-- cross reference to DS6 docs -->
-          <testcase name="'ACI: Targetfilter: Targetfilter Equals Three Statements With Three Wildcards With and, all true'">
+          <testcase name="getTestCaseName('Targetfilter Equals Three Statements With Three Wildcards With and, all true')">
             <sequence>
               <call function="'testCase_Preamble'"/>
                           
@@ -2793,7 +2793,7 @@
           -->
         <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
         <!-- cross reference to DS6 docs -->
-          <testcase name="'ACI: Targetfilter: Targetfilter With Extra Spaces'">
+          <testcase name="getTestCaseName('Targetfilter With Extra Spaces')">
             <sequence>
               <call function="'testCase_Preamble'"/>
                           
@@ -2905,7 +2905,7 @@
           -->
         <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
         <!-- cross reference to DS6 docs -->
-          <testcase name="'ACI: Targetfilter: Targetfilter With Missing Quotes'">
+          <testcase name="getTestCaseName('Targetfilter With Missing Quotes')">
             <sequence>
               <call function="'testCase_Preamble'"/>
                           
@@ -2972,7 +2972,7 @@
           -->
         <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
         <!-- cross reference to DS6 docs -->
-          <testcase name="'ACI: Targetfilter: Targetfilter With Missing Quotes 2'">
+          <testcase name="getTestCaseName('Targetfilter With Missing Quotes 2')">
             <sequence>
               <call function="'testCase_Preamble'"/>
                           
@@ -3039,7 +3039,7 @@
           -->
         <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
         <!-- cross reference to DS6 docs -->
-          <testcase name="'ACI: Targetfilter: Targetfilter With Improperly Formatted Filter with or'">
+          <testcase name="getTestCaseName('Targetfilter With Improperly Formatted Filter with or')">
             <sequence>
               <call function="'testCase_Preamble'"/>
                           
@@ -3106,7 +3106,7 @@
           -->
         <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
         <!-- cross reference to DS6 docs -->
-          <testcase name="'ACI: Targetfilter: Targetfilter With Improperly Formatted Filter with and'">
+          <testcase name="getTestCaseName('Targetfilter With Improperly Formatted Filter with and')">
             <sequence>
               <call function="'testCase_Preamble'"/>
                           
@@ -3172,7 +3172,7 @@
                                           and no entries are returned 
                                           for all operations.
           -->
-          <testcase name="'ACI: Targetfilter: Postamble'">
+          <testcase name="getTestCaseName('Postamble')">
             <sequence>
               <call function="'testCase_Preamble'"/>
               <message>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_targetscope.xml b/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_targetscope.xml
index 2789444..05aea15 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_targetscope.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_targetscope.xml
@@ -76,7 +76,7 @@
             -->
           <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
           <!-- cross reference to DS6 docs -->
-            <testcase name="'ACI: Targetscope: Preamble'">
+            <testcase name="getTestCaseName('Preamble')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                 <message>
@@ -132,7 +132,7 @@
                                             for all ldap operations, and
                                             and parent entry is returned in step 1.
             -->
-            <testcase name="'ACI: Targetscope: base'">
+            <testcase name="getTestCaseName('base')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -340,7 +340,7 @@
                                             for all ldap operations.
                                             Child entry are returned in steps 1 and 2.
             -->
-            <testcase name="'ACI: Targetscope: onelevel'">
+            <testcase name="getTestCaseName('onelevel')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -557,7 +557,7 @@
                                             for all ldap operations.
                                             All entries are returned in steps 1, 2 and 3.
             -->
-            <testcase name="'ACI: Targetscope: subtree'">
+            <testcase name="getTestCaseName('subtree')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -783,7 +783,7 @@
                                             for all ldap operations.
                                             All entries except the parent are returned in steps 1, 2 and 3.
             -->
-            <testcase name="'ACI: Targetscope: subordinate'">
+            <testcase name="getTestCaseName('subordinate')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -1003,7 +1003,7 @@
                 #@TestPostamble             none
                 #@TestResult                Success if OpenDS returns 21.
             -->
-            <testcase name="'ACI: Targetscope: bad keyword'">
+            <testcase name="getTestCaseName('bad keyword')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -1043,7 +1043,7 @@
                 #@TestPostamble             none
                 #@TestResult                Success if OpenDS returns 21.
             -->
-            <testcase name="'ACI: Targetscope: wildcard'">
+            <testcase name="getTestCaseName('wildcard')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -1083,7 +1083,7 @@
                 #@TestPostamble             none
                 #@TestResult                Success if OpenDS returns 21.
             -->
-            <testcase name="'ACI: Targetscope: not equals'">
+            <testcase name="getTestCaseName('not equals')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -1127,7 +1127,7 @@
                                           and no entries are returned 
                                           for all operations.
           -->
-          <testcase name="'ACI: Targetscope: Postamble'">
+          <testcase name="getTestCaseName('Postamble')">
             <sequence>
               <call function="'testCase_Preamble'"/>
                 <message>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/aci/global_acis.xml b/opendj-sdk/opends/tests/functional-tests/testcases/aci/global_acis.xml
index e7e269b..92772fc 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/aci/global_acis.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/aci/global_acis.xml
@@ -74,7 +74,7 @@
                                             The attributes, sn and dn, should be returned 
                                             but not userpassword.
             -->
-            <testcase name="'ACI: Global: Search'">
+            <testcase name="getTestCaseName('Search')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -138,7 +138,7 @@
                                             and entry for step 1.
                                             The attributes, creatorsname and dn, should be returned.
             -->
-            <testcase name="'ACI: Global: Search Operational Attribute of an entry'">
+            <testcase name="getTestCaseName('Search Operational Attribute of an entry')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -193,7 +193,7 @@
                                             and entry for step 1.
                                             Six attributes and the dn should be returned.
             -->
-            <testcase name="'ACI: Global: Search All Operational Attributes of an entry'">
+            <testcase name="getTestCaseName('Search All Operational Attributes of an entry')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -309,7 +309,7 @@
                                             and entry for step 1.
                                             The attributes, matchingrules and dn, should be returned.
             -->
-            <testcase name="'ACI: Global: Search Operational Attribute, cn=schema'">
+            <testcase name="getTestCaseName('Search Operational Attribute, cn=schema')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -365,7 +365,7 @@
                                             and entry for step 1.
                                             Six attributes and the dn should be returned.
             -->
-            <testcase name="'ACI: Global: Search All Operational Attributes, cn=schema'">
+            <testcase name="getTestCaseName('Search All Operational Attributes, cn=schema')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -466,7 +466,7 @@
                                             and entry for step 1.
                                             The attributes, vendorname and dn, should be returned.
             -->
-            <testcase name="'ACI: Global: Search Operational Attribute, root dse'">
+            <testcase name="getTestCaseName('Search Operational Attribute, root dse')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -522,7 +522,7 @@
                                             and entry for step 1.
                                             Eight attributes and the dn should be returned.
             -->
-            <testcase name="'ACI: Global: Search All Operational Attribute, root dse'">
+            <testcase name="getTestCaseName('Search All Operational Attribute, root dse')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -639,7 +639,7 @@
                 #@TestPostamble             none
                 #@TestResult                Success if OpenDS returns 50.
             -->
-            <testcase name="'ACI: Global: Search Operational Attribute, cn=config'">
+            <testcase name="getTestCaseName('Search Operational Attribute, cn=config')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -678,7 +678,7 @@
                                             and entry for step 1.
                                             The attributes, uid, sn and dn, should be returned for specified dn.
             -->
-            <testcase name="'ACI: Global: Anon Search'">
+            <testcase name="getTestCaseName('Anon Search')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -742,7 +742,7 @@
                                             The attributes, uid, sn and dn, should be returned for all other entries but the 
                                             for the specified dn.
             -->
-            <testcase name="'ACI: Global: Anon Search, not equals filter'">
+            <testcase name="getTestCaseName('Anon Search, not equals filter')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -804,7 +804,7 @@
                 #@TestResult                Success if OpenDS returns 0
                                             and returns true for step 1.
             -->
-            <testcase name="'ACI: Global: Compare'">
+            <testcase name="getTestCaseName('Compare')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -847,7 +847,7 @@
                 #@TestPostamble             none
                 #@TestResult                Success if OpenDS returns 50.
             -->
-            <testcase name="'ACI: Global: Modify'">
+            <testcase name="getTestCaseName('Modify')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -882,7 +882,7 @@
                 #@TestPostamble             none
                 #@TestResult                Success if OpenDS returns 50.
             -->
-            <testcase name="'ACI: Global: Delete'">
+            <testcase name="getTestCaseName('Delete')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -917,7 +917,7 @@
                 #@TestPostamble             none
                 #@TestResult                Success if OpenDS returns 50.
             -->
-            <testcase name="'ACI: Global: Modify RDN'">
+            <testcase name="getTestCaseName('Modify RDN')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -952,7 +952,7 @@
                 #@TestPostamble             none
                 #@TestResult                Success if OpenDS returns 0.
             -->
-            <testcase name="'ACI: Global: Self Modify'">
+            <testcase name="getTestCaseName('Self Modify')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/aci/multiple_aci_tests.xml b/opendj-sdk/opends/tests/functional-tests/testcases/aci/multiple_aci_tests.xml
index bb698a0..90e91ed 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/aci/multiple_aci_tests.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/aci/multiple_aci_tests.xml
@@ -76,7 +76,7 @@
             -->
             <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
             <!-- cross reference to DS6 docs -->
-            <testcase name="'ACI: Multiple ACIs: Preamble'">
+            <testcase name="getTestCaseName('Preamble')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                 <message>
@@ -185,7 +185,7 @@
         -->
         <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
         <!-- cross reference to DS6 docs -->
-          <testcase name="'ACI: Multiple ACIs: Different targetfilters, one aci-one entry'">
+          <testcase name="getTestCaseName('Different targetfilters, one aci-one entry')">
             <sequence>
               <call function="'testCase_Preamble'"/>
                           
@@ -383,7 +383,7 @@
         -->
         <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
         <!-- cross reference to DS6 docs -->
-          <testcase name="'ACI: Multiple ACIs: Different targetfilters, one aci-two entries 1'">
+          <testcase name="getTestCaseName('Different targetfilters, one aci-two entries 1')">
             <sequence>
               <call function="'testCase_Preamble'"/>
                           
@@ -608,7 +608,7 @@
         -->
         <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
         <!-- cross reference to DS6 docs -->
-          <testcase name="'ACI: Multiple ACIs: Different targetfilters, one aci-two entries 2'">
+          <testcase name="getTestCaseName('Different targetfilters, one aci-two entries 2')">
             <sequence>
               <call function="'testCase_Preamble'"/>
                           
@@ -833,7 +833,7 @@
         -->
         <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
         <!-- cross reference to DS6 docs -->
-          <testcase name="'ACI: Multiple ACIs: Different targetfilters, one aci-two entries 3'">
+          <testcase name="getTestCaseName('Different targetfilters, one aci-two entries 3')">
             <sequence>
               <call function="'testCase_Preamble'"/>
                           
@@ -1057,7 +1057,7 @@
         -->
         <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
         <!-- cross reference to DS6 docs -->
-          <testcase name="'ACI: Multiple ACIs: Different targetfilters, one aci-one entry, deny'">
+          <testcase name="getTestCaseName('Different targetfilters, one aci-one entry, deny')">
             <sequence>
               <call function="'testCase_Preamble'"/>
                           
@@ -1227,7 +1227,7 @@
           -->
         <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
         <!-- cross reference to DS6 docs -->
-          <testcase name="'ACI: Multiple ACIs: Different targetfilters, one aci-two entries 1, deny'">
+          <testcase name="getTestCaseName('Different targetfilters, one aci-two entries 1, deny')">
             <sequence>
               <call function="'testCase_Preamble'"/>
                           
@@ -1397,7 +1397,7 @@
           -->
         <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
         <!-- cross reference to DS6 docs -->
-          <testcase name="'ACI: Multiple ACIs: Different targetfilters, one aci-two entries 2, deny'">
+          <testcase name="getTestCaseName('Different targetfilters, one aci-two entries 2, deny')">
             <sequence>
               <call function="'testCase_Preamble'"/>
                           
@@ -1568,7 +1568,7 @@
         -->
         <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
         <!-- cross reference to DS6 docs -->
-          <testcase name="'ACI: Multiple ACIs: Different targetfilters, one aci-two entries 3, deny'">
+          <testcase name="getTestCaseName('Different targetfilters, one aci-two entries 3, deny')">
             <sequence>
               <call function="'testCase_Preamble'"/>
                           
@@ -1766,7 +1766,7 @@
         -->
         <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
         <!-- cross reference to DS6 docs -->
-          <testcase name="'ACI: Multiple ACIs: Different targetfilters and targetattr'">
+          <testcase name="getTestCaseName('Different targetfilters and targetattr')">
             <sequence>
               <call function="'testCase_Preamble'"/>
                           
@@ -1991,7 +1991,7 @@
           -->
         <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
         <!-- cross reference to DS6 docs -->
-          <testcase name="'ACI: Multiple ACIs: Different targetfilters and targeattr, deny one attr'">
+          <testcase name="getTestCaseName('Different targetfilters and targeattr, deny one attr')">
             <sequence>
               <call function="'testCase_Preamble'"/>
                           
@@ -2216,7 +2216,7 @@
           -->
         <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
         <!-- cross reference to DS6 docs -->
-          <testcase name="'ACI: Multiple ACIs: Different targetfilters and targetattr with not equals'">
+          <testcase name="getTestCaseName('Different targetfilters and targetattr with not equals')">
             <sequence>
               <call function="'testCase_Preamble'"/>
                           
@@ -2441,7 +2441,7 @@
           -->
         <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
         <!-- cross reference to DS6 docs -->
-          <testcase name="'ACI: Multiple ACIs: Different targetfilters and targetattr, separate search-read with missing read'">
+          <testcase name="getTestCaseName('Different targetfilters and targetattr, separate search-read with missing read')">
             <sequence>
               <call function="'testCase_Preamble'"/>
                           
@@ -2648,7 +2648,7 @@
           -->
         <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
         <!-- cross reference to DS6 docs -->
-          <testcase name="'ACI: Multiple ACIs: Different targetfilters and targetattr, separate search-read'">
+          <testcase name="getTestCaseName('Different targetfilters and targetattr, separate search-read')">
             <sequence>
               <call function="'testCase_Preamble'"/>
                           
@@ -2873,7 +2873,7 @@
           -->
         <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
         <!-- cross reference to DS6 docs -->
-          <testcase name="'ACI: Multiple ACIs: Different targetfilters and targetattr, separate search-read with deny search'">
+          <testcase name="getTestCaseName('Different targetfilters and targetattr, separate search-read with deny search')">
             <sequence>
               <call function="'testCase_Preamble'"/>
                           
@@ -3071,7 +3071,7 @@
             -->
             <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
             <!-- cross reference to DS6 docs -->
-            <testcase name="'ACI: Multiple ACIs: Separate targattrfilters with add:l and del:l'">
+            <testcase name="getTestCaseName('Separate targattrfilters with add:l and del:l')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -3195,7 +3195,7 @@
             -->
             <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
             <!-- cross reference to DS6 docs -->
-            <testcase name="'ACI: Multiple ACIs: Separate targattrfilters with deny add:l and allow del:l'">
+            <testcase name="getTestCaseName('Separate targattrfilters with deny add:l and allow del:l')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -3317,7 +3317,7 @@
             -->
             <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
             <!-- cross reference to DS6 docs -->
-            <testcase name="'ACI: Multiple ACIs: Separate targattrfilters with allow add:l and deny del:l'">
+            <testcase name="getTestCaseName('Separate targattrfilters with allow add:l and deny del:l')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -3437,7 +3437,7 @@
                                             for all ldapmodify operations, 
                                             and 50 for all other steps.
             -->
-            <testcase name="'ACI: Multiple ACIs: Separate targetattrs'">
+            <testcase name="getTestCaseName('Separate targetattrs')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -3560,7 +3560,7 @@
                                             0 for steps 1, 2 and 3, and
                                             50 for all other steps.
             -->
-            <testcase name="'ACI: Multiple ACIs: Separate targetattrs with not equals'">
+            <testcase name="getTestCaseName('Separate targetattrs with not equals')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -3688,7 +3688,7 @@
                                             0 for steps 1 and 2, and
                                             50 for all other steps.
             -->
-            <testcase name="'ACI: Multiple ACIs: Separate targetattrs and targattrfilters with equals and not equals'">
+            <testcase name="getTestCaseName('Separate targetattrs and targattrfilters with equals and not equals')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -3826,7 +3826,7 @@
                                             0 for steps 1, 2,`and 3, and
                                             50 for all other steps.
             -->
-            <testcase name="'ACI: Separate targetattrs and targattrfilters with not equals'">
+            <testcase name="getTestCaseName('Separate targetattrs and targattrfilters with not equals')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -3963,7 +3963,7 @@
                                             0 for step 1, and
                                             50 for all other steps.
             -->
-            <testcase name="'ACI: Multiple ACIs: Separate targetattrs and targattrfilters with deny'">
+            <testcase name="getTestCaseName('Separate targetattrs and targattrfilters with deny')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -4100,7 +4100,7 @@
                                             0 for steps 1, 2, and 3 and
                                             50 for all other steps.
             -->
-            <testcase name="'ACI: Multiple ACIs: Separate targetattrs with deny and targattrfilters '">
+            <testcase name="getTestCaseName('Separate targetattrs with deny and targattrfilters ')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -4232,7 +4232,7 @@
             -->
             <!-- cross reference to http://docs.sun.com/source/816-6698-10/aci.html -->
             <!-- cross reference to DS6 docs -->
-            <testcase name="'ACI: Multiple ACIs: Postamble'">
+            <testcase name="getTestCaseName('Postamble')">
             <sequence>
               <call function="'testCase_Preamble'"/>
               <message>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/backends/backendsetup.xml b/opendj-sdk/opends/tests/functional-tests/testcases/backends/backendsetup.xml
index ce26d4a..a9f1208 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/backends/backendsetup.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/backends/backendsetup.xml
@@ -65,7 +65,7 @@
           #@TestResult
           -->
             
-          <testcase name="'Backend: Backend Setup'">
+          <testcase name="getTestCaseName('Backend Setup')">
     
             <sequence>
     
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/backends/backup-tasks.xml b/opendj-sdk/opends/tests/functional-tests/testcases/backends/backup-tasks.xml
index 2a1ebe9..daf5ae5 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/backends/backup-tasks.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/backends/backup-tasks.xml
@@ -41,7 +41,7 @@
           <import machine="STAF_LOCAL_HOSTNAME"
                   file="'%s/testcases/backends/backend_setup.xml' % (TESTS_DIR)" />
           <call function="'backend_setup'"> { 'loadBackend' : True } </call>
-          <testcase name="'Backend: Backup Tasks: Test 1'">
+          <testcase name="getTestCaseName('Test 1')">
             <sequence>
               <call function="'testCase_Preamble'"/>
               <message>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/backends/backup.xml b/opendj-sdk/opends/tests/functional-tests/testcases/backends/backup.xml
index 0a010db..0666c17 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/backends/backup.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/backends/backup.xml
@@ -64,7 +64,7 @@
             #@TestPostamble
             #@TestResult Success if backup returns 0
           -->
-          <testcase name="'Backend: Backup: Test 1'">
+          <testcase name="getTestCaseName('Test 1')">
             <sequence>
               <call function="'testCase_Preamble'"/>
               <message>
@@ -96,7 +96,7 @@
             #@TestPostamble
             #@TestResult Success if backup returns 0
           -->
-          <testcase name="'Backend: Backup: Test 2'">
+          <testcase name="getTestCaseName('Test 2')">
             <sequence>
               <call function="'testCase_Preamble'"/>
               <message>
@@ -128,7 +128,7 @@
             #@TestPostamble
             #@TestResult Success if backup returns 0
           -->
-          <testcase name="'Backend: Backup: Test 3'">
+          <testcase name="getTestCaseName('Test 3')">
             <sequence>
               <call function="'testCase_Preamble'"/>
               <message>
@@ -159,7 +159,7 @@
             #@TestPostamble
             #@TestResult Success if backup returns 0
           -->
-          <testcase name="'Backend: Backup: Test 4'">
+          <testcase name="getTestCaseName('Test 4')">
             <sequence>
               <call function="'testCase_Preamble'" />
               <message>
@@ -190,7 +190,7 @@
             #@TestPostamble
             #@TestResult Success if backup returns 0
           -->
-          <testcase name="'Backend: Backup: Test 5'">
+          <testcase name="getTestCaseName('Test 5')">
             <sequence>
               <call function="'testCase_Preamble'"/>
               <message>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/backends/export-tasks.xml b/opendj-sdk/opends/tests/functional-tests/testcases/backends/export-tasks.xml
index 7d75544..a10e010 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/backends/export-tasks.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/backends/export-tasks.xml
@@ -62,7 +62,7 @@
               #@TestPostamble
               #@TestResult          Success if OpenDS returns 0
             -->
-            <testcase name="'Backend: Export Tasks: Test 1'">
+            <testcase name="getTestCaseName('Test 1')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                 <message>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/backends/export.xml b/opendj-sdk/opends/tests/functional-tests/testcases/backends/export.xml
index 2b315dc..ea234ff 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/backends/export.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/backends/export.xml
@@ -94,7 +94,7 @@
                 #@TestPostamble
                 #@TestResult          Success if exportLDIF, importLDIF, and checkImport returns 0
           -->
-          <testcase name="'Backend: Export: Export default backend'">
+          <testcase name="getTestCaseName('Export default backend')">
             <sequence>
               <call function="'testCase_Preamble'" />
               <message>
@@ -175,7 +175,7 @@
                 #@TestPostamble
                 #@TestResult          Success if Success if exportLDIF, importLDIF returns 0
           -->
-          <testcase name="'Backend: Export: Export non-default backend'">
+          <testcase name="getTestCaseName('Export non-default backend')">
             <sequence>
               <call function="'testCase_Preamble'"/>
               <message>
@@ -221,7 +221,7 @@
                 #@TestPostamble
                 #@TestResult          Success if exportLDIF, importLDIF, and checkImport returns 0
           -->
-          <testcase name="'Backend: Export: Export Fractional Include Branch'">
+          <testcase name="getTestCaseName('Export Fractional Include Branch')">
             <sequence>
               <call function="'testCase_Preamble'"/>
               <message>
@@ -303,7 +303,7 @@
                 #@TestPostamble
                 #@TestResult          Success if exportLDIF, importLDIF, and checkImport returns 0
           -->
-          <testcase name="'Backend: Export: Export Fractional Include Branches'">
+          <testcase name="getTestCaseName('Export Fractional Include Branches')">
             <sequence>
               <call function="'testCase_Preamble'"/>
               <message>
@@ -383,7 +383,7 @@
                 #@TestPostamble
                 #@TestResult          Success if exportLDIF, importLDIF, and checkImport returns 0
           -->
-          <testcase name="'Backend: Export: Export Fractional Exclude Branch'">
+          <testcase name="getTestCaseName('Export Fractional Exclude Branch')">
             <sequence>
               <call function="'testCase_Preamble'"/>
               <message>
@@ -465,7 +465,7 @@
                 #@TestPostamble
                 #@TestResult          Success if exportLDIF, importLDIF, and checkImport returns 0
           -->
-          <testcase name="'Backend: Export: Export Fractional Exclude Branches'">
+          <testcase name="getTestCaseName('Export Fractional Exclude Branches')">
             <sequence>
               <call function="'testCase_Preamble'"/>
               <message>
@@ -547,7 +547,7 @@
                 #@TestPostamble
                 #@TestResult          Success if exportLDIF, importLDIF, and checkImport returns 0
           -->
-          <testcase name="'Backend: Export: Export Fractional Branches Mix'">
+          <testcase name="getTestCaseName('Export Fractional Branches Mix')">
             <sequence>
               <call function="'testCase_Preamble'"/>
               <message>
@@ -625,7 +625,7 @@
                 #@TestPostamble
                 #@TestResult          Success if exportLDIF, importLDIF, and checkImport returns 0
           -->
-          <testcase name="'Backend: Export: Export Fractional Include Attribute'">
+          <testcase name="getTestCaseName('Export Fractional Include Attribute')">
             <sequence>
               <call function="'testCase_Preamble'"/>
               <message>
@@ -706,7 +706,7 @@
                 #@TestPostamble
                 #@TestResult          Success if exportLDIF, importLDIF, and checkImport returns 0
           -->
-          <testcase name="'Backend: Export: Export Fractional Include Attributes'">
+          <testcase name="getTestCaseName('Export Fractional Include Attributes')">
             <sequence>
               <call function="'testCase_Preamble'"/>
               <message>
@@ -788,7 +788,7 @@
                 #@TestPostamble
                 #@TestResult          Success if exportLDIF, importLDIF, and checkImport returns 0
           -->
-          <testcase name="'Backend: Export: Export Fractional Exclude Attribute'">
+          <testcase name="getTestCaseName('Export Fractional Exclude Attribute')">
             <sequence>
               <call function="'testCase_Preamble'"/>
               <message>
@@ -869,7 +869,7 @@
                 #@TestPostamble
                 #@TestResult          Success if exportLDIF, importLDIF, and checkImport returns 0
           -->
-          <testcase name="'Backend: Export: Export Fractional Exclude Attributes'">
+          <testcase name="getTestCaseName('Export Fractional Exclude Attributes')">
             <sequence>
               <call function="'testCase_Preamble'"/>
               <message>
@@ -952,7 +952,7 @@
                 #@TestPostamble
                 #@TestResult          Success if exportLDIF, importLDIF, and checkImport returns 0
           -->
-          <testcase name="'Backend: Export: Export Fractional Mix'">
+          <testcase name="getTestCaseName('Export Fractional Mix')">
             <sequence>
               <call function="'testCase_Preamble'"/>
               <message>
@@ -1035,7 +1035,7 @@
                 #@TestPostamble
                 #@TestResult          Success if exportLDIF, importLDIF, and checkImport returns 0
           -->
-          <testcase name="'Backend: Export: Export Filtered Include'">
+          <testcase name="getTestCaseName('Export Filtered Include')">
             <sequence>
               <call function="'testCase_Preamble'"/>
               <message>
@@ -1117,7 +1117,7 @@
                 #@TestPostamble
                 #@TestResult          Success if exportLDIF, importLDIF, and checkImport returns 0
           -->
-          <testcase name="'Backend: Export: Export Filtered Includes'">
+          <testcase name="getTestCaseName('Export Filtered Includes')">
             <sequence>
               <call function="'testCase_Preamble'"/>
               <message>
@@ -1199,7 +1199,7 @@
                 #@TestPostamble
                 #@TestResult          Success if exportLDIF, importLDIF, and checkImport returns 0
           -->
-          <testcase name="'Backend: Export: Export Filtered Exclude'">
+          <testcase name="getTestCaseName('Export Filtered Exclude')">
             <sequence>
               <call function="'testCase_Preamble'"/>
               <message>
@@ -1283,7 +1283,7 @@
                 #@TestPostamble
                 #@TestResult          Success if exportLDIF, importLDIF, and checkImport returns 0
           -->
-          <testcase name="'Backend: Export: Export Filtered Excludes'">
+          <testcase name="getTestCaseName('Export Filtered Excludes')">
             <sequence>
               <call function="'testCase_Preamble'"/>
               <message>
@@ -1366,7 +1366,7 @@
                 #@TestPostamble
                 #@TestResult          Success if exportLDIF, importLDIF, and checkImport returns 0
           -->
-          <testcase name="'Backend: Export: Export Filtered Includes'">
+          <testcase name="getTestCaseName('Export Filtered Includes')">
             <sequence>
               <call function="'testCase_Preamble'"/>
               <message>
@@ -1444,7 +1444,7 @@
                 #@TestPostamble
                 #@TestResult          Success if exportLDIF, importLDIF, and checkImport returns 0
           -->
-          <testcase name="'Backend: Export: Export Filtered Includes Complex'">
+          <testcase name="getTestCaseName('Export Filtered Includes Complex')">
             <sequence>
               <call function="'testCase_Preamble'"/>
               <message>
@@ -1523,7 +1523,7 @@
                 #@TestPostamble
                 #@TestResult          Success if exportLDIF, importLDIF, and checkImport returns 0
           -->
-          <testcase name="'Backend: Export: Export Filtered Excludes Complex'">
+          <testcase name="getTestCaseName('Export Filtered Excludes Complex')">
             <sequence>
               <call function="'testCase_Preamble'"/>
               <message>
@@ -1605,7 +1605,7 @@
                 #@TestPostamble
                 #@TestResult          Success if exportLDIF, importLDIF, and checkImport returns 0
           -->
-          <testcase name="'Backend: Export: Export Fractional Filtered Mix'">
+          <testcase name="getTestCaseName('Export Fractional Filtered Mix')">
             <sequence>
               <call function="'testCase_Preamble'"/>
               <message>
@@ -1687,7 +1687,7 @@
                 #@TestPostamble
                 #@TestResult          Success if exportLDIF, importLDIF, and checkImport returns 0
           -->
-          <testcase name="'Backend: Export: Export Append To LDIF'">
+          <testcase name="getTestCaseName('Export Append To LDIF')">
             <sequence>
               <call function="'testCase_Preamble'"/>
               <message>
@@ -1770,7 +1770,7 @@
                 #@TestPostamble
                 #@TestResult          Success if exportLDIF, importLDIF, and checkImport returns 0
           -->
-          <testcase name="'Backend: Export: Export Compress LDIF'">
+          <testcase name="getTestCaseName('Export Compress LDIF')">
             <sequence>
               <call function="'testCase_Preamble'"/>
               <message>
@@ -1851,7 +1851,7 @@
                 #@TestPostamble
                 #@TestResult          Success if exportLDIF, importLDIF, and checkImport returns 0
           -->
-          <testcase name="'Backend: Export: Export Encrypt LDIF'">
+          <testcase name="getTestCaseName('Export Encrypt LDIF')">
             <sequence>
               <call function="'testCase_Preamble'"/>
               <message>
@@ -1938,7 +1938,7 @@
                 #@TestPostamble
                 #@TestResult          Success if exportLDIF, importLDIF, and checkImport returns 0
           -->
-          <testcase name="'Backend: Export: Export Wrap Column'">
+          <testcase name="getTestCaseName('Export Wrap Column')">
             <sequence>
               <call function="'testCase_Preamble'"/>
               <message>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/backends/import-tasks.xml b/opendj-sdk/opends/tests/functional-tests/testcases/backends/import-tasks.xml
index 1561a0e..8984b16 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/backends/import-tasks.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/backends/import-tasks.xml
@@ -61,7 +61,7 @@
             #@TestPostamble
             #@TestResult
           -->
-          <testcase name="'Backend: Import Tasks: LDIF Default'">
+          <testcase name="getTestCaseName('LDIF Default')">
             <sequence>
               <call function="'testCase_Preamble'"/>
               <call function="'importLdifTask'">
@@ -99,7 +99,7 @@
             #@TestPostamble
             #@TestResult
           -->
-          <testcase name="'Backend: Import Tasks: Fractional Include Branch'">
+          <testcase name="getTestCaseName('Fractional Include Branch')">
             <sequence>
               <call function="'testCase_Preamble'"/>
               <call function="'importLdifTask'">
@@ -138,7 +138,7 @@
             #@TestPostamble
             #@TestResult
           -->
-          <testcase name="'Backend: Import Tasks: Fractional Include Branches'">
+          <testcase name="getTestCaseName('Fractional Include Branches')">
             <sequence>
               <call function="'testCase_Preamble'"/>
               <call function="'importLdifTask'">
@@ -177,7 +177,7 @@
             #@TestPostamble
             #@TestResult
           -->
-          <testcase name="'Backend: Import Tasks: Fractional Exclude Branch'">
+          <testcase name="getTestCaseName('Fractional Exclude Branch')">
             <sequence>
               <call function="'testCase_Preamble'" />
               <call function="'importLdifTask'">
@@ -218,7 +218,7 @@
             #@TestPostamble
             #@TestResult
           -->
-          <testcase name="'Backend: Import Tasks: Fractional Exclude Branches'">
+          <testcase name="getTestCaseName('Fractional Exclude Branches')">
             <sequence>
               <call function="'testCase_Preamble'" />
               <call function="'importLdifTask'">
@@ -261,7 +261,7 @@
             #@TestPostamble
             #@TestResult
           -->
-          <testcase name="'Backend: Import Tasks: Fractional Branches Mix'">
+          <testcase name="getTestCaseName('Fractional Branches Mix')">
             <sequence>
               <call function="'testCase_Preamble'"/>
               <call function="'importLdifTask'">
@@ -305,7 +305,7 @@
             #@TestPostamble
             #@TestResult
           -->
-          <testcase name="'Backend: Import Tasks: Fractional Include Attribute'">
+          <testcase name="getTestCaseName('Fractional Include Attribute')">
             <sequence>
               <call function="'testCase_Preamble'" />
               <call function="'importLdifTask'">
@@ -343,7 +343,7 @@
             #@TestPostamble
             #@TestResult
           -->
-          <testcase name="'Backend: Import Tasks: Fractional Include Attributes'">
+          <testcase name="getTestCaseName('Fractional Include Attributes')">
             <sequence>
               <call function="'testCase_Preamble'" />
               <call function="'importLdifTask'">
@@ -382,7 +382,7 @@
             #@TestPostamble
             #@TestResult
           -->
-          <testcase name="'Backend: Import Tasks: Fractional Exclude Attribute'">
+          <testcase name="getTestCaseName('Fractional Exclude Attribute')">
             <sequence>
               <call function="'testCase_Preamble'" />
               <call function="'importLdifTask'">
@@ -419,7 +419,7 @@
             #@TestPostamble
             #@TestResult
           -->
-          <testcase name="'Backend: Import Tasks: Fractional Exclude Attributes'">
+          <testcase name="getTestCaseName('Fractional Exclude Attributes')">
             <sequence>
               <call function="'testCase_Preamble'" />
               <call function="'importLdifTask'">
@@ -457,7 +457,7 @@
             #@TestPostamble
             #@TestResult
           -->
-          <testcase name="'Backend: Import Tasks: Fractional Mix'">
+          <testcase name="getTestCaseName('Fractional Mix')">
             <sequence>
               <call function="'testCase_Preamble'" />
               <call function="'importLdifTask'">
@@ -500,7 +500,7 @@
             #@TestPostamble
             #@TestResult
           -->
-          <testcase name="'Backend: Import Tasks: Filtered Include'">
+          <testcase name="getTestCaseName('Filtered Include')">
             <sequence>
               <call function="'testCase_Preamble'" />
               <call function="'importLdifTask'">
@@ -538,7 +538,7 @@
             #@TestPostamble
             #@TestResult
           -->
-          <testcase name="'Backend: Import Tasks: Filtered Exclude'">
+          <testcase name="getTestCaseName('Filtered Exclude')">
             <sequence>
               <call function="'testCase_Preamble'"/>
               <call function="'importLdifTask'">
@@ -579,7 +579,7 @@
             #@TestPostamble
             #@TestResult
           -->
-          <testcase name="'Backend: Import Tasks: Filtered Includes'">
+          <testcase name="getTestCaseName('Filtered Includes')">
             <sequence>
               <call function="'testCase_Preamble'"/>
               <call function="'importLdifTask'">
@@ -620,7 +620,7 @@
             #@TestPostamble
             #@TestResult
           -->
-          <testcase name="'Backend: Import Tasks: Filtered Excludes'">
+          <testcase name="getTestCaseName('Filtered Excludes')">
             <sequence>
               <call function="'testCase_Preamble'"/>
               <call function="'importLdifTask'">
@@ -658,7 +658,7 @@
             #@TestPostamble
             #@TestResult
           -->
-          <testcase name="'Backend: Import Tasks: Filtered Includes Complex'">
+          <testcase name="getTestCaseName('Filtered Includes Complex')">
             <sequence>
               <call function="'testCase_Preamble'"/>
               <call function="'importLdifTask'">
@@ -696,7 +696,7 @@
             #@TestPostamble
             #@TestResult
           -->
-          <testcase name="'Backend: Import Tasks: Filtered Excludes Complex'">
+          <testcase name="getTestCaseName('Filtered Excludes Complex')">
             <sequence>
               <call function="'testCase_Preamble'"/>
               <call function="'importLdifTask'">
@@ -734,7 +734,7 @@
             #@TestPostamble
             #@TestResult
           -->
-          <testcase name="'Backend: Import Tasks: Fractional Filtered Mix'">
+          <testcase name="getTestCaseName('Fractional Filtered Mix')">
             <sequence>
               <call function="'testCase_Preamble'"/>
               <call function="'importLdifTask'">
@@ -774,7 +774,7 @@
             #@TestPostamble
             #@TestResult
           -->
-          <testcase name="'Backend: Import Tasks: Append'">
+          <testcase name="getTestCaseName('Append')">
             <sequence>
               <call function="'testCase_Preamble'"/>
               <call function="'importLdifTask'">
@@ -812,7 +812,7 @@
             #@TestPostamble
             #@TestResult
           -->
-          <testcase name="'Backend: Import Tasks: Append Replace Existing'">
+          <testcase name="getTestCaseName('Append Replace Existing')">
             <sequence>
               <call function="'testCase_Preamble'"/>
               <call function="'importLdifTask'">
@@ -851,7 +851,7 @@
             #@TestPostamble
             #@TestResult
           -->
-          <testcase name="'Backend: Import Tasks: Compressed'">
+          <testcase name="getTestCaseName('Compressed')">
             <sequence>
               <call function="'testCase_Preamble'"/>
               <call function="'importLdifTask'">
@@ -891,7 +891,7 @@
             #@TestResult
           -->
           
-          <testcase name="'Backend: Import Tasks: Encrypted'">
+          <testcase name="getTestCaseName('Encrypted')">
             <sequence>
               <call function="'testCase_Preamble'"/>
               <call function="'importLdifTask'">
@@ -947,7 +947,7 @@
             #@TestPostamble
             #@TestResult
           -->
-          <testcase name="'Backend: Import Tasks: Rejects File'">
+          <testcase name="getTestCaseName('Rejects File')">
             <sequence>
               <call function="'testCase_Preamble'"/>
               <call function="'importLdifTask'">
@@ -987,7 +987,7 @@
             #@TestPostamble
             #@TestResult
           -->
-          <testcase name="'Backend: Import Tasks: Rejects File'">
+          <testcase name="getTestCaseName('Rejects File')">
             <sequence>
               <call function="'testCase_Preamble'"/>
               <call function="'importLdifTask'">
@@ -1028,7 +1028,7 @@
             #@TestPostamble
             #@TestResult
           -->
-            <testcase name="'Backend: Import Tasks: Skip Schema Validation Accept'">
+            <testcase name="getTestCaseName('Skip Schema Validation Accept')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                 <call function="'importLdifTask'">
@@ -1067,7 +1067,7 @@
               #@TestPostamble
               #@TestResult
             -->
-          <testcase name="'Backend: Import Tasks: Skip Schema Validation Reject'">
+          <testcase name="getTestCaseName('Skip Schema Validation Reject')">
             <sequence>
               <call function="'testCase_Preamble'"/>
               <call function="'importLdifTask'">
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/backends/import.xml b/opendj-sdk/opends/tests/functional-tests/testcases/backends/import.xml
index f3a08e1..eec9464 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/backends/import.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/backends/import.xml
@@ -73,7 +73,7 @@
           #@TestResult
           -->
             
-          <testcase name="'Backend: Import: LDIF Default'">
+          <testcase name="getTestCaseName('LDIF Default')">
     
             <sequence>
     
@@ -114,7 +114,7 @@
           -->
     
           <!--  Not clear how to create a second backend    
-          <testcase name="'Backend: Import: LDIF Non Default'">
+          <testcase name="getTestCaseName('LDIF Non Default')">
     
             <sequence>
     
@@ -152,7 +152,7 @@
           #@TestResult
           -->
     
-          <testcase name="'Backend: Import: Fractional Include Branch'">
+          <testcase name="getTestCaseName('Fractional Include Branch')">
     
             <sequence>
     
@@ -194,7 +194,7 @@
           #@TestResult
           -->
     
-          <testcase name="'Backend: Import: Fractional Include Branch with backend ID'">
+          <testcase name="getTestCaseName('Fractional Include Branch with backend ID')">
     
             <sequence>
     
@@ -236,7 +236,7 @@
           #@TestResult
           -->
     
-          <testcase name="'Backend: Import: Fractional Include Branches'">
+          <testcase name="getTestCaseName('Fractional Include Branches')">
     
             <sequence>
     
@@ -277,7 +277,7 @@
           #@TestResult
           -->
     
-          <testcase name="'Backend: Import: Fractional Exclude Branch'">
+          <testcase name="getTestCaseName('Fractional Exclude Branch')">
     
             <sequence>
     
@@ -322,7 +322,7 @@
           #@TestResult
           -->
     
-          <testcase name="'Backend: Import: Fractional Exclude Branches'">
+          <testcase name="getTestCaseName('Fractional Exclude Branches')">
     
             <sequence>
     
@@ -367,7 +367,7 @@
           #@TestResult
           -->
     
-          <testcase name="'Backend: Import: Fractional Branches Mix'">
+          <testcase name="getTestCaseName('Fractional Branches Mix')">
     
             <sequence>
     
@@ -412,7 +412,7 @@
           #@TestResult
           -->
     
-          <testcase name="'Backend: Import: Fractional Include Attribute'">
+          <testcase name="getTestCaseName('Fractional Include Attribute')">
     
             <sequence>
     
@@ -454,7 +454,7 @@
           #@TestResult
           -->
     
-          <testcase name="'Backend: Import: Fractional Include Attributes'">
+          <testcase name="getTestCaseName('Fractional Include Attributes')">
     
             <sequence>
     
@@ -497,7 +497,7 @@
           #@TestResult
           -->
     
-          <testcase name="'Backend: Import: Fractional Exclude Attribute'">
+          <testcase name="getTestCaseName('Fractional Exclude Attribute')">
     
             <sequence>
     
@@ -539,7 +539,7 @@
           #@TestResult
           -->
     
-          <testcase name="'Backend: Import: Fractional Exclude Attributes'">
+          <testcase name="getTestCaseName('Fractional Exclude Attributes')">
     
             <sequence>
     
@@ -581,7 +581,7 @@
           #@TestResult
           -->
     
-          <testcase name="'Backend: Import: Fractional Mix'">
+          <testcase name="getTestCaseName('Fractional Mix')">
     
             <sequence>
     
@@ -627,7 +627,7 @@
           #@TestResult
           -->
     
-          <testcase name="'Backend: Import: Filtered Include'">
+          <testcase name="getTestCaseName('Filtered Include')">
     
             <sequence>
     
@@ -670,7 +670,7 @@
           #@TestResult
           -->
     
-          <testcase name="'Backend: Import: Filtered Exclude'">
+          <testcase name="getTestCaseName('Filtered Exclude')">
     
             <sequence>
     
@@ -715,7 +715,7 @@
           #@TestResult
           -->
     
-          <testcase name="'Backend: Import: Filtered Includes'">
+          <testcase name="getTestCaseName('Filtered Includes')">
     
             <sequence>
     
@@ -760,7 +760,7 @@
           #@TestResult
           -->
     
-          <testcase name="'Backend: Import: Filtered Excludes'">
+          <testcase name="getTestCaseName('Filtered Excludes')">
     
             <sequence>
     
@@ -802,7 +802,7 @@
           #@TestResult
           -->
     
-          <testcase name="'Backend: Import: Filtered Includes Complex'">
+          <testcase name="getTestCaseName('Filtered Includes Complex')">
     
             <sequence>
     
@@ -845,7 +845,7 @@
           #@TestResult
           -->
           
-          <testcase name="'Backend: Import: Filtered Excludes Complex'">
+          <testcase name="getTestCaseName('Filtered Excludes Complex')">
     
             <sequence>
     
@@ -887,7 +887,7 @@
           #@TestResult
           -->
     
-          <testcase name="'Backend: Import: Fractional Filtered Mix'">
+          <testcase name="getTestCaseName('Fractional Filtered Mix')">
     
             <sequence>
     
@@ -930,7 +930,7 @@
           #@TestResult
           -->
     
-          <testcase name="'Backend: Import: Append'">
+          <testcase name="getTestCaseName('Append')">
     
             <sequence>
     
@@ -973,7 +973,7 @@
           #@TestResult
           -->
     
-          <testcase name="'Backend: Import: Append Replace Existing'">
+          <testcase name="getTestCaseName('Append Replace Existing')">
     
             <sequence>
     
@@ -1017,7 +1017,7 @@
           #@TestResult
           -->
     
-          <testcase name="'Backend: Import: Compressed'">
+          <testcase name="getTestCaseName('Compressed')">
     
             <sequence>
     
@@ -1060,7 +1060,7 @@
           #@TestResult
           -->
     
-          <testcase name="'Backend: Import: Encrypted'">
+          <testcase name="getTestCaseName('Encrypted')">
     
             <sequence>
     
@@ -1122,7 +1122,7 @@
           #@TestResult
           -->
     
-          <testcase name="'Backend: Import: Rejects File'">
+          <testcase name="getTestCaseName('Rejects File')">
     
             <sequence>
     
@@ -1165,7 +1165,7 @@
           #@TestResult
           -->
     
-          <testcase name="'Backend: Import: Rejects File Overwrite'">
+          <testcase name="getTestCaseName('Rejects File Overwrite')">
     
             <sequence>
     
@@ -1208,7 +1208,7 @@
           #@TestResult
           -->
     
-          <testcase name="'Backend: Import: Skip Schema Validation Accept'">
+          <testcase name="getTestCaseName('Skip Schema Validation Accept')">
     
             <sequence>
     
@@ -1251,7 +1251,7 @@
           #@TestResult
           -->
     
-          <testcase name="'Backend: Import: Skip Schema Validation Reject'">
+          <testcase name="getTestCaseName('Skip Schema Validation Reject')">
     
             <sequence>
     
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/backends/restore-tasks.xml b/opendj-sdk/opends/tests/functional-tests/testcases/backends/restore-tasks.xml
index f46ba8c..ab17741 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/backends/restore-tasks.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/backends/restore-tasks.xml
@@ -62,7 +62,7 @@
             #@TestPostamble
             #@TestResult          Success if OpenDS returns 0
           -->
-          <testcase name="'Backend: Restore Tasks: Test 1'">
+          <testcase name="getTestCaseName('Test 1')">
             <sequence>
               <call function="'testCase_Preamble'"/>
               <message>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/backends/restore.xml b/opendj-sdk/opends/tests/functional-tests/testcases/backends/restore.xml
index b13453b..2cafd08 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/backends/restore.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/backends/restore.xml
@@ -79,7 +79,7 @@
             #@TestPostamble
             #@TestResult Success if restore returns 0
           -->
-          <testcase name="'Backend: Restore: Test 1'">
+          <testcase name="getTestCaseName('Test 1')">
             <sequence>
               <call function="'testCase_Preamble'"/>
               <message>
@@ -149,7 +149,7 @@
             #@TestPostamble
             #@TestResult Success if restore returns 0
           -->
-           <testcase name="'Backend: Restore: Test 2'">
+           <testcase name="getTestCaseName('Test 2')">
             <sequence>
               <call function="'testCase_Preamble'"/>
               <message>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/clu/cluCompare.xml b/opendj-sdk/opends/tests/functional-tests/testcases/clu/cluCompare.xml
index 15b0d5f..51938f0 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/clu/cluCompare.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/clu/cluCompare.xml
@@ -78,7 +78,7 @@
             #@TestResult          Success if ldapCompareWithScript returns 0
           -->
                
-                 <testcase name="'Clu: Ldap Compare: Test Case #1'">
+                 <testcase name="getTestCaseName('Test Case #1')">
         
                   <sequence>
           
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/clu/cluDelete.xml b/opendj-sdk/opends/tests/functional-tests/testcases/clu/cluDelete.xml
index 70da598..0741f27 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/clu/cluDelete.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/clu/cluDelete.xml
@@ -78,7 +78,7 @@
             #@TestResult          Success if ldapDeleteWithScript returns 0
           -->
                
-                 <testcase name="'Clu: Ldap Delete: Test Case #1'">
+                 <testcase name="getTestCaseName('Test Case #1')">
         
                   <sequence>
           
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/clu/cluModify.xml b/opendj-sdk/opends/tests/functional-tests/testcases/clu/cluModify.xml
index 0bcb6a5..de5c487 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/clu/cluModify.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/clu/cluModify.xml
@@ -78,7 +78,7 @@
             #@TestResult          Success if ldapModifyWithScript returns 0
           -->
                
-                 <testcase name="'Clu: Ldap Modify: Test Case #1'">
+                 <testcase name="getTestCaseName('Test Case #1')">
         
                   <sequence>
           
@@ -117,7 +117,7 @@
             #@TestResult          Success if ldapModifyWithScript returns 0
           -->
                
-                 <testcase name="'Clu: Ldap Modify: Test Case #2'">
+                 <testcase name="getTestCaseName('Test Case #2')">
         
                   <sequence>
           
@@ -157,7 +157,7 @@
             #@TestResult          Success if ldapModifyWithScript returns 0
           -->
                
-                 <testcase name="'Clu: Ldap Modify: Test Case #3'">
+                 <testcase name="getTestCaseName('Test Case #3')">
         
                   <sequence>
           
@@ -197,7 +197,7 @@
             #@TestResult          Success if ldapModifyWithScript returns 0
           -->
                
-                 <testcase name="'Clu: Ldap Modify: Test Case #4'">
+                 <testcase name="getTestCaseName('Test Case #4')">
         
                   <sequence>
           
@@ -235,7 +235,7 @@
             #@TestResult          Success if ldapModifyWithScript returns 0
           -->
                
-         <!--        <testcase name="'Clu: Ldap Modify: Test Case #5'">
+         <!--        <testcase name="getTestCaseName('Test Case #5')">
         
                   <sequence>
           
@@ -275,7 +275,7 @@
             #@TestResult          Success if ldapModifyWithScript returns 0
           -->
                
-                 <testcase name="'Clu: Ldap Modify: Test Case #6'">
+                 <testcase name="getTestCaseName('Test Case #6')">
         
                   <sequence>
           
@@ -313,7 +313,7 @@
             #@TestResult          Success if ldapModifyWithScript returns 0
           -->
                
-                 <testcase name="'Clu: Ldap Modify: Test Case #7'">
+                 <testcase name="getTestCaseName('Test Case #7')">
         
                   <sequence>
           
@@ -353,7 +353,7 @@
           -->
                <!-- this test is prompting for the password 
                
-                 <testcase name="'Clu: Ldap Modify: Test Case #8'">
+                 <testcase name="getTestCaseName('Test Case #8')">
         
                   <sequence>
           
@@ -391,7 +391,7 @@
             #@TestResult          Success if ldapModifyWithScript returns 0
           -->
                
-                 <testcase name="'Clu: Ldap Modify: Test Case #9'">
+                 <testcase name="getTestCaseName('Test Case #9')">
         
                   <sequence>
           
@@ -430,7 +430,7 @@
             #@TestResult          Success if ldapModifyWithScript returns 0
           -->
                
-                 <testcase name="'Clu: Ldap Modify: Test Case #10'">
+                 <testcase name="getTestCaseName('Test Case #10')">
         
                   <sequence>
           
@@ -469,7 +469,7 @@
             #@TestResult          Success if ldapModifyWithScript returns 0
           -->
                
-                 <testcase name="'Clu: Ldap Modify: Test Case #11'">
+                 <testcase name="getTestCaseName('Test Case #11')">
         
                   <sequence>
           
@@ -508,7 +508,7 @@
             #@TestResult          Success if ldapModifyWithScript returns 0
           -->
                
-                 <testcase name="'Clu: Ldap Modify: Test Case #12'">
+                 <testcase name="getTestCaseName('Test Case #12')">
         
                   <sequence>
           
@@ -546,7 +546,7 @@
             #@TestResult          Success if ldapModifyWithScript returns 0
           -->
                
-                 <testcase name="'Clu: Ldap Modify: Test Case #13'">
+                 <testcase name="getTestCaseName('Test Case #13')">
         
                   <sequence>
           
@@ -585,7 +585,7 @@
             #@TestResult          Success if ldapModifyWithScript returns 0
           -->
                
-                 <testcase name="'Clu: Ldap Modify: Test Case #14'">
+                 <testcase name="getTestCaseName('Test Case #14')">
         
                   <sequence>
           
@@ -624,7 +624,7 @@
             #@TestResult          Success if ldapModifyWithScript returns 0
           -->
                <!-- needs a -R option?
-                 <testcase name="'Clu: Ldap Modify: Test Case #15'">
+                 <testcase name="getTestCaseName('Test Case #15')">
         
                   <sequence>
           
@@ -662,7 +662,7 @@
             #@TestResult          Success if ldapModifyWithScript returns 0
           -->
                
-                 <testcase name="'Clu: Ldap Modify: Test Case #16'">
+                 <testcase name="getTestCaseName('Test Case #16')">
         
                   <sequence>
           
@@ -701,7 +701,7 @@
             #@TestResult          Success if ldapModifyWithScript returns 0
           -->
                <!-- need a -b option
-                 <testcase name="'Clu: Ldap Modify: Test Case #17'">
+                 <testcase name="getTestCaseName('Test Case #17')">
         
                   <sequence>
           
@@ -739,7 +739,7 @@
             #@TestResult          Success if ldapModifyWithScript returns 0
           -->
                <!-- need a -F option
-                 <testcase name="'Clu: Ldap Modify: Test Case #18'">
+                 <testcase name="getTestCaseName('Test Case #18')">
         
                   <sequence>
           
@@ -777,7 +777,7 @@
             #@TestResult          Success if ldapModifyWithScript returns 0
           -->
                <!-- need a -e option
-                 <testcase name="'Clu: Ldap Modify: Test Case #19'">
+                 <testcase name="getTestCaseName('Test Case #19')">
         
                   <sequence>
           
@@ -815,7 +815,7 @@
             #@TestResult          Success if ldapModifyWithScript returns 0
           -->
                
-                 <testcase name="'Clu: Ldap Modify: Test Case #20'">
+                 <testcase name="getTestCaseName('Test Case #20')">
         
                   <sequence>
           
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/clu/cluSearch.xml b/opendj-sdk/opends/tests/functional-tests/testcases/clu/cluSearch.xml
index 1cf0e67..1725c5e 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/clu/cluSearch.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/clu/cluSearch.xml
@@ -75,7 +75,7 @@
             #@TestResult          Success if ldapSearchWithScript returns 0
           -->
                
-                 <testcase name="'Clu: Ldap Search: Test Case #1'">
+                 <testcase name="getTestCaseName('Test Case #1')">
         
                   <sequence>
           
@@ -116,7 +116,7 @@
                                   
           -->
                
-                 <testcase name="'Clu: Ldap Search: Test Case #2'">
+                 <testcase name="getTestCaseName('Test Case #2')">
         
                   <sequence>
           
@@ -155,7 +155,7 @@
                                   
           -->
                
-                 <testcase name="'Clu: Ldap Search: Test Case #3'">
+                 <testcase name="getTestCaseName('Test Case #3')">
         
                   <sequence>
           
@@ -196,7 +196,7 @@
                                   
           -->
                
-                 <testcase name="'Clu: Ldap Search: Test Case #4'">
+                 <testcase name="getTestCaseName('Test Case #4')">
         
                   <sequence>
           
@@ -236,7 +236,7 @@
                                   
           -->
                
-                 <testcase name="'Clu: Ldap Search: Test Case #5'">
+                 <testcase name="getTestCaseName('Test Case #5')">
         
                   <sequence>
           
@@ -277,7 +277,7 @@
                                   
           -->
                
-                 <testcase name="'Clu: Ldap Search: Test Case #6'">
+                 <testcase name="getTestCaseName('Test Case #6')">
         
                   <sequence>
           
@@ -318,7 +318,7 @@
                                   
           -->
                
-         <!--        <testcase name="'Clu: Ldap Search: Test Case #7'">
+         <!--        <testcase name="getTestCaseName('Test Case #7')">
         
                   <sequence>
           
@@ -358,7 +358,7 @@
                                   
           -->
                
-                 <testcase name="'Clu: Ldap Search: Test Case #8'">
+                 <testcase name="getTestCaseName('Test Case #8')">
         
                   <sequence>
           
@@ -399,7 +399,7 @@
                                   
           -->
                
-                 <testcase name="'Clu: Ldap Search: Test Case #9'">
+                 <testcase name="getTestCaseName('Test Case #9')">
         
                   <sequence>
           
@@ -441,7 +441,7 @@
                                   
           -->
                
-                 <testcase name="'Clu: Ldap Search: Test Case #10'">
+                 <testcase name="getTestCaseName('Test Case #10')">
         
                   <sequence>
           
@@ -483,7 +483,7 @@
                                   
           -->
                
-                 <testcase name="'Clu: Ldap Search: Test Case #11'">
+                 <testcase name="getTestCaseName('Test Case #11')">
         
                   <sequence>
           
@@ -523,7 +523,7 @@
                                   
           -->
                
-                 <testcase name="'Clu: Ldap Search: Test Case #12'">
+                 <testcase name="getTestCaseName('Test Case #12')">
         
                   <sequence>
           
@@ -564,7 +564,7 @@
                                   
           -->
                
-                 <testcase name="'Clu: Ldap Search: Test Case #13'">
+                 <testcase name="getTestCaseName('Test Case #13')">
         
                   <sequence>
           
@@ -603,7 +603,7 @@
                                                                     
           -->
                
-                 <testcase name="'Clu: Ldap Search: Test Case #14'">
+                 <testcase name="getTestCaseName('Test Case #14')">
         
                   <sequence>
           
@@ -644,7 +644,7 @@
                                                                     
           -->
                
-                 <testcase name="'Clu: Ldap Search: Test Case #15'">
+                 <testcase name="getTestCaseName('Test Case #15')">
         
                   <sequence>
           
@@ -684,7 +684,7 @@
                                                                     
           -->
                
-                 <testcase name="'Clu: Ldap Search: Test Case #17'">
+                 <testcase name="getTestCaseName('Test Case #17')">
         
                   <sequence>
           
@@ -724,7 +724,7 @@
                                                                     
           -->
                
-                 <testcase name="'Clu: Ldap Search: Test Case #18'">
+                 <testcase name="getTestCaseName('Test Case #18')">
         
                   <sequence>
           
@@ -765,7 +765,7 @@
                                                                     
           -->
                
-                 <testcase name="'Clu: Ldap Search: Test Case #19'">
+                 <testcase name="getTestCaseName('Test Case #19')">
         
                   <sequence>
           
@@ -805,7 +805,7 @@
                                                                     
           -->
                
-                 <testcase name="'Clu: Ldap Search: Test Case #20'">
+                 <testcase name="getTestCaseName('Test Case #20')">
         
                   <sequence>
           
@@ -847,7 +847,7 @@
                                                                     
           -->
                
-                 <testcase name="'Clu: Ldap Search: Test Case #21'">
+                 <testcase name="getTestCaseName('Test Case #21')">
         
                   <sequence>
           
@@ -888,7 +888,7 @@
                                                                     
           -->
                
-                 <testcase name="'Clu: Ldap Search: Test Case #24'">
+                 <testcase name="getTestCaseName('Test Case #24')">
         
                   <sequence>
           
@@ -929,7 +929,7 @@
                                                                     
           -->
                
-                 <testcase name="'Clu: Ldap Search: Test Case #31'">
+                 <testcase name="getTestCaseName('Test Case #31')">
         
                   <sequence>
           
@@ -970,7 +970,7 @@
                                                                     
           -->
                
-                 <testcase name="'Clu: Ldap Search: Test Case #32'">
+                 <testcase name="getTestCaseName('Test Case #32')">
         
                   <sequence>
           
@@ -1012,7 +1012,7 @@
                                                                     
           -->
                
-                 <testcase name="'Clu: Ldap Search: Test Case #33'">
+                 <testcase name="getTestCaseName('Test Case #33')">
         
                   <sequence>
           
@@ -1053,7 +1053,7 @@
                                                                     
           -->
                
-                 <testcase name="'Clu: Ldap Search: Test Case #34'">
+                 <testcase name="getTestCaseName('Test Case #34')">
         
                   <sequence>
           
@@ -1095,7 +1095,7 @@
                                                                     
           -->
                
-                 <testcase name="'Clu: Ldap Search: Test Case #35'">
+                 <testcase name="getTestCaseName('Test Case #35')">
         
                   <sequence>
           
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/core/core.xml b/opendj-sdk/opends/tests/functional-tests/testcases/core/core.xml
index 5794a35..cb652fa 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/core/core.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/core/core.xml
@@ -26,55 +26,23 @@
  !      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  ! -->
 <stax>
-
-  <defaultcall function="main_core"/>
-
+  <defaultcall function="main_core" />
   <function name="main_core">
-
-    <sequence>
-
-      <block name="'core'">
-      
-        <sequence>
-  
-          <script>
-            CurrentTestPath['group']='core'
-          </script>
-            
-          <call function="'testGroup_Preamble'"/>
-			
-			
-			          
-          <import machine="STAF_LOCAL_HOSTNAME"
-            file="'%s/testcases/core/core_entry_cache.xml' % (TESTS_DIR)"/>
-          <call function="'core_entry_cache'" />
-             
-          <import machine="STAF_LOCAL_HOSTNAME"
-            file="'%s/testcases/core/core_search_sizelimit.xml' % (TESTS_DIR)"/>
-          <call function="'core_search_sizelimit'" />
-          
-          <import machine="STAF_LOCAL_HOSTNAME"
-            file="'%s/testcases/core/core_search_timelimit.xml' % (TESTS_DIR)"/>
-          <call function="'core_search_timelimit'" />
-          
-          <import machine="STAF_LOCAL_HOSTNAME"
-            file="'%s/testcases/core/core_tf_filters.xml' % (TESTS_DIR)"/>
-          <call function="'core_tf_filters'" />
-          
-          <import machine="STAF_LOCAL_HOSTNAME"
-            file="'%s/testcases/core/core_version_report.xml' % (TESTS_DIR)"/>
-          <call function="'core_version_report'" />
-          
-						
-			    
-          <call function="'testGroup_Postamble'"/>
-      
-        </sequence>
-    
-      </block>
-    
-    </sequence>
-
+    <block name="'core'">
+      <sequence>
+        <script>
+          CurrentTestPath['group']='core'
+        </script>
+        <call function="'testGroup_Preamble'" />
+        <iterate var="_test" in="['core_entry_cache','core_search_sizelimit','core_tf_filters','core_version_report']">
+          <sequence>
+            <import machine="STAF_LOCAL_HOSTNAME"
+                    file="'%s/testcases/core/%s.xml' % (TESTS_DIR,_test)" />
+            <call function="'%s' % _test" />
+          </sequence>
+        </iterate>
+        <call function="'testGroup_Postamble'" />
+      </sequence>
+    </block>
   </function>
-
 </stax>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/core/core_cleanup.xml b/opendj-sdk/opends/tests/functional-tests/testcases/core/core_cleanup.xml
index 982a108..bbd0976 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/core/core_cleanup.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/core/core_cleanup.xml
@@ -26,69 +26,50 @@
  !      Portions Copyright 2007 Sun Microsystems, Inc.
  ! -->
 <stax>
-
-  <defaultcall function="core_cleanup"/>
-
+  <defaultcall function="core_cleanup" />
   <function name="core_cleanup">
-
     <sequence>
-
       <block name="'cleanup'">
-      
         <sequence>
-
-			
-          <block name="'Block DS Process Stop'">				
-          <!--- Stop DS -->
-		    <sequence>
+          <block name="'Block DS Process Stop'">
+            <!--- Stop DS -->
+            <sequence>
               <message>
                  'Stop DS running on port %s' % (DIRECTORY_INSTANCE_PORT)
               </message>
-
               <call function="'StopDsWithScript'">
                 { 'location'  : STAF_REMOTE_HOSTNAME,
                   'dsHost'    : DIRECTORY_INSTANCE_HOST,
                   'dsPort'    : DIRECTORY_INSTANCE_PORT,
                   'dsBindDN'  : DIRECTORY_INSTANCE_DN,
-                  'dsBindPwd' : DIRECTORY_INSTANCE_PSWD }
+                  'dsBindPwd' : DIRECTORY_INSTANCE_PSWD
+                }
               </call>
-
               <call function="'checkRC'">
-                  { 'returncode' : RC ,
-                    'result'     : STAXResult }
+                { 'returncode' : RC ,
+                  'result'     : STAXResult
+                }
               </call>
-
-		    </sequence>			  
-          <!--- End Block DS Process Stop -->
+            </sequence>
+            <!--- End Block DS Process Stop -->
           </block>
-			
-						  			  			  
-
-		  <block name="'Block Remove DS Topology'">
-		  <!-- Remove  the topology created for the test suite -->
-			<sequence>
-				
+          <block name="'Block Remove DS Topology'">
+            <!-- Remove  the topology created for the test suite -->
+            <sequence>
               <message>
                  'Remove DS topology created for the Test Suite'
-              </message>				  
-
-			  <call function="'removeTopology'"/>
-				
-			  <call function="'checkRC'">
-                  { 'returncode' : RC ,
-                    'result'     : STAXResult }
+              </message>
+              <call function="'removeTopology'" />
+              <call function="'checkRC'">
+                { 'returncode' : RC ,
+                  'result'     : STAXResult
+                }
               </call>
-			
-			</sequence>			  
-		  <!-- End Block Remove DS Topology-->  
-		  </block>	  														  
-			        
-			
-        </sequence>        
+            </sequence>
+            <!-- End Block Remove DS Topology-->  
+          </block>
+        </sequence>
       </block>
-            
-     </sequence>
-
+    </sequence>
   </function>
-
 </stax>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/core/core_entry_cache.xml b/opendj-sdk/opends/tests/functional-tests/testcases/core/core_entry_cache.xml
index 1dc6a32..b59c31e 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/core/core_entry_cache.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/core/core_entry_cache.xml
@@ -26,241 +26,192 @@
  !      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  ! -->
 <stax>
-
-  <defaultcall function="core_entry_cache"/>
-
+  <defaultcall function="core_entry_cache" />
   <function name="core_entry_cache">
-
     <sequence>
-
       <block name="'entry-cache'">
-      
         <sequence>
-  
           <script>
             if not CurrentTestPath.has_key('group'):
-              CurrentTestPath['group']='core'						  
+              CurrentTestPath['group']='core'
             CurrentTestPath['suite']=STAXCurrentBlock
           </script>
-            
-          <call function="'testSuite_Preamble'"/>
-
-
+          <call function="'testSuite_Preamble'" />
           <import machine="STAF_LOCAL_HOSTNAME"
-            file="'%s/testcases/core/core_setup.xml' % (TESTS_DIR)"/>
-          <call function="'core_setup'"/>
-
-												    
+                  file="'%s/testcases/core/core_setup.xml' % (TESTS_DIR)" />
+          <call function="'core_setup'" />
           <!--- Test Case : Entry Cache: Default Search -->
-          <testcase name="'Core: Entry Cache: Default Search'">
+          <testcase name="getTestCaseName('Default Search')">
             <sequence>
-            
-              <call function="'testCase_Preamble'"/>
-              
+              <call function="'testCase_Preamble'" />
               <message>
-                 'Check the response of OpenDS when an ldap search request is conducted with a single pipe character ("|") for an existing entry'
+               'Check the response of OpenDS when an ldap search request is conducted with a single pipe character ("|") for an existing entry'
               </message>
-    
               <call function="'SearchObject'">
-                { 'dsInstanceHost'   : DIRECTORY_INSTANCE_HOST ,
-                  'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
-                  'dsInstanceDn'     : DIRECTORY_INSTANCE_DN ,
-                  'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,
-                  'dsBaseDN'         : 'cn=version,cn=monitor' ,
-                  'dsFilter'         : '|' ,
-                  'extraParams'	   : '' }
-                  
+                { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
+                  'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
+                  'dsInstanceDn'   : DIRECTORY_INSTANCE_DN,
+                  'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
+                  'dsBaseDN'       : 'cn=version,cn=monitor',
+                  'dsFilter'       : '|' ,
+                  'extraParams'	   : ''
+                }
               </call>
-    
               <call function="'checktestRC'">
-                  { 'returncode' : RC ,
-                    'result'     : STAXResult }
+                { 'returncode' : RC ,
+                  'result'     : STAXResult
+                }
               </call>
-              
-              <call function="'testCase_Postamble'"/>
-              
+              <call function="'testCase_Postamble'" />
             </sequence>
           </testcase>
           
           <!--- Test Case : Entry Cache: Enable Default -->
-          <testcase name="'Core: Entry Cache: Enable Default'">
+          <testcase name="getTestCaseName('Enable Default')">
             <sequence>
-            
-              <call function="'testCase_Preamble'"/>
-              
+              <call function="'testCase_Preamble'" />
               <message>
-                 'Enable the default entry cache'
+               'Enable the default entry cache'
               </message>
-              
               <call function="'dsconfig'">
-                    { 'dsInstanceHost'         : DIRECTORY_INSTANCE_HOST ,
-                      'dsInstancePort'         : DIRECTORY_INSTANCE_PORT ,
-                      'dsInstanceDn'           : DIRECTORY_INSTANCE_DN ,
-                      'dsInstancePswd'         : DIRECTORY_INSTANCE_PSWD ,
-                      'subcommand'             : 'set-entry-cache-prop' ,
-                      'optionsString'          : '--set enabled:true'
-                    }
+                { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
+                  'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
+                  'dsInstanceDn'   : DIRECTORY_INSTANCE_DN,
+                  'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
+                  'subcommand'     : 'set-entry-cache-prop',
+                  'optionsString'  : '--set enabled:true'
+                }
               </call>
-    
               <call function="'checktestRC'">
-                  { 'returncode' : RC ,
-                    'result'     : STAXResult }
+                { 'returncode' : RC ,
+                  'result'     : STAXResult
+                }
               </call>
-              
-              <call function="'testCase_Postamble'"/>
-              
+              <call function="'testCase_Postamble'" />
             </sequence>
           </testcase>
           
           <!--- Test Case : Entry Cache: Add Attributes -->
-          <testcase name="'Core: Entry Cache: Add Attributes'">
+          <testcase name="getTestCaseName('Add Attributes')">
             <sequence>
-            
-              <call function="'testCase_Preamble'"/>
-              
+              <call function="'testCase_Preamble'" />
               <message>
-                 'Add three attributes to cn=Entry Cache,cn=config'
+               'Add three attributes to cn=Entry Cache,cn=config'
               </message>
-                            
               <call function="'dsconfig'">
-                    { 'dsInstanceHost'         : DIRECTORY_INSTANCE_HOST ,
-                      'dsInstancePort'         : DIRECTORY_INSTANCE_PORT ,
-                      'dsInstanceDn'           : DIRECTORY_INSTANCE_DN ,
-                      'dsInstancePswd'         : DIRECTORY_INSTANCE_PSWD ,
-                      'subcommand'             : 'set-entry-cache-prop' ,
-                      'optionsString'          : '--set lock-timeout:60s'
-                    }
+                { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
+                  'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
+                  'dsInstanceDn'   : DIRECTORY_INSTANCE_DN,
+                  'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
+                  'subcommand'     : 'set-entry-cache-prop',
+                  'optionsString'  : '--set lock-timeout:60s'
+                }
+              </call>
+              <call function="'dsconfig'">
+                { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
+                  'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
+                  'dsInstanceDn'   : DIRECTORY_INSTANCE_DN,
+                  'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
+                  'subcommand'     : 'set-entry-cache-prop',
+                  'optionsString'  : '--set exclude-filter:telephonenumber=*'
+                }
               </call>
                             
               <call function="'dsconfig'">
-                    { 'dsInstanceHost'         : DIRECTORY_INSTANCE_HOST ,
-                      'dsInstancePort'         : DIRECTORY_INSTANCE_PORT ,
-                      'dsInstanceDn'           : DIRECTORY_INSTANCE_DN ,
-                      'dsInstancePswd'         : DIRECTORY_INSTANCE_PSWD ,
-                      'subcommand'             : 'set-entry-cache-prop' ,
-                      'optionsString'          : '--set exclude-filter:telephonenumber=*'
-                    }
+                { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
+                  'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
+                  'dsInstanceDn'   : DIRECTORY_INSTANCE_DN,
+                  'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
+                  'subcommand'     : 'set-entry-cache-prop',
+                  'optionsString'  : '--set include-filter:roomNumber=*'
+                }
               </call>
-                            
-              <call function="'dsconfig'">
-                    { 'dsInstanceHost'         : DIRECTORY_INSTANCE_HOST ,
-                      'dsInstancePort'         : DIRECTORY_INSTANCE_PORT ,
-                      'dsInstanceDn'           : DIRECTORY_INSTANCE_DN ,
-                      'dsInstancePswd'         : DIRECTORY_INSTANCE_PSWD ,
-                      'subcommand'             : 'set-entry-cache-prop' ,
-                      'optionsString'          : '--set include-filter:roomNumber=*'
-                    }
-              </call>
-    
               <call function="'checktestRC'">
-                  { 'returncode' : RC ,
-                    'result'     : STAXResult }
+                { 'returncode' : RC ,
+                  'result'     : STAXResult
+                }
               </call>
-              
-              <call function="'testCase_Postamble'"/>
-              
+              <call function="'testCase_Postamble'" />
             </sequence>
           </testcase>
           
           <!--- Test Case : Entry Cache: Attribute Already Exists -->
-          <testcase name="'Core: Entry Cache: Attribute Already Exists'">
+          <testcase name="getTestCaseName('Attribute Already Exists')">
             <sequence>
-            
-              <call function="'testCase_Preamble'"/>
-              
+              <call function="'testCase_Preamble'" />
               <message>
-                 'Add one attribute that is not allowed under cn=Entry Cache,cn=config'
+               'Add one attribute that is not allowed under cn=Entry Cache,cn=config'
               </message>
-                                          
               <call function="'dsconfig'">
-                    { 'dsInstanceHost'         : DIRECTORY_INSTANCE_HOST ,
-                      'dsInstancePort'         : DIRECTORY_INSTANCE_PORT ,
-                      'dsInstanceDn'           : DIRECTORY_INSTANCE_DN ,
-                      'dsInstancePswd'         : DIRECTORY_INSTANCE_PSWD ,
-                      'subcommand'             : 'set-entry-cache-prop' ,
-                      'optionsString'          : '--add max-entries:100000',
-                      'expectedRC'             : 1  
-                    }
+                { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
+                  'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
+                  'dsInstanceDn'   : DIRECTORY_INSTANCE_DN,
+                  'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
+                  'subcommand'     : 'set-entry-cache-prop',
+                  'optionsString'  : '--add max-entries:100000',
+                  'expectedRC'     : 1  
+                }
               </call>
-              
-              <call function="'testCase_Postamble'"/>
-              
+              <call function="'testCase_Postamble'" />
             </sequence>
           </testcase>
            
           <!--- Test Case : Entry Cache: FIFO Cache-->
-          <testcase name="'Core: Entry Cache: FIFO Cache'">
+          <testcase name="getTestCaseName('FIFO Cache')">
             <sequence>
-            
-              <call function="'testCase_Preamble'"/>
-              
+              <call function="'testCase_Preamble'" />
               <message>
-                 'Add second entry cache which is an object of the ds-cfg-fifo-entry-cache class'
+               'Add second entry cache which is an object of the ds-cfg-fifo-entry-cache class'
               </message>
-              
               <call function="'addEntry'">
-                { 'dsInstanceHost'   : DIRECTORY_INSTANCE_HOST ,
-                  'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
-                  'dsInstanceDn'     : DIRECTORY_INSTANCE_DN ,
-                  'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,
-                  'entryToBeAdded'   : '%s/core/ldifs/mod_entrycache5.ldif' % logsRemoteDataDir }
+                { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
+                  'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
+                  'dsInstanceDn'   : DIRECTORY_INSTANCE_DN,
+                  'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
+                  'entryToBeAdded' : '%s/core/ldifs/mod_entrycache5.ldif' % logsRemoteDataDir
+                }
               </call>
-              
               <call function="'checktestRC'">
-                  { 'returncode' : RC ,
-                    'result'     : STAXResult }
+                { 'returncode' : RC ,
+                  'result'     : STAXResult
+                }
               </call>
-              
-              <call function="'testCase_Postamble'"/>
-              
+              <call function="'testCase_Postamble'" />
             </sequence>
           </testcase>
           
           <!--- Test Case : Entry Cache: Search -->
-          <testcase name="'Core: Entry Cache: Cache Search'">
+          <testcase name="getTestCaseName('Cache Search')">
             <sequence>
-            
-              <call function="'testCase_Preamble'"/>
-              
+              <call function="'testCase_Preamble'" />
               <message>
-                 'Check the response of OpenDS when an ldap search request is conducted'
+               'Check the response of OpenDS when an ldap search request is conducted'
               </message>
-              
               <call function="'SearchObject'">
-                { 'dsInstanceHost'   : DIRECTORY_INSTANCE_HOST ,
-                  'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
-                  'dsInstanceDn'     : DIRECTORY_INSTANCE_DN ,
-                  'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,
-                  'dsBaseDN'         : 'ou=People,o=core tests,dc=example,dc=com' ,
-                  'dsFilter'         : 'objectclass=*' ,
-                  'extraParams'	   : '' }
+                { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
+                  'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
+                  'dsInstanceDn'   : DIRECTORY_INSTANCE_DN,
+                  'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
+                  'dsBaseDN'       : 'ou=People,o=core tests,dc=example,dc=com',
+                  'dsFilter'       : 'objectclass=*',
+                  'extraParams'	   : ''
+                }
               </call>
-    
               <call function="'checktestRC'">
-                  { 'returncode' : RC ,
-                    'result'     : STAXResult }
+                { 'returncode' : RC ,
+                  'result'     : STAXResult
+                }
               </call>
-              
-              <call function="'testCase_Postamble'"/>
-              
+              <call function="'testCase_Postamble'" />
             </sequence>
-            
           </testcase>
-
-
+          
           <import machine="STAF_LOCAL_HOSTNAME"
-            file="'%s/testcases/core/core_cleanup.xml' % (TESTS_DIR)"/>
-          <call function="'core_cleanup'"/>
-
-												          
-          <call function="'testSuite_Postamble'"/>
-
+                  file="'%s/testcases/core/core_cleanup.xml' % (TESTS_DIR)" />
+          <call function="'core_cleanup'" />
+          <call function="'testSuite_Postamble'" />
         </sequence>
-    
       </block>
-    
     </sequence>
-
   </function>
-
 </stax>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/core/core_search_sizelimit.xml b/opendj-sdk/opends/tests/functional-tests/testcases/core/core_search_sizelimit.xml
index 20db9db..73d83b1 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/core/core_search_sizelimit.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/core/core_search_sizelimit.xml
@@ -26,318 +26,283 @@
  !      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  ! -->
 <stax>
-
-  <defaultcall function="core_search_sizelimit"/>
-
+  <defaultcall function="core_search_sizelimit" />
   <function name="core_search_sizelimit">
-
     <sequence>
-
       <block name="'search-sizelimit'">
-      
         <sequence>
-  
           <script>
             if not CurrentTestPath.has_key('group'):
-              CurrentTestPath['group']='core'								  
+              CurrentTestPath['group']='core'
             CurrentTestPath['suite']=STAXCurrentBlock
           </script>
-            
-          <call function="'testSuite_Preamble'"/>
-
-
+          <call function="'testSuite_Preamble'" />
           <import machine="STAF_LOCAL_HOSTNAME"
-            file="'%s/testcases/core/core_setup.xml' % (TESTS_DIR)"/>
-          <call function="'core_setup'"/>
-
-												    
-
+                  file="'%s/testcases/core/core_setup.xml' % (TESTS_DIR)" />
+          <call function="'core_setup'" />
           <!--- Test Case : Search Size Limit: Size Limit Exceeded -->
-          <testcase name="'Core: Search Size Limit: Size Limit Exceeded'">
+          <testcase name="getTestCaseName('Size Limit Exceeded')">
             <sequence>
-              <call function="'testCase_Preamble'"/>
+              <call function="'testCase_Preamble'" />
               <message>
-                 'Core SSzL1: Check the response of OpenDS when an ldap search request is conducted with a search size limit defined in the command line and the search size is exceeed '
+               'Core SSzL1: Check the response of OpenDS when an ldap search request is conducted with a search size limit defined in the command line and the search size is exceeed '
               </message>
-    
               <call function="'SearchObject'">
-                { 'dsInstanceHost'   : DIRECTORY_INSTANCE_HOST ,
-                  'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
-                  'dsInstanceDn'     : DIRECTORY_INSTANCE_DN ,
-                  'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,
-                  'dsBaseDN'         : 'ou=People,o=core tests,dc=example,dc=com' ,
-                  'dsFilter'         : 'objectclass=*' ,
-                  'extraParams'	     : '-z 150' ,
-                  'expectedRC'       : 4
+                { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
+                  'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
+                  'dsInstanceDn'   : DIRECTORY_INSTANCE_DN,
+                  'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
+                  'dsBaseDN'       : 'ou=People,o=core tests,dc=example,dc=com',
+                  'dsFilter'       : 'objectclass=*',
+                  'extraParams'	   : '-z 150',
+                  'expectedRC'     : 4
                 }
-                  
               </call>
-    
-              <call function="'testCase_Postamble'"/>
+              <call function="'testCase_Postamble'" />
             </sequence>
           </testcase>
           
           <!--- Test Case : Search Size Limit: Size Limit Not Exceeded -->
-          <testcase name="'Core: Search Size Limit: Size Limit Not Exceeded'">
+          <testcase name="getTestCaseName('Size Limit Not Exceeded')">
             <sequence>
-              <call function="'testCase_Preamble'"/>
+              <call function="'testCase_Preamble'" />
               <message>
-                 'Core SSzL2: Check the response of OpenDS when an ldap search request is conducted with a search size limit defined in the command line and the search size is not exceeed'
+               'Core SSzL2: Check the response of OpenDS when an ldap search request is conducted with a search size limit defined in the command line and the search size is not exceeed'
               </message>
-    
               <call function="'SearchObject'">
-                { 'dsInstanceHost'   : DIRECTORY_INSTANCE_HOST ,
-                  'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
-                  'dsInstanceDn'     : DIRECTORY_INSTANCE_DN ,
-                  'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,
-                  'dsBaseDN'         : 'ou=People,o=core tests,dc=example,dc=com' ,
-                  'dsFilter'         : 'objectclass=*' ,
-                  'extraParams'	     : '-z 151' }
-                  
+                { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
+                  'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
+                  'dsInstanceDn'   : DIRECTORY_INSTANCE_DN,
+                  'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
+                  'dsBaseDN'       : 'ou=People,o=core tests,dc=example,dc=com',
+                  'dsFilter'       : 'objectclass=*',
+                  'extraParams'	   : '-z 151'
+                }
               </call>
-    
               <call function="'checktestRC'">
-                  { 'returncode' : RC ,
-                    'result'     : STAXResult }
+                { 'returncode' : RC ,
+                  'result'     : STAXResult
+                }
               </call>
-              <call function="'testCase_Postamble'"/>
+              <call function="'testCase_Postamble'" />
             </sequence>
           </testcase>
           
-           <!--- Test Case : Search Size Limit: Server Wide Size Limit 5 -->
-          <testcase name="'Core: Search Size Limit: Server Wide Size Limit 5'">
+          <!--- Test Case : Search Size Limit: Server Wide Size Limit 5 -->
+          <testcase name="getTestCaseName('Server Wide Size Limit 5')">
             <sequence>
-              <call function="'testCase_Preamble'"/>
+              <call function="'testCase_Preamble'" />
               <message>
-                 'Core SSzL3: Change the server-wide search size limit to 5'
+               'Core SSzL3: Change the server-wide search size limit to 5'
               </message>
-              
               <call function="'modifyGlobal'">
-                    { 'dsInstanceHost'         : DIRECTORY_INSTANCE_HOST ,
-                      'dsInstancePort'         : DIRECTORY_INSTANCE_PORT ,
-                      'dsInstanceDn'           : DIRECTORY_INSTANCE_DN ,
-                      'dsInstancePswd'         : DIRECTORY_INSTANCE_PSWD ,
-                      'attributeName'          : 'size-limit' ,
-                      'attributeValue'         : '5' }
-              </call>
-    
-              <call function="'checktestRC'">
-                  { 'returncode' : RC ,
-                    'result'     : STAXResult }
-              </call>
-              <call function="'testCase_Postamble'"/>
-            </sequence>
-          </testcase> 
-        
-          <!--- Test Case : Search Size Limit: Server Wide Size Limit Exceeded  -->
-          <testcase name="'Core: Search Size Limit: Server Wide Size Limit Exceeded'">
-            <sequence>
-              <call function="'testCase_Preamble'"/>
-              <message>
-                 'Core SSzL4: Check the response of OpenDS when an ldap search request is conducted with a search size limit defined by the server-wide parameter, ds-cfg-size-limit, and the search size limit is exceeded'
-              </message>
-    
-              <call function="'SearchObject'">
-                { 'dsInstanceHost'   : DIRECTORY_INSTANCE_HOST ,
-                  'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
-                  'dsBaseDN'         : 'ou=People,o=core tests,dc=example,dc=com' ,
-                  'dsFilter'         : 'objectclass=*' ,
-                  'expectedRC'       : 4
+                { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
+                  'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
+                  'dsInstanceDn'   : DIRECTORY_INSTANCE_DN,
+                  'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
+                  'attributeName'  : 'size-limit',
+                  'attributeValue' : '5'
                 }
-                  
               </call>
-    
-              <call function="'testCase_Postamble'"/>
+              <call function="'checktestRC'">
+                { 'returncode' : RC,
+                  'result'     : STAXResult
+                }
+              </call>
+              <call function="'testCase_Postamble'" />
+            </sequence>
+          </testcase>
+          
+          <!--- Test Case : Search Size Limit: Server Wide Size Limit Exceeded  -->
+          <testcase name="getTestCaseName('Server Wide Size Limit Exceeded')">
+            <sequence>
+              <call function="'testCase_Preamble'" />
+              <message>
+               'Core SSzL4: Check the response of OpenDS when an ldap search request is conducted with a search size limit defined by the server-wide parameter, ds-cfg-size-limit, and the search size limit is exceeded'
+              </message>
+              <call function="'SearchObject'">
+                { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
+                  'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
+                  'dsBaseDN'       : 'ou=People,o=core tests,dc=example,dc=com',
+                  'dsFilter'       : 'objectclass=*',
+                  'expectedRC'     : 4
+                }
+              </call>
+              <call function="'testCase_Postamble'" />
             </sequence>
           </testcase>
           
           <!--- Test Case : Search Size Limit: Server Wide Size Limit 1000-->
-          <testcase name="'Core: Search Size Limit: Server Wide Size Limit 1000'">
+          <testcase name="getTestCaseName('Server Wide Size Limit 1000')">
             <sequence>
-              <call function="'testCase_Preamble'"/>
+              <call function="'testCase_Preamble'" />
               <message>
-                 'Core SSzL5: Change the server-wide search size limit to 1000'
+               'Core SSzL5: Change the server-wide search size limit to 1000'
               </message>
-              
               <call function="'modifyGlobal'">
-                    { 'dsInstanceHost'         : DIRECTORY_INSTANCE_HOST ,
-                      'dsInstancePort'         : DIRECTORY_INSTANCE_PORT ,
-                      'dsInstanceDn'           : DIRECTORY_INSTANCE_DN ,
-                      'dsInstancePswd'         : DIRECTORY_INSTANCE_PSWD ,
-                      'attributeName'          : 'size-limit' ,
-                      'attributeValue'         : '1000' }
+                { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
+                  'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
+                  'dsInstanceDn'   : DIRECTORY_INSTANCE_DN,
+                  'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
+                  'attributeName'  : 'size-limit',
+                  'attributeValue' : '1000'
+                }
               </call>
-    
               <call function="'checktestRC'">
-                  { 'returncode' : RC ,
-                    'result'     : STAXResult }
+                { 'returncode' : RC ,
+                  'result'     : STAXResult
+                }
               </call>
-              <call function="'testCase_Postamble'"/>
+              <call function="'testCase_Postamble'" />
             </sequence>
           </testcase>
           
           <!--- Test Case : Search Size Limit: Server Wide Size Limit Not Exceeded -->
-          <testcase name="'Core: Search Size Limit: Server Wide Size Limit Not Exceeded '">
+          <testcase name="getTestCaseName('Server Wide Size Limit Not Exceeded ')">
             <sequence>
-              <call function="'testCase_Preamble'"/>
+              <call function="'testCase_Preamble'" />
               <message>
-                 'Core SSzL6: Check the response of OpenDS when an ldap search request is conducted with a search size limit defined by the server-wide parameter, ds-cfg-size-limit, and the search size limit is not exceeded'
+               'Core SSzL6: Check the response of OpenDS when an ldap search request is conducted with a search size limit defined by the server-wide parameter, ds-cfg-size-limit, and the search size limit is not exceeded'
               </message>
-    
               <call function="'SearchObject'">
-                { 'dsInstanceHost'   : DIRECTORY_INSTANCE_HOST ,
-                  'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
-                  'dsBaseDN'         : 'ou=People,o=core tests,dc=example,dc=com' ,
-                  'dsFilter'         : 'objectclass=*' }
-                  
+                { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
+                  'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
+                  'dsBaseDN'       : 'ou=People,o=core tests,dc=example,dc=com',
+                  'dsFilter'       : 'objectclass=*'
+                }
               </call>
-    
               <call function="'checktestRC'">
-                  { 'returncode' : RC ,
-                    'result'     : STAXResult }
+                { 'returncode' : RC ,
+                  'result'     : STAXResult
+                }
               </call>
-              <call function="'testCase_Postamble'"/>
+              <call function="'testCase_Postamble'" />
             </sequence>
           </testcase>
           
           <!--- Test Case : Search Size Limit: Directory Manager Size Limit 5 -->
-          <testcase name="'Core: Search Size Limit: Directory Manager Size Limit 5'">
+          <testcase name="getTestCaseName('Directory Manager Size Limit 5')">
             <sequence>
-              <call function="'testCase_Preamble'"/>
+              <call function="'testCase_Preamble'" />
               <message>
-                 'Core SSzL7: Change the search size limit for cn=Directory Manager to 5'
+               'Core SSzL7: Change the search size limit for cn=Directory Manager to 5'
               </message>
-    
               <call function="'addEntry'">
-                { 'dsInstanceHost'   : DIRECTORY_INSTANCE_HOST ,
-                  'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
-                  'dsInstanceDn'     : DIRECTORY_INSTANCE_DN ,
-                  'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,
-                  'entryToBeAdded'   : '%s/core/ldifs/mod_searchsizelimit3.ldif' % logsRemoteDataDir }
+                { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
+                  'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
+                  'dsInstanceDn'   : DIRECTORY_INSTANCE_DN,
+                  'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
+                  'entryToBeAdded' : '%s/core/ldifs/mod_searchsizelimit3.ldif' % logsRemoteDataDir
+                }
               </call>
-    
               <call function="'checktestRC'">
-                  { 'returncode' : RC ,
-                    'result'     : STAXResult }
+                { 'returncode' : RC ,
+                  'result'     : STAXResult
+                }
               </call>
-              <call function="'testCase_Postamble'"/>
+              <call function="'testCase_Postamble'" />
             </sequence>
           </testcase>
           
           <!--- Test Case : Search Size Limit: User Specific Size Limit Exceeded -->
-          <testcase name="'Core: Search Size Limit: User Specific Size Limit Exceeded'">
+          <testcase name="getTestCaseName('User Specific Size Limit Exceeded')">
             <sequence>
-              <call function="'testCase_Preamble'"/>
+              <call function="'testCase_Preamble'" />
               <message>
-                 'Core SSzL8: Check the response of OpenDS when an ldap search request is conducted with a user search size limit defined by the user-specific parameter, ds-rlim-size-limit, and the search size limit is exceeded'
+               'Core SSzL8: Check the response of OpenDS when an ldap search request is conducted with a user search size limit defined by the user-specific parameter, ds-rlim-size-limit, and the search size limit is exceeded'
               </message>
-    
               <call function="'SearchObject'">
-                { 'dsInstanceHost'   : DIRECTORY_INSTANCE_HOST ,
-                  'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
-                  'dsInstanceDn'     : DIRECTORY_INSTANCE_DN ,
-                  'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,
-                  'dsBaseDN'         : 'ou=People,o=core tests,dc=example,dc=com' ,
-                  'dsFilter'         : 'objectclass=*' ,
-                  'expectedRC'       : 4
+                { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
+                  'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
+                  'dsInstanceDn'   : DIRECTORY_INSTANCE_DN,
+                  'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
+                  'dsBaseDN'       : 'ou=People,o=core tests,dc=example,dc=com',
+                  'dsFilter'       : 'objectclass=*',
+                  'expectedRC'     : 4
                 }
-                  
               </call>
-    
-              <call function="'testCase_Postamble'"/>
+              <call function="'testCase_Postamble'" />
             </sequence>
           </testcase>
           
           <!--- Test Case : Search Size Limit: Size Limit Not Applicable  -->
-          <testcase name="'Core: Search Size Limit: Size Limit Not Applicable'">
+          <testcase name="getTestCaseName('Size Limit Not Applicable')">
             <sequence>
-              <call function="'testCase_Preamble'"/>
+              <call function="'testCase_Preamble'" />
               <message>
-                 'Core SSzL9: Check the response of OpenDS when an ldap search request is conducted with a user search size limit defined by the user-specific parameter, ds-rlim-size-limit, and the search is conducted as a bind to a different user'
+               'Core SSzL9: Check the response of OpenDS when an ldap search request is conducted with a user search size limit defined by the user-specific parameter, ds-rlim-size-limit, and the search is conducted as a bind to a different user'
               </message>
-    
               <call function="'SearchObject'">
-                { 'dsInstanceHost'   : DIRECTORY_INSTANCE_HOST ,
-                  'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
-                  'dsBaseDN'         : 'ou=People,o=core tests,dc=example,dc=com' ,
-                  'dsFilter'         : 'objectclass=*' }
-                  
+                { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
+                  'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
+                  'dsBaseDN'       : 'ou=People,o=core tests,dc=example,dc=com',
+                  'dsFilter'       : 'objectclass=*'
+                }
               </call>
-    
               <call function="'checktestRC'">
-                  { 'returncode' : RC ,
-                    'result'     : STAXResult }
+                { 'returncode' : RC ,
+                  'result'     : STAXResult
+                }
               </call>
-              <call function="'testCase_Postamble'"/>
+              <call function="'testCase_Postamble'" />
             </sequence>
           </testcase>
           
           <!--- Test Case : Search Size Limit: Modify Directory Manager Limit 0 -->
-          <testcase name="'Core: Search Size Limit: Modify Directory Manager Limit 0'">
+          <testcase name="getTestCaseName('Modify Directory Manager Limit 0')">
             <sequence>
-              <call function="'testCase_Preamble'"/>
+              <call function="'testCase_Preamble'" />
               <message>
-                 'Core SSzL10: Change the search size limit for cn=Directory Manager to 0'
+                'Core SSzL10: Change the search size limit for cn=Directory Manager to 0'
               </message>
-    
               <call function="'addEntry'">
-                { 'dsInstanceHost'   : DIRECTORY_INSTANCE_HOST ,
-                  'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
-                  'dsInstanceDn'     : DIRECTORY_INSTANCE_DN ,
-                  'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,
-                  'entryToBeAdded'   : '%s/core/ldifs/mod_searchsizelimit4.ldif' % logsRemoteDataDir }
+                { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
+                  'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
+                  'dsInstanceDn'   : DIRECTORY_INSTANCE_DN,
+                  'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
+                  'entryToBeAdded' : '%s/core/ldifs/mod_searchsizelimit4.ldif' % logsRemoteDataDir
+                }
               </call>
-    
               <call function="'checktestRC'">
-                  { 'returncode' : RC ,
-                    'result'     : STAXResult }
+                { 'returncode' : RC ,
+                  'result'     : STAXResult
+                }
               </call>
-              <call function="'testCase_Postamble'"/>
+              <call function="'testCase_Postamble'" />
             </sequence>
           </testcase>
           
           <!--- Test Case : Search Size Limit: No Size Limit -->
-          <testcase name="'Core: Search Size Limit: No Size Limit'">
+          <testcase name="getTestCaseName('No Size Limit')">
             <sequence>
-              <call function="'testCase_Preamble'"/>
+              <call function="'testCase_Preamble'" />
               <message>
-                 'Core SSzL11: Check the response of OpenDS when an ldap search request is conducted with a user search size limit defined as "unlimited" by the user-specific parameter, ds-rlim-size-limit, equal to -1 and the search is against 1150 entries'
+                'Core SSzL11: Check the response of OpenDS when an ldap search request is conducted with a user search size limit defined as "unlimited" by the user-specific parameter, ds-rlim-size-limit, equal to -1 and the search is against 1150 entries'
               </message>
-    
               <call function="'SearchObject'">
-                { 'dsInstanceHost'   : DIRECTORY_INSTANCE_HOST ,
-                  'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
-                  'dsInstanceDn'     : DIRECTORY_INSTANCE_DN ,
-                  'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,
-                  'dsBaseDN'         : 'ou=People,o=core tests,dc=example,dc=com' ,
-                  'dsFilter'         : 'objectclass=*' }
-                  
+                { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
+                  'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
+                  'dsInstanceDn'   : DIRECTORY_INSTANCE_DN,
+                  'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
+                  'dsBaseDN'       : 'ou=People,o=core tests,dc=example,dc=com',
+                  'dsFilter'       : 'objectclass=*'
+                }
               </call>
-    
               <call function="'checktestRC'">
-                  { 'returncode' : RC ,
-                    'result'     : STAXResult }
+                { 'returncode' : RC ,
+                  'result'     : STAXResult
+                }
               </call>
-              
-              <call function="'testCase_Postamble'"/>
-              
+              <call function="'testCase_Postamble'" />
             </sequence>
           </testcase>
 
-
           <import machine="STAF_LOCAL_HOSTNAME"
-            file="'%s/testcases/core/core_cleanup.xml' % (TESTS_DIR)"/>
-          <call function="'core_cleanup'"/>
-
-												          
-          <call function="'testSuite_Postamble'"/>
-
+                  file="'%s/testcases/core/core_cleanup.xml' % (TESTS_DIR)" />
+          <call function="'core_cleanup'" />
+          <call function="'testSuite_Postamble'" />
         </sequence>
-    
       </block>
-    
     </sequence>
-
   </function>
-
 </stax>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/core/core_search_timelimit.xml b/opendj-sdk/opends/tests/functional-tests/testcases/core/core_search_timelimit.xml
index da14c77..02c879e 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/core/core_search_timelimit.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/core/core_search_timelimit.xml
@@ -26,334 +26,303 @@
  !      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  ! -->
 <stax>
-
-  <defaultcall function="core_search_timelimit"/>
-
+  <defaultcall function="core_search_timelimit" />
   <function name="core_search_timelimit">
-
     <sequence>
-
       <block name="'search-timelimit'">
-      
         <sequence>
-  
           <script>
             if not CurrentTestPath.has_key('group'):
-              CurrentTestPath['group']='core'								  
+              CurrentTestPath['group']='core'
             CurrentTestPath['suite']=STAXCurrentBlock
           </script>
-            
-          <call function="'testSuite_Preamble'"/>
-
-
+          <call function="'testSuite_Preamble'" />
           <import machine="STAF_LOCAL_HOSTNAME"
-            file="'%s/testcases/core/core_setup.xml' % (TESTS_DIR)"/>
-          <call function="'core_setup'"/>
-
-	  <!--- Set the server wide size limit 0 to allow time limit tests to run properly-->
-            <sequence>
-              <message>
-                 'Set the server wide size limit 0 to allow time limit tests to run properly'
-              </message>
-                                          
-              <call function="'modifyGlobal'">
-                    { 'dsInstanceHost'         : DIRECTORY_INSTANCE_HOST ,
-                      'dsInstancePort'         : DIRECTORY_INSTANCE_PORT ,
-                      'dsInstanceDn'           : DIRECTORY_INSTANCE_DN ,
-                      'dsInstancePswd'         : DIRECTORY_INSTANCE_PSWD ,
-                      'attributeName'          : 'size-limit' ,
-                      'attributeValue'         : '0' }
-              </call>
-    
-              <call function="'checktestRC'">
-                  { 'returncode' : RC ,
-                    'result'     : STAXResult }
-              </call>
-            </sequence>
-											    
+                  file="'%s/testcases/core/core_setup.xml' % (TESTS_DIR)" />
+          <call function="'core_setup'" />
+          <!--- Set the server wide size limit 0 to allow time limit tests to run properly-->
+          <sequence>
+            <message>
+              'Set the server wide size limit 0 to allow time limit tests to run properly'
+            </message>
+            <call function="'modifyGlobal'">
+              { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
+                'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
+                'dsInstanceDn'   : DIRECTORY_INSTANCE_DN,
+                'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
+                'attributeName'  : 'size-limit',
+                'attributeValue' : '0'
+              }
+            </call>
+            <call function="'checktestRC'">
+              { 'returncode' : RC,
+                'result'     : STAXResult
+              }
+            </call>
+          </sequence>
+          
           <!--- Test Case : Search Time Limit: Time Limit Exceeded -->
-          <testcase name="'Core: Search Time Limit: Time Limit Exceeded'">
+          <testcase name="getTestCaseName('Time Limit Exceeded')">
             <sequence>
-              <call function="'testCase_Preamble'"/>
+              <call function="'testCase_Preamble'" />
               <message>
-                 'Core STmL1: Check the response of OpenDS when an ldap search request is conducted with a search time limit defined in the command line and the search time is exceeeded'
+                'Core STmL1: Check the response of OpenDS when an ldap search request is conducted with a search time limit defined in the command line and the search time is exceeeded'
               </message>
-    
               <call function="'SearchObject'">
-                { 'dsInstanceHost'   : DIRECTORY_INSTANCE_HOST ,
-                  'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
-                  'dsInstanceDn'     : DIRECTORY_INSTANCE_DN ,
-                  'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,
-                  'dsBaseDN'         : 'o=core tests,dc=example,dc=com' ,
-                  'dsFilter'         : 'objectclass=*' ,
-                  'extraParams'	     : '-l 1' ,
-                  'expectedRC'       : 3
+                { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
+                  'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
+                  'dsInstanceDn'   : DIRECTORY_INSTANCE_DN,
+                  'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
+                  'dsBaseDN'       : 'o=core tests,dc=example,dc=com',
+                  'dsFilter'       : 'objectclass=*',
+                  'extraParams'	   : '-l 1',
+                  'expectedRC'     : 3
                 }
               </call>
-
-              <call function="'testCase_Postamble'"/>
+              <call function="'testCase_Postamble'" />
             </sequence>
           </testcase>
           
           <!--- Test Case : Search Time Limit: Time Limit Not Exceeded -->
-          <testcase name="'Core: Search Time Limit: Time Limit Not Exceeded'">
+          <testcase name="getTestCaseName('Time Limit Not Exceeded')">
             <sequence>
-              <call function="'testCase_Preamble'"/>
+              <call function="'testCase_Preamble'" />
               <message>
-                 'Core STmL2: Check the response of OpenDS when an ldap search request is conducted with a search time limit defined in the command line and the search time is not exceeed'
+                'Core STmL2: Check the response of OpenDS when an ldap search request is conducted with a search time limit defined in the command line and the search time is not exceeed'
               </message>
-    
               <call function="'SearchObject'">
-                { 'dsInstanceHost'   : DIRECTORY_INSTANCE_HOST ,
-                  'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
-                  'dsInstanceDn'     : DIRECTORY_INSTANCE_DN ,
-                  'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,
-                  'dsBaseDN'         : 'o=core tests,dc=example,dc=com' ,
-                  'dsFilter'         : 'objectclass=*' ,
-                  'extraParams'	   : '-l 500' }
-                  
+                { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
+                  'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
+                  'dsInstanceDn'   : DIRECTORY_INSTANCE_DN,
+                  'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
+                  'dsBaseDN'       : 'o=core tests,dc=example,dc=com',
+                  'dsFilter'       : 'objectclass=*',
+                  'extraParams'	   : '-l 500'
+                }
               </call>
-    
               <call function="'checktestRC'">
-                  { 'returncode' : RC ,
-                    'result'     : STAXResult }
+                { 'returncode' : RC ,
+                  'result'     : STAXResult
+                }
               </call>
-              <call function="'testCase_Postamble'"/>
+              <call function="'testCase_Postamble'" />
             </sequence>
           </testcase>
           
-           <!--- Test Case : Search Time Limit: Server Wide Time Limit 1 second -->
-          <testcase name="'Core: Search Time Limit: Server Wide Time Limit 1 second'">
+          <!--- Test Case : Search Time Limit: Server Wide Time Limit 1 second -->
+          <testcase name="getTestCaseName('Server Wide Time Limit 1 second')">
             <sequence>
-              <call function="'testCase_Preamble'"/>
+              <call function="'testCase_Preamble'" />
               <message>
-                 'Core STmL3: Change the server-wide search time limit to 1 second'
+                'Core STmL3: Change the server-wide search time limit to 1 second'
               </message>
-
-                                                        
               <call function="'modifyGlobal'">
-                    { 'dsInstanceHost'         : DIRECTORY_INSTANCE_HOST ,
-                      'dsInstancePort'         : DIRECTORY_INSTANCE_PORT ,
-                      'dsInstanceDn'           : DIRECTORY_INSTANCE_DN ,
-                      'dsInstancePswd'         : DIRECTORY_INSTANCE_PSWD ,
-                      'attributeName'          : 'time-limit' ,
-                      'attributeValue'         : '1s' }
-              </call>
-              
-    
-              <call function="'checktestRC'">
-                  { 'returncode' : RC ,
-                    'result'     : STAXResult }
-              </call>
-              <call function="'testCase_Postamble'"/>
-            </sequence>
-          </testcase> 
-        
-          <!--- Test Case : Search Time Limit: Server Wide Time Limit Exceeded -->
-          <testcase name="'Core: Search Time Limit: Server Wide Time Limit Exceeded'">
-            <sequence>
-              <call function="'testCase_Preamble'"/>
-              <message>
-                 'Core STmL4: Check the response of OpenDS when an ldap search request is conducted with a search time limit defined by the server-wide parameter, ds-cfg-time-limit, and the search time limit is exceeded'
-              </message>
-    
-              <call function="'SearchObject'">
-                { 'dsInstanceHost'   : DIRECTORY_INSTANCE_HOST ,
-                  'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
-                  'dsBaseDN'         : 'o=core tests,dc=example,dc=com' ,
-                  'dsFilter'         : 'objectclass=*' ,
-                  'expectedRC'       : 3
+                { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
+                  'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
+                  'dsInstanceDn'   : DIRECTORY_INSTANCE_DN,
+                  'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
+                  'attributeName'  : 'time-limit',
+                  'attributeValue' : '1s'
                 }
               </call>
-
-              <call function="'testCase_Postamble'"/>
+              <call function="'checktestRC'">
+                { 'returncode' : RC ,
+                  'result'     : STAXResult
+                }
+              </call>
+              <call function="'testCase_Postamble'" />
+            </sequence>
+          </testcase>
+          
+          <!--- Test Case : Search Time Limit: Server Wide Time Limit Exceeded -->
+          <testcase name="getTestCaseName('Server Wide Time Limit Exceeded')">
+            <sequence>
+              <call function="'testCase_Preamble'" />
+              <message>
+                'Core STmL4: Check the response of OpenDS when an ldap search request is conducted with a search time limit defined by the server-wide parameter, ds-cfg-time-limit, and the search time limit is exceeded'
+              </message>
+              <call function="'SearchObject'">
+                { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
+                  'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
+                  'dsBaseDN'       : 'o=core tests,dc=example,dc=com',
+                  'dsFilter'       : 'objectclass=*',
+                  'expectedRC'     : 3
+                }
+              </call>
+              <call function="'testCase_Postamble'" />
             </sequence>
           </testcase>
           
           <!--- Test Case : Search Time Limit: Server Wide Time Limit 120 seconds -->
-          <testcase name="'Core: Search Time Limit: Server Wide Time Limit 120'seconds">
+          <testcase name="getTestCaseName('Server Wide Time Limit 120 seconds')">
             <sequence>
-              <call function="'testCase_Preamble'"/>
+              <call function="'testCase_Preamble'" />
               <message>
-                 'Core STmL5: Change the server-wide search time limit to 120 seconds'
+                'Core STmL5: Change the server-wide search time limit to 120 seconds'
               </message>
-                                                                     
               <call function="'modifyGlobal'">
-                    { 'dsInstanceHost'         : DIRECTORY_INSTANCE_HOST ,
-                      'dsInstancePort'         : DIRECTORY_INSTANCE_PORT ,
-                      'dsInstanceDn'           : DIRECTORY_INSTANCE_DN ,
-                      'dsInstancePswd'         : DIRECTORY_INSTANCE_PSWD ,
-                      'attributeName'          : 'time-limit' ,
-                      'attributeValue'         : '120s' }
+                { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
+                  'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
+                  'dsInstanceDn'   : DIRECTORY_INSTANCE_DN,
+                  'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
+                  'attributeName'  : 'time-limit',
+                  'attributeValue' : '120s'
+                }
               </call>
-    
               <call function="'checktestRC'">
-                  { 'returncode' : RC ,
-                    'result'     : STAXResult }
+                { 'returncode' : RC ,
+                  'result'     : STAXResult
+                }
               </call>
-              <call function="'testCase_Postamble'"/>
+              <call function="'testCase_Postamble'" />
             </sequence>
           </testcase>
           
           <!--- Test Case : Search Time Limit: Server Wide Time Limit Not Exceeded -->
-          <testcase name="'Core: Search Time Limit: Server Wide Time Limit Not Exceeded'">
+          <testcase name="getTestCaseName('Server Wide Time Limit Not Exceeded')">
             <sequence>
-              <call function="'testCase_Preamble'"/>
+              <call function="'testCase_Preamble'" />
               <message>
-                 'Core STmL6: Check the response of OpenDS when an ldap search request is conducted with a search time limit defined by the server-wide parameter, ds-cfg-time-limit, and the search time limit is not exceeded'
+                'Core STmL6: Check the response of OpenDS when an ldap search request is conducted with a search time limit defined by the server-wide parameter, ds-cfg-time-limit, and the search time limit is not exceeded'
               </message>
-    
               <call function="'SearchObject'">
-                { 'dsInstanceHost'   : DIRECTORY_INSTANCE_HOST ,
-                  'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
-                  'dsBaseDN'         : 'o=core tests,dc=example,dc=com' ,
-                  'dsFilter'         : 'objectclass=*' }
-                  
+                { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
+                  'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
+                  'dsBaseDN'       : 'o=core tests,dc=example,dc=com',
+                  'dsFilter'       : 'objectclass=*'}
               </call>
-    
               <call function="'checktestRC'">
-                  { 'returncode' : RC ,
-                    'result'     : STAXResult }
+                { 'returncode' : RC,
+                  'result'     : STAXResult
+                }
               </call>
-              <call function="'testCase_Postamble'"/>
+              <call function="'testCase_Postamble'" />
             </sequence>
           </testcase>
           
           <!--- Test Case : Search Time Limit: Directory Manager Time Limit 1 -->
-          <testcase name="'Core: Search Time Limit: Directory Manager Time Limit 1'">
+          <testcase name="getTestCaseName('Directory Manager Time Limit 1')">
             <sequence>
-              <call function="'testCase_Preamble'"/>
+              <call function="'testCase_Preamble'" />
               <message>
-                 'Core STmL7: Change the search time limit for cn=Directory Manager to 1'
+                'Core STmL7: Change the search time limit for cn=Directory Manager to 1'
               </message>
-    
               <call function="'addEntry'">
-                { 'dsInstanceHost'   : DIRECTORY_INSTANCE_HOST ,
-                  'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
-                  'dsInstanceDn'     : DIRECTORY_INSTANCE_DN ,
-                  'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,
-                  'entryToBeAdded'   : '%s/core/ldifs/mod_timelimit3.ldif' % logsRemoteDataDir }
+                { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
+                  'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
+                  'dsInstanceDn'   : DIRECTORY_INSTANCE_DN,
+                  'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
+                  'entryToBeAdded' : '%s/core/ldifs/mod_timelimit3.ldif' % logsRemoteDataDir
+                }
               </call>
-    
               <call function="'checktestRC'">
-                  { 'returncode' : RC ,
-                    'result'     : STAXResult }
+                { 'returncode' : RC ,
+                  'result'     : STAXResult
+                }
               </call>
-              <call function="'testCase_Postamble'"/>
+              <call function="'testCase_Postamble'" />
             </sequence>
           </testcase>
           
           <!--- Test Case : Search Time Limit: User Specific Time Limit Exceeded -->
-          <testcase name="'Core: Search Time Limit: User Specific Time Limit Exceeded'">
+          <testcase name="getTestCaseName('User Specific Time Limit Exceeded')">
             <sequence>
-              <call function="'testCase_Preamble'"/>
+              <call function="'testCase_Preamble'" />
               <message>
-                 'Core STmL8: Check the response of OpenDS when an ldap search request is conducted with a user search time limit defined by the user-specific parameter, ds-rlim-time-limit, and the search time limit is exceeded'
+                'Core STmL8: Check the response of OpenDS when an ldap search request is conducted with a user search time limit defined by the user-specific parameter, ds-rlim-time-limit, and the search time limit is exceeded'
               </message>
-    
               <call function="'SearchObject'">
-                { 'dsInstanceHost'   : DIRECTORY_INSTANCE_HOST ,
-                  'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
-                  'dsInstanceDn'     : DIRECTORY_INSTANCE_DN ,
-                  'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,
-                  'dsBaseDN'         : 'o=core tests,dc=example,dc=com' ,
-                  'dsFilter'         : 'objectclass=*' ,
-                  'expectedRC'       : 3
+                { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
+                  'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
+                  'dsInstanceDn'   : DIRECTORY_INSTANCE_DN,
+                  'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
+                  'dsBaseDN'       : 'o=core tests,dc=example,dc=com',
+                  'dsFilter'       : 'objectclass=*',
+                  'expectedRC'     : 3
                 }
               </call>
-
-              <call function="'testCase_Postamble'"/>
+              <call function="'testCase_Postamble'" />
             </sequence>
           </testcase>
           
           <!--- Test Case : Search Time Limit: Time Limit Not Applicable -->
-          <testcase name="'Core: Search Time Limit: Time Limit Not Applicable'">
+          <testcase name="getTestCaseName('Time Limit Not Applicable')">
             <sequence>
-              <call function="'testCase_Preamble'"/>
+              <call function="'testCase_Preamble'" />
               <message>
                  'Core STmL9: Check the response of OpenDS when an ldap search request is conducted with a user search time limit defined by the user-specific parameter, ds-rlim-time-limit, and the search is conducted as a bind to a different user'
               </message>
-    
               <call function="'SearchObject'">
-                { 'dsInstanceHost'   : DIRECTORY_INSTANCE_HOST ,
-                  'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
-                  'dsBaseDN'         : 'o=core tests,dc=example,dc=com' ,
-                  'dsFilter'         : 'objectclass=*' }
-                  
+                { 'dsInstanceHost'   : DIRECTORY_INSTANCE_HOST,
+                  'dsInstancePort'   : DIRECTORY_INSTANCE_PORT,
+                  'dsBaseDN'         : 'o=core tests,dc=example,dc=com',
+                  'dsFilter'         : 'objectclass=*'
+                }
               </call>
-    
               <call function="'checktestRC'">
-                  { 'returncode' : RC ,
-                    'result'     : STAXResult }
+                { 'returncode' : RC,
+                  'result'     : STAXResult
+                }
               </call>
-              <call function="'testCase_Postamble'"/>
+              <call function="'testCase_Postamble'" />
             </sequence>
           </testcase>
           
           <!--- Test Case : Search Time Limit: Directory Manager Time Limit 60 -->
-          <testcase name="'Core: Search Time Limit: Directory Manager Time Limit 60'">
+          <testcase name="getTestCaseName('Directory Manager Time Limit 60')">
             <sequence>
-              <call function="'testCase_Preamble'"/>
+              <call function="'testCase_Preamble'" />
               <message>
-                 'Core STmL10: Change the search time limit for cn=Directory Manager to 60'
+                'Core STmL10: Change the search time limit for cn=Directory Manager to 60'
               </message>
-    
               <call function="'addEntry'">
-                { 'dsInstanceHost'   : DIRECTORY_INSTANCE_HOST ,
-                  'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
-                  'dsInstanceDn'     : DIRECTORY_INSTANCE_DN ,
-                  'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,
-                  'entryToBeAdded'   : '%s/core/ldifs/mod_timelimit4.ldif' % logsRemoteDataDir }
+                { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
+                  'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
+                  'dsInstanceDn'   : DIRECTORY_INSTANCE_DN,
+                  'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
+                  'entryToBeAdded' : '%s/core/ldifs/mod_timelimit4.ldif' % logsRemoteDataDir
+                }
               </call>
-    
               <call function="'checktestRC'">
-                  { 'returncode' : RC ,
-                    'result'     : STAXResult }
+                { 'returncode' : RC ,
+                  'result'     : STAXResult
+                }
               </call>
-              <call function="'testCase_Postamble'"/>
+              <call function="'testCase_Postamble'" />
             </sequence>
           </testcase>
           
           <!--- Test Case : Search Time Limit: No Time Limit -->
-          <testcase name="'Core: Search Time Limit: No Time Limit'">
+          <testcase name="getTestCaseName('No Time Limit')">
             <sequence>
-              <call function="'testCase_Preamble'"/>
+              <call function="'testCase_Preamble'" />
               <message>
-                 'Core STmL11: Check the response of OpenDS when an ldap search request is conducted with a user search time limit defined by the user-specific parameter ds-rlim-time-limit, equal to 60 and the search is conducted against 1150 entries'
+                'Core STmL11: Check the response of OpenDS when an ldap search request is conducted with a user search time limit defined by the user-specific parameter ds-rlim-time-limit, equal to 60 and the search is conducted against 1150 entries'
               </message>
-    
               <call function="'SearchObject'">
-                { 'dsInstanceHost'   : DIRECTORY_INSTANCE_HOST ,
-                  'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
-                  'dsInstanceDn'     : DIRECTORY_INSTANCE_DN ,
-                  'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,
-                  'dsBaseDN'         : 'o=core tests,dc=example,dc=com' ,
-                  'dsFilter'         : 'objectclass=*' }
-                  
+                { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
+                  'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
+                  'dsInstanceDn'   : DIRECTORY_INSTANCE_DN,
+                  'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
+                  'dsBaseDN'       : 'o=core tests,dc=example,dc=com',
+                  'dsFilter'       : 'objectclass=*'
+                }
               </call>
-    
               <call function="'checktestRC'">
-                  { 'returncode' : RC ,
-                    'result'     : STAXResult }
+                { 'returncode' : RC ,
+                  'result'     : STAXResult
+                }
               </call>
-              <call function="'testCase_Postamble'"/>
+              <call function="'testCase_Postamble'" />
             </sequence>
           </testcase>
-
-
+          
           <import machine="STAF_LOCAL_HOSTNAME"
-            file="'%s/testcases/core/core_cleanup.xml' % (TESTS_DIR)"/>
-          <call function="'core_cleanup'"/>
-
-												          
-          <call function="'testSuite_Postamble'"/>
-
+                  file="'%s/testcases/core/core_cleanup.xml' % (TESTS_DIR)" />
+          <call function="'core_cleanup'" />
+          <call function="'testSuite_Postamble'" />
         </sequence>
-    
       </block>
-    
     </sequence>
-
   </function>
-
 </stax>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/core/core_setup.xml b/opendj-sdk/opends/tests/functional-tests/testcases/core/core_setup.xml
index a2d5b78..ba3540f 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/core/core_setup.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/core/core_setup.xml
@@ -26,118 +26,94 @@
  !      Portions Copyright 2007 Sun Microsystems, Inc.
  ! -->
 <stax>
-
-  <defaultcall function="core_setup"/>
-
+  <defaultcall function="core_setup" />
   <function name="core_setup">
-
     <sequence>
-
       <block name="'setup'">
-      
         <sequence>
-						  
-				  
-		  <block name="'Block Create DS Topology'">
-		  <!-- Create the topology necessary to the test group/suite -->
-		    <sequence>
-								
+          <block name="'Block Create DS Topology'">
+          <!-- Create the topology necessary to the test group/suite -->
+            <sequence>
               <message>
-                 'Create DS topology as described in config.py'
+                'Create DS topology as described in config.py'
               </message>
-				  
-			  <call function="'createTopology'">
-			    { 'initialiseInstance' : True }
-			  </call>
-				    				
-			  <call function="'checkRC'">
-                  { 'returncode' : RC ,
-                    'result'     : STAXResult }
+              <call function="'createTopology'">
+                { 'initialiseInstance' : True }
               </call>
-      
-            </sequence>      
-          <!--- End Block Create DS Topology -->	
-          </block>				  				  
-
-
-		  <block name="'Block DS Process Active'">	  	
-          <!--- Start DS -->
-		    <sequence>
-				
+              <call function="'checkRC'">
+                { 'returncode' : RC ,
+                  'result'     : STAXResult
+                }
+              </call>
+            </sequence>
+            <!--- End Block Create DS Topology -->	
+          </block>
+          
+          <block name="'Block DS Process Active'">	  	
+            <!--- Start DS -->
+            <sequence>
               <message>
-                 'Start DS to run on port %s' % (DIRECTORY_INSTANCE_PORT)
+                'Start DS to run on port %s' % (DIRECTORY_INSTANCE_PORT)
               </message>
-  
               <!--- Start DS -->
               <call function="'StartDsWithScript'">
                { 'location'  : STAF_REMOTE_HOSTNAME }
               </call>
-  
               <call function="'checkRC'">
-                  { 'returncode' : RC ,
-                    'result'     : STAXResult }
+                { 'returncode' : RC ,
+                  'result'     : STAXResult
+                }
               </call>
-  
               <!--- Check that DS started -->
               <call function="'isAlive'">
                 { 'noOfLoops'        : 5 ,
-                  'noOfMilliSeconds' : 2000 }
-              </call>			
-				
+                  'noOfMilliSeconds' : 2000
+                }
+              </call>
             </sequence>
-          <!--- End Block DS Process Active -->
-          </block>			  			
-						
-
-          <block name="'Block DS Load Data'">
-		  <!-- Load the data needed by the test suite -->			
-	        <sequence>
-				
-              <message>
-                 'Add entries that are required for the Core Tests'
-              </message>
-    
-              <call function="'addEntry'">
-                { 'dsInstanceHost'   : DIRECTORY_INSTANCE_HOST ,
-                  'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
-                  'dsInstanceDn'     : DIRECTORY_INSTANCE_DN ,
-                  'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,
-                  'entryToBeAdded'   : '%s/core/ldifs/core_start.ldif' % logsRemoteDataDir }
-              </call>
-    
-              <call function="'checkRC'">
-                  { 'returncode' : RC ,
-                    'result'     : STAXResult }
-              </call>
-			
-
-						
-              <message>
-                 'Add 1000 extra entries that are required for some of the Core Tests'
-              </message>
-    
-              <call function="'addEntry'">
-                { 'dsInstanceHost'   : DIRECTORY_INSTANCE_HOST ,
-                  'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
-                  'dsInstanceDn'     : DIRECTORY_INSTANCE_DN ,
-                  'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,
-                  'entryToBeAdded'   : '%s/core/ldifs/core_test_1K.ldif' % logsRemoteDataDir }
-              </call>
-    
-              <call function="'checkRC'">
-                  { 'returncode' : RC ,
-                    'result'     : STAXResult }
-              </call>
-			
-			</sequence>
-          <!-- End Block DS Load Data -->			  										  				  
+            <!--- End Block DS Process Active -->
           </block>
-			        
-        </sequence>        
+          
+          <block name="'Block DS Load Data'">
+            <!-- Load the data needed by the test suite -->			
+            <sequence>
+              <message>
+                'Add entries that are required for the Core Tests'
+              </message>
+              <call function="'addEntry'">
+                { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
+                  'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
+                  'dsInstanceDn'   : DIRECTORY_INSTANCE_DN,
+                  'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
+                  'entryToBeAdded' : '%s/core/ldifs/core_start.ldif' % logsRemoteDataDir
+                }
+              </call>
+              <call function="'checkRC'">
+                { 'returncode' : RC ,
+                  'result'     : STAXResult
+                }
+              </call>
+              <message>
+                'Add 1000 extra entries that are required for some of the Core Tests'
+              </message>
+              <call function="'addEntry'">
+                { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
+                  'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
+                  'dsInstanceDn'   : DIRECTORY_INSTANCE_DN,
+                  'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
+                  'entryToBeAdded' : '%s/core/ldifs/core_test_1K.ldif' % logsRemoteDataDir
+                }
+              </call>
+              <call function="'checkRC'">
+                { 'returncode' : RC ,
+                  'result'     : STAXResult
+                }
+              </call>
+            </sequence>
+            <!-- End Block DS Load Data -->
+          </block>
+        </sequence>
       </block>
-            
      </sequence>
-
   </function>
-
 </stax>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/core/core_tf_filters.xml b/opendj-sdk/opends/tests/functional-tests/testcases/core/core_tf_filters.xml
index b37b8e7..1f75614 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/core/core_tf_filters.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/core/core_tf_filters.xml
@@ -26,142 +26,118 @@
  !      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  ! -->
 <stax>
-
-  <defaultcall function="core_tf_filters"/>
-
+  <defaultcall function="core_tf_filters" />
   <function name="core_tf_filters">
-
     <sequence>
-
       <block name="'filters'">
-      
         <sequence>
-  
           <script>
             if not CurrentTestPath.has_key('group'):
-              CurrentTestPath['group']='core'								  
+              CurrentTestPath['group']='core'
             CurrentTestPath['suite']=STAXCurrentBlock
           </script>
-            
-          <call function="'testSuite_Preamble'"/>
-
-
+          <call function="'testSuite_Preamble'" />
           <import machine="STAF_LOCAL_HOSTNAME"
-            file="'%s/testcases/core/core_setup.xml' % (TESTS_DIR)"/>
-          <call function="'core_setup'"/>
+                  file="'%s/testcases/core/core_setup.xml' % (TESTS_DIR)" />
+          <call function="'core_setup'" />
 
-												    
           <!--- Test Case : True False Filters: And Filter -->
-          <testcase name="'Core: True False Filters: And Filter'">
+          <testcase name="getTestCaseName('And Filter')">
             <sequence>
-              <call function="'testCase_Preamble'"/>
+              <call function="'testCase_Preamble'" />
               <message>
-                 'Core TFF1: Check the response of OpenDS when an ldap search request is conducted with a single ampersand character '
+                'Core TFF1: Check the response of OpenDS when an ldap search request is conducted with a single ampersand character '
               </message>
-    
               <call function="'SearchObject'">
-                { 'dsInstanceHost'   : DIRECTORY_INSTANCE_HOST ,
-                  'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
-                  'dsInstanceDn'     : DIRECTORY_INSTANCE_DN ,
-                  'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,
-                  'dsBaseDN'         : 'cn=version,cn=monitor' ,
-                  'dsFilter'         : '&amp;' }                
+                { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
+                  'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
+                  'dsInstanceDn'   : DIRECTORY_INSTANCE_DN,
+                  'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
+                  'dsBaseDN'       : 'cn=version,cn=monitor',
+                  'dsFilter'       : '&amp;'
+                }
               </call>
-    
               <call function="'checktestRC'">
-                  { 'returncode' : RC ,
-                    'result'     : STAXResult }
+                { 'returncode' : RC ,
+                  'result'     : STAXResult
+                }
               </call>
-              <call function="'testCase_Postamble'"/>
+              <call function="'testCase_Postamble'" />
             </sequence>
           </testcase>
           
           <!--- Test Case : True False Filters: Or Filter -->
-          <testcase name="'Core: True False Filters: Or Filter'">
+          <testcase name="getTestCaseName('Or Filter')">
             <sequence>
-              <call function="'testCase_Preamble'"/>
+              <call function="'testCase_Preamble'" />
               <message>
-                 'Core TFF2: Check the response of OpenDS when an ldap search request is conducted with a single pipe character'
+                'Core TFF2: Check the response of OpenDS when an ldap search request is conducted with a single pipe character'
               </message>
-    
               <call function="'SearchObject'">
-                { 'dsInstanceHost'   : DIRECTORY_INSTANCE_HOST ,
-                  'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
-                  'dsInstanceDn'     : DIRECTORY_INSTANCE_DN ,
-                  'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,
-                  'dsBaseDN'         : 'cn=version,cn=monitor' ,
-                  'dsFilter'         : '|' }
+                { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
+                  'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
+                  'dsInstanceDn'   : DIRECTORY_INSTANCE_DN,
+                  'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
+                  'dsBaseDN'       : 'cn=version,cn=monitor',
+                  'dsFilter'       : '|'
+                }
               </call>
-    
               <call function="'checktestRC'">
-                  { 'returncode' : RC ,
-                    'result'     : STAXResult }
+                { 'returncode' : RC ,
+                  'result'     : STAXResult
+                }
               </call>
-              <call function="'testCase_Postamble'"/>
+              <call function="'testCase_Postamble'" />
             </sequence>
           </testcase>
           
           <!--- Test Case : True False Filters: And Filter Entry Not Exists -->
-          <testcase name="'Core: True False Filters: And Filter Entry Not Exists'">
+          <testcase name="getTestCaseName('And Filter Entry Not Exists')">
             <sequence>
-              <call function="'testCase_Preamble'"/>
+              <call function="'testCase_Preamble'" />
               <message>
-                 'Core TFF3: Check the response of OpenDS when an ldap search request is conducted with a single ampersand character for a non-existent entry'
+                'Core TFF3: Check the response of OpenDS when an ldap search request is conducted with a single ampersand character for a non-existent entry'
               </message>
-    
               <call function="'SearchObject'">
-                { 'dsInstanceHost'   : DIRECTORY_INSTANCE_HOST ,
-                  'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
-                  'dsInstanceDn'     : DIRECTORY_INSTANCE_DN ,
-                  'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,
-                  'dsBaseDN'         : 'cn=bad,cn=monitor' ,
-                  'dsFilter'         : '&amp;' ,
-                  'expectedRC'       : 32
+                { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
+                  'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
+                  'dsInstanceDn'   : DIRECTORY_INSTANCE_DN,
+                  'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
+                  'dsBaseDN'       : 'cn=bad,cn=monitor',
+                  'dsFilter'       : '&amp;',
+                  'expectedRC'     : 32
                 }
               </call>
-    
-              <call function="'testCase_Postamble'"/>
-             </sequence>
+              <call function="'testCase_Postamble'" />
+            </sequence>
           </testcase>
-    
+          
           <!--- Test Case : True False Filters: Or Filter Entry Not Exists -->
-          <testcase name="'Core: True False Filters: Or Filter Entry Not Exists'">
+          <testcase name="getTestCaseName('Or Filter Entry Not Exists')">
             <sequence>
-              <call function="'testCase_Preamble'"/>
+              <call function="'testCase_Preamble'" />
               <message>
                  'Core TFF4: Check the response of OpenDS when an ldap search request is conducted with a single pipe character for a non-existent entry'
               </message>
-    
               <call function="'SearchObject'">
-                { 'dsInstanceHost'   : DIRECTORY_INSTANCE_HOST ,
-                  'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
-                  'dsInstanceDn'     : DIRECTORY_INSTANCE_DN ,
-                  'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,
-                  'dsBaseDN'         : 'cn=bad,cn=monitor' ,
-                  'dsFilter'         : '|' ,
-                  'expectedRC'       : 32
+                { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
+                  'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
+                  'dsInstanceDn'   : DIRECTORY_INSTANCE_DN,
+                  'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
+                  'dsBaseDN'       : 'cn=bad,cn=monitor',
+                  'dsFilter'       : '|',
+                  'expectedRC'     : 32
                 }
               </call>
-    
-              <call function="'testCase_Postamble'"/>
-             </sequence>
-    
+              <call function="'testCase_Postamble'" />
+            </sequence>
           </testcase>
-
-
           <import machine="STAF_LOCAL_HOSTNAME"
-            file="'%s/testcases/core/core_cleanup.xml' % (TESTS_DIR)"/>
-          <call function="'core_cleanup'"/>
-
-												          
-          <call function="'testSuite_Postamble'"/>
-
+                  file="'%s/testcases/core/core_cleanup.xml' % (TESTS_DIR)" />
+          <call function="'core_cleanup'" />
+          <call function="'testSuite_Postamble'" />
         </sequence>
-    
       </block>
-    
     </sequence>
-
   </function>
-
 </stax>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/core/core_version_report.xml b/opendj-sdk/opends/tests/functional-tests/testcases/core/core_version_report.xml
index 9970781..96958e4 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/core/core_version_report.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/core/core_version_report.xml
@@ -26,70 +26,52 @@
  !      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  ! -->
 <stax>
-
-  <defaultcall function="core_version_report"/>
-
+  <defaultcall function="core_version_report" />
   <function name="core_version_report">
-
     <sequence>
-
       <block name="'version-report'">
-      
         <sequence>
-  
           <script>
             if not CurrentTestPath.has_key('group'):
-              CurrentTestPath['group']='core'								  
+              CurrentTestPath['group']='core'
             CurrentTestPath['suite']=STAXCurrentBlock
           </script>
-            
-          <call function="'testSuite_Preamble'"/>
-
-
+          <call function="'testSuite_Preamble'" />
           <import machine="STAF_LOCAL_HOSTNAME"
-            file="'%s/testcases/core/core_setup.xml' % (TESTS_DIR)"/>
-          <call function="'core_setup'"/>
-															
-
+                  file="'%s/testcases/core/core_setup.xml' % (TESTS_DIR)" />
+          <call function="'core_setup'" />
+          
           <!--- Test Case : Version Report 1 -->
-          <testcase name="'Core: Version Report: Search Version'">
+          <testcase name="getTestCaseName('Search Version')">
             <sequence>
-              <call function="'testCase_Preamble'"/>
+              <call function="'testCase_Preamble'" />
               <message>
-                 'Core VR1:  Check the response of OpenDS when an ldap search request is conducted for the current version of OpenDS '
+                'Core VR1:  Check the response of OpenDS when an ldap search request is conducted for the current version of OpenDS '
               </message>
-    
               <call function="'SearchObject'">
-                { 'dsInstanceHost'   : DIRECTORY_INSTANCE_HOST ,
-                  'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
-                  'dsInstanceDn'     : DIRECTORY_INSTANCE_DN ,
-                  'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,
-                  'dsBaseDN'         : 'cn=version,cn=monitor' ,
-                  'dsFilter'         : 'objectclass=*' }                
+                { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
+                  'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
+                  'dsInstanceDn'   : DIRECTORY_INSTANCE_DN,
+                  'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
+                  'dsBaseDN'       : 'cn=version,cn=monitor',
+                  'dsFilter'       : 'objectclass=*'
+                }
               </call>
-    
               <call function="'checktestRC'">
-                  { 'returncode' : RC ,
-                    'result'     : STAXResult }
+                { 'returncode' : RC ,
+                  'result'     : STAXResult
+                }
               </call>
-              <call function="'testCase_Postamble'"/>
+              <call function="'testCase_Postamble'" />
             </sequence>
           </testcase>
-
-
+          
           <import machine="STAF_LOCAL_HOSTNAME"
-            file="'%s/testcases/core/core_cleanup.xml' % (TESTS_DIR)"/>
-          <call function="'core_cleanup'"/>
-
-												               
-          <call function="'testSuite_Postamble'"/>
-
+                  file="'%s/testcases/core/core_cleanup.xml' % (TESTS_DIR)" />
+          <call function="'core_cleanup'" />
+          <call function="'testSuite_Postamble'" />
         </sequence>
-    
       </block>
-    
     </sequence>
-
   </function>
-
 </stax>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/dsconfig/dsconfig_list.xml b/opendj-sdk/opends/tests/functional-tests/testcases/dsconfig/dsconfig_list.xml
index 3ef9110..64d9d47 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/dsconfig/dsconfig_list.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/dsconfig/dsconfig_list.xml
@@ -66,7 +66,7 @@
         </script>
         <iterate var="dummyIndex" in="componentList">
           <sequence>
-            <testcase name="'%s: %s' % ( CurrentTestPath['group'], componentList[componentNumber][0] )" >
+            <testcase name="getTestCaseName(componentList[componentNumber][0])" >
               <sequence>
                 <message>
                     'Listing component %s, %s, %s' % (componentList[componentNumber][0], componentList[componentNumber][1], componentList[componentNumber][2])
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/groups/group_dynamic.xml b/opendj-sdk/opends/tests/functional-tests/testcases/groups/group_dynamic.xml
index abfa56c..030acce 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/groups/group_dynamic.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/groups/group_dynamic.xml
@@ -97,7 +97,7 @@
           #@TestPostamble
           #@TestResult
           -->
-          <testcase name="'Group: Dynamic: add a dynamic group entry'">
+          <testcase name="getTestCaseName('add a dynamic group entry')">
             <sequence>
               <call function="'testCase_Preamble'"/>
 
@@ -156,7 +156,7 @@
           #@TestPostamble
           #@TestResult
           -->
-          <testcase name="'Group: Dynamic: delete a dynamic group entry'">
+          <testcase name="getTestCaseName('delete a dynamic group entry')">
             <sequence>
               <call function="'testCase_Preamble'"/>
               <message>
@@ -203,7 +203,7 @@
           #@TestPostamble
           #@TestResult
           -->
-          <testcase name="'Group: Dynamic: no group user do a search'">
+          <testcase name="getTestCaseName('no group user do a search')">
             <sequence>
               <call function="'testCase_Preamble'"/>
               <message>
@@ -240,7 +240,7 @@
           #@TestPostamble
           #@TestResult
           -->
-          <testcase name="'Group: Dynamic: group user do a search'">
+          <testcase name="getTestCaseName('group user do a search')">
             <sequence>
               <call function="'testCase_Preamble'"/>
               <message>
@@ -287,7 +287,7 @@
           #@TestPostamble
           #@TestResult
           -->
-          <testcase name="'Group: Dynamic: application add entry that belong to a group'">
+          <testcase name="getTestCaseName('application add entry that belong to a group')">
             <sequence>
               <call function="'testCase_Preamble'"/>
               <message>
@@ -358,7 +358,7 @@
           #@TestResult
           -->
  <!---
-            <testcase name="'Group: Dynamic: application rename entry that belong to a group'">
+            <testcase name="getTestCaseName('application rename entry that belong to a group')">
             <sequence>
               <call function="'testCase_Preamble'"/>
               <message>
@@ -422,7 +422,7 @@
           #@TestPostamble
           #@TestResult
           -->
-          <testcase name="'Group: Dynamic: application delete entry belonging to a group'">
+          <testcase name="getTestCaseName('application delete entry belonging to a group')">
             <sequence>
               <call function="'testCase_Preamble'"/>
               <message>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/groups/group_static_member.xml b/opendj-sdk/opends/tests/functional-tests/testcases/groups/group_static_member.xml
index 9458f62..3c859d5 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/groups/group_static_member.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/groups/group_static_member.xml
@@ -93,7 +93,7 @@
           #@TestPostamble
           #@TestResult
           -->
-          <testcase name="'Group: Static: member: add a static group entry'">
+          <testcase name="getTestCaseName('member: add a static group entry')">
             <sequence>
               <call function="'testCase_Preamble'"/>
 
@@ -160,7 +160,7 @@
           #@TestPostamble
           #@TestResult
           -->
-          <testcase name="'Group: Static: member: delete a static group entry'">
+          <testcase name="getTestCaseName('member: delete a static group entry')">
             <sequence>
               <call function="'testCase_Preamble'"/>
               <message>
@@ -209,7 +209,7 @@
           #@TestPostamble
           #@TestResult
           -->
-          <testcase name="'Group: Static: member: ldapsearch out of the group'">
+          <testcase name="getTestCaseName('member: ldapsearch out of the group')">
             <sequence>
               <call function="'testCase_Preamble'"/>
               <message>
@@ -247,7 +247,7 @@
           #@TestPostamble
           #@TestResult
           -->
-          <testcase name="'Group: Static: member: ldapsearch through group'">
+          <testcase name="getTestCaseName('member: ldapsearch through group')">
             <sequence>
               <call function="'testCase_Preamble'"/>
               <message>
@@ -295,7 +295,7 @@
           #@TestPostamble
           #@TestResult
           -->
-          <testcase name="'Group: Static: member: application search in group'">
+          <testcase name="getTestCaseName('member: application search in group')">
             <sequence>
               <call function="'testCase_Preamble'"/>
 
@@ -340,7 +340,7 @@
           #@TestPostamble
           #@TestResult
           -->
-          <testcase name="'Group: Static: member: application add user in group'">
+          <testcase name="getTestCaseName('member: application add user in group')">
             <sequence>
               <call function="'testCase_Preamble'"/>
 
@@ -431,7 +431,7 @@
           #@TestPostamble
           #@TestResult
           -->
-          <testcase name="'Group: Static: member: delete user entry belonging to the group'">
+          <testcase name="getTestCaseName('member: delete user entry belonging to the group')">
             <sequence>
               <call function="'testCase_Preamble'"/>
 
@@ -532,7 +532,7 @@
           #@TestPostamble
           #@TestResult
           -->
-          <testcase name="'Group: Static: member: application delete user from group'">
+          <testcase name="getTestCaseName('member: application delete user from group')">
             <sequence>
               <call function="'testCase_Preamble'"/>
 
@@ -623,7 +623,7 @@
           #@TestPostamble
           #@TestResult
           -->
-          <testcase name="'Group: Static: member: delete all attributes in a static group entry'">
+          <testcase name="getTestCaseName('member: delete all attributes in a static group entry')">
             <sequence>
               <call function="'testCase_Preamble'"/>
 
@@ -737,7 +737,7 @@
           #@TestPostamble
           #@TestResult
           -->
-          <testcase name="'Group: Static: member: enable referential integrity plugin'">
+          <testcase name="getTestCaseName('member: enable referential integrity plugin')">
             <sequence>
               <call function="'testCase_Preamble'"/>
               <message>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/groups/group_static_uniquemember.xml b/opendj-sdk/opends/tests/functional-tests/testcases/groups/group_static_uniquemember.xml
index a0da493..54e05d2 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/groups/group_static_uniquemember.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/groups/group_static_uniquemember.xml
@@ -93,7 +93,7 @@
           #@TestPostamble
           #@TestResult
           -->
-          <testcase name="'Group: Static: uniquemember: add a static group entry'">
+          <testcase name="getTestCaseName('uniquemember: add a static group entry')">
             <sequence>
               <call function="'testCase_Preamble'"/>
 
@@ -159,7 +159,7 @@
           #@TestPostamble
           #@TestResult
           -->
-          <testcase name="'Group: Static: uniquemember: delete a static group entry'">
+          <testcase name="getTestCaseName('uniquemember: delete a static group entry')">
             <sequence>
               <call function="'testCase_Preamble'"/>
               <message>
@@ -207,7 +207,7 @@
           #@TestPostamble
           #@TestResult
           -->
-          <testcase name="'Group: Static: uniquemember: ldapsearch out of the group'">
+          <testcase name="getTestCaseName('uniquemember: ldapsearch out of the group')">
             <sequence>
               <call function="'testCase_Preamble'"/>
               <message>
@@ -245,7 +245,7 @@
           #@TestPostamble
           #@TestResult
           -->
-          <testcase name="'Group: Static: uniquemember: ldapsearch through group'">
+          <testcase name="getTestCaseName('uniquemember: ldapsearch through group')">
             <sequence>
               <call function="'testCase_Preamble'"/>
               <message>
@@ -292,7 +292,7 @@
           #@TestPostamble
           #@TestResult
           -->
-          <testcase name="'Group: Static: uniquemember: application search in group'">
+          <testcase name="getTestCaseName('uniquemember: application search in group')">
             <sequence>
               <call function="'testCase_Preamble'"/>
 
@@ -337,7 +337,7 @@
           #@TestPostamble
           #@TestResult
           -->
-          <testcase name="'Group: Static: uniquemember: application add user in group'">
+          <testcase name="getTestCaseName('uniquemember: application add user in group')">
             <sequence>
               <call function="'testCase_Preamble'"/>
 
@@ -428,7 +428,7 @@
           #@TestPostamble
           #@TestResult
           -->
-          <testcase name="'Group: Static: uniquemember: delete user entry belonging to the group'">
+          <testcase name="getTestCaseName('uniquemember: delete user entry belonging to the group')">
             <sequence>
               <call function="'testCase_Preamble'"/>
 
@@ -529,7 +529,7 @@
           #@TestPostamble
           #@TestResult
           -->
-          <testcase name="'Group: Static: uniquemember: application delete user from group'">
+          <testcase name="getTestCaseName('uniquemember: application delete user from group')">
             <sequence>
               <call function="'testCase_Preamble'"/>
 
@@ -620,7 +620,7 @@
           #@TestPostamble
           #@TestResult
           -->
-          <testcase name="'Group: Static: uniquemember: delete all attributes in a static group entry'">
+          <testcase name="getTestCaseName('uniquemember: delete all attributes in a static group entry')">
             <sequence>
               <call function="'testCase_Preamble'"/>
 
@@ -734,7 +734,7 @@
           #@TestPostamble
           #@TestResult
           -->
-          <testcase name="'Group: Static: uniquemember: enable referential integrity plugin'">
+          <testcase name="getTestCaseName('uniquemember: enable referential integrity plugin')">
             <sequence>
               <call function="'testCase_Preamble'"/>
               <message>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/groups/group_virtual_static.xml b/opendj-sdk/opends/tests/functional-tests/testcases/groups/group_virtual_static.xml
index 7ed2340..3eba885 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/groups/group_virtual_static.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/groups/group_virtual_static.xml
@@ -89,7 +89,7 @@
           #@TestPostamble
           #@TestResult
           -->
-          <testcase name="'Group: Virtual Static: enable member virtual attribute'">
+          <testcase name="getTestCaseName('enable member virtual attribute')">
             <sequence>
               <call function="'testCase_Preamble'"/>
 
@@ -120,7 +120,7 @@
           #@TestPostamble
           #@TestResult
           -->
-          <testcase name="'Group: Virtual Static: add a Virtual Static group entry'">
+          <testcase name="getTestCaseName('add a Virtual Static group entry')">
             <sequence>
               <call function="'testCase_Preamble'"/>
 
@@ -181,7 +181,7 @@
           #@TestPostamble
           #@TestResult
           -->
-          <testcase name="'Group: Virtual Static: delete a Virtual Static group entry'">
+          <testcase name="getTestCaseName('delete a Virtual Static group entry')">
             <sequence>
               <call function="'testCase_Preamble'"/>
               <message>
@@ -230,7 +230,7 @@
           #@TestPostamble
           #@TestResult
           -->
-          <testcase name="'Group: Virtual Static: search members of group'">
+          <testcase name="getTestCaseName('search members of group')">
             <sequence>
               <call function="'testCase_Preamble'"/>
               <message>
@@ -293,7 +293,7 @@
           #@TestPostamble
           #@TestResult
           -->
-          <testcase name="'Group: Virtual Static: application add entry that belong to a group'">
+          <testcase name="getTestCaseName('application add entry that belong to a group')">
             <sequence>
               <call function="'testCase_Preamble'"/>
               <message>
@@ -364,7 +364,7 @@
           #@TestResult
           -->
 <!--          
-          <testcase name="'Group: Virtual Static: application rename entry that belong to a group'">
+          <testcase name="getTestCaseName('application rename entry that belong to a group')">
             <sequence>
               <call function="'testCase_Preamble'"/>
               <message>
@@ -428,7 +428,7 @@
           #@TestPostamble
           #@TestResult
           -->
-          <testcase name="'Group: Virtual Static: application delete entry belonging to a group'">
+          <testcase name="getTestCaseName('application delete entry belonging to a group')">
             <sequence>
               <call function="'testCase_Preamble'"/>
               <message>
@@ -481,7 +481,7 @@
           #@TestPostamble
           #@TestResult
           -->
-          <testcase name="'Group: Virtual Static: Change ds-target-group-dn to another dynamic group'">
+          <testcase name="getTestCaseName('Change ds-target-group-dn to another dynamic group')">
             <sequence>
               <call function="'testCase_Preamble'"/>
               <script>
@@ -547,7 +547,7 @@
           #@TestPostamble
           #@TestResult
           -->
-          <testcase name="'Group: Virtual Static: Change ds-target-group-dn to static group (uniquemember type)'">
+          <testcase name="getTestCaseName('Change ds-target-group-dn to static group (uniquemember type)')">
             <sequence>
               <call function="'testCase_Preamble'"/>
               <script>
@@ -614,7 +614,7 @@
           #@TestPostamble
           #@TestResult
           -->
-          <testcase name="'Group: Virtual Static: Change ds-target-group-dn to static group (member type)'">
+          <testcase name="getTestCaseName('Change ds-target-group-dn to static group (member type)')">
             <sequence>
               <call function="'testCase_Preamble'"/>
               <script>
@@ -680,7 +680,7 @@
           #@TestPostamble
           #@TestResult
           -->
-          <testcase name="'Group: Virtual Static: Remove ds-target-group-dn attribute'">
+          <testcase name="getTestCaseName('Remove ds-target-group-dn attribute')">
             <sequence>
               <call function="'testCase_Preamble'"/>
               <message>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/privileges/privileges_backup_task.xml b/opendj-sdk/opends/tests/functional-tests/testcases/privileges/privileges_backup_task.xml
index 35182a2..472daf4 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/privileges/privileges_backup_task.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/privileges/privileges_backup_task.xml
@@ -79,7 +79,7 @@
                                             for steps 1, 3, and 8 and 0
                                             for all other ldap operations.
             -->
-          <testcase name="'Privileges: Backup Tasks: backend-backup'">
+          <testcase name="getTestCaseName('backend-backup')">
     
             <sequence>
     
@@ -246,7 +246,7 @@
                                             for steps 1 and 5 and 0
                                             for all other ldap operations.
             -->
-          <testcase name="'Privileges: Backup Tasks: backend-backup Directory Manager'">
+          <testcase name="getTestCaseName('backend-backup Directory Manager')">
     
             <sequence>
     
@@ -360,7 +360,7 @@
                                             for steps 1 and 5 and 0
                                             for all other ldap operations.
             -->
-          <testcase name="'Privileges: Backup Tasks: backend-backup New Root User'">
+          <testcase name="getTestCaseName('backend-backup New Root User')">
     
             <sequence>
     
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/privileges/privileges_directory_manager.xml b/opendj-sdk/opends/tests/functional-tests/testcases/privileges/privileges_directory_manager.xml
index 725b6d6..224f5af 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/privileges/privileges_directory_manager.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/privileges/privileges_directory_manager.xml
@@ -79,7 +79,7 @@
                                             for all other ldap operations. 
                                             Proper entries returned for allowed searches.
             -->
-            <testcase name="'Privileges: Directory Manager: bypass-acl'">
+            <testcase name="getTestCaseName('bypass-acl')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -275,7 +275,7 @@
                                             for all other ldap operations. 
                                             Proper entries returned for allowed searches.
             -->
-            <testcase name="'Privileges: Directory Manager: bypass-acl, alternate bind DN'">
+            <testcase name="getTestCaseName('bypass-acl, alternate bind DN')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -404,7 +404,7 @@
                                             for step 3, and 0
                                             for all other ldap operations.
             -->
-            <testcase name="'Privileges: Directory Manager: modify-acl - add aci'">
+            <testcase name="getTestCaseName('modify-acl - add aci')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -556,7 +556,7 @@
                                             for step 3, and 0
                                             for all other ldap operations.
             -->
-            <testcase name="'Privileges: Directory Manager: modify-acl - replace aci'">
+            <testcase name="getTestCaseName('modify-acl - replace aci')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -671,7 +671,7 @@
                                             for step 3, and 0
                                             for all other ldap operations.
             -->
-            <testcase name="'Privileges: Directory Manager: modify-acl - delete aci'">
+            <testcase name="getTestCaseName('modify-acl - delete aci')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -776,7 +776,7 @@
                                             for all other ldap operations. 
                                             Proper entries returned for allowed searches.
             -->
-            <testcase name="'Privileges: Directory Manager: config-read'">
+            <testcase name="getTestCaseName('config-read')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -911,7 +911,7 @@
                                             for step 3, 5, and 7 and 0
                                             for all other ldap operations.
             -->
-            <testcase name="'Privileges: Directory Manager: config-write'">
+            <testcase name="getTestCaseName('config-write')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -1094,7 +1094,7 @@
                                             for step 3, 6, and 8, and 0
                                             for all other ldap operations.
             -->
-            <testcase name="'Privileges: Directory Manager: config-write - add global aci'">
+            <testcase name="getTestCaseName('config-write - add global aci')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -1295,7 +1295,7 @@
                                             for step 3, and 0
                                             for all other ldap operations.
             -->
-            <testcase name="'Privileges: Directory Manager: password-reset'">
+            <testcase name="getTestCaseName('password-reset')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -1409,7 +1409,7 @@
                                             for step 3, 65 for step 1, and 0
                                             for all other ldap operations.
             -->
-            <testcase name="'Privileges: Directory Manager: update-schema'">
+            <testcase name="getTestCaseName('update-schema')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -1556,7 +1556,7 @@
                                             for step 2, and 0
                                             for all other ldap operations.
             -->
-            <testcase name="'Privileges: Directory Manager: privilege-change'">
+            <testcase name="getTestCaseName('privilege-change')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -1740,7 +1740,7 @@
                                             for step 2, and 0
                                             for all other ldap operations.
             -->
-            <testcase name="'Privileges: Directory Manager: server-shutdown'">
+            <testcase name="getTestCaseName('server-shutdown')">
     
             <sequence>
     
@@ -1884,7 +1884,7 @@
                                             for step 2, and 0
                                             for all other ldap operations.
             -->
-            <testcase name="'Privileges: Directory Manager: server-restart'">
+            <testcase name="getTestCaseName('server-restart')">
     
             <sequence>
     
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/privileges/privileges_export_task.xml b/opendj-sdk/opends/tests/functional-tests/testcases/privileges/privileges_export_task.xml
index 451a8f7..56cfccb 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/privileges/privileges_export_task.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/privileges/privileges_export_task.xml
@@ -81,7 +81,7 @@
                                             for all other ldap operations. 
                                             Proper entries returned for searches.
             -->
-          <testcase name="'Privileges: Export Tasks: export-ldif'">
+          <testcase name="getTestCaseName('export-ldif')">
     
             <sequence>
     
@@ -248,7 +248,7 @@
                                             for step 3, and 0
                                             for all other ldap operations. 
             -->
-          <testcase name="'Privileges: Export Tasks: export-ldif Directory Manager'">
+          <testcase name="getTestCaseName('export-ldif Directory Manager')">
     
             <sequence>
     
@@ -362,7 +362,7 @@
                                             for step 3, and 0
                                             for all other ldap operations.
            -->
-          <testcase name="'Privileges: Export Tasks: export-ldif New Root User'">
+          <testcase name="getTestCaseName('export-ldif New Root User')">
     
             <sequence>
     
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/privileges/privileges_import_task.xml b/opendj-sdk/opends/tests/functional-tests/testcases/privileges/privileges_import_task.xml
index a944ff4..062642c 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/privileges/privileges_import_task.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/privileges/privileges_import_task.xml
@@ -79,7 +79,7 @@
                                             for all other ldap operations. 
                                             Proper entries returned for searches.
             -->
-          <testcase name="'Privileges: Import Tasks: import-ldif'">
+          <testcase name="getTestCaseName('import-ldif')">
     
             <sequence>
     
@@ -236,7 +236,7 @@
                                             for all other ldap operations. 
                                             Proper entries returned for searches.
             -->
-          <testcase name="'Privileges: Import Tasks: import-ldif Directory Manager'">
+          <testcase name="getTestCaseName('import-ldif Directory Manager')">
     
             <sequence>
     
@@ -356,7 +356,7 @@
                                             for all other ldap operations. 
                                             Proper entries returned for searches.
            -->
-          <testcase name="'Privileges: Import Tasks: import-ldif New Root User'">
+          <testcase name="getTestCaseName('import-ldif New Root User')">
     
             <sequence>
     
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/privileges/privileges_new_root_user.xml b/opendj-sdk/opends/tests/functional-tests/testcases/privileges/privileges_new_root_user.xml
index 725c785..e6625a4 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/privileges/privileges_new_root_user.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/privileges/privileges_new_root_user.xml
@@ -73,7 +73,7 @@
                                             for all ldap operations, and
                                             and entry is returned only for step 1.
             -->
-            <testcase name="'Privileges: New Root User: preamble'">
+            <testcase name="getTestCaseName('preamble')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -119,7 +119,7 @@
                                             for all other ldap operations. 
                                             Proper entries returned for allowed searches.
             -->
-            <testcase name="'Privileges: New Root User: bypass-acl'">
+            <testcase name="getTestCaseName('bypass-acl')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -309,7 +309,7 @@
                                             for all other ldap operations. 
                                             Proper entries returned for allowed searches.
             -->
-            <testcase name="'Privileges: New Root User: bypass-acl, alternate bind DN'">
+            <testcase name="getTestCaseName('bypass-acl, alternate bind DN')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -434,7 +434,7 @@
                                             for step 3, and 0
                                             for all other ldap operations.
             -->
-            <testcase name="'Privileges: New Root User: modify-acl - add aci'">
+            <testcase name="getTestCaseName('modify-acl - add aci')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -581,7 +581,7 @@
                                             for step 3, and 0
                                             for all other ldap operations.
             -->
-            <testcase name="'Privileges: New Root User: modify-acl - replace aci'">
+            <testcase name="getTestCaseName('modify-acl - replace aci')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -693,7 +693,7 @@
                                             for step 3, and 0
                                             for all other ldap operations.
             -->
-            <testcase name="'Privileges: New Root User: modify-acl - delete aci'">
+            <testcase name="getTestCaseName('modify-acl - delete aci')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -796,7 +796,7 @@
                                             for all other ldap operations. 
                                             Proper entries returned for allowed searches.
             -->
-            <testcase name="'Privileges: New Root User: config-read'">
+            <testcase name="getTestCaseName('config-read')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -929,7 +929,7 @@
                                             for step 3, 5, and 7 and 0
                                             for all other ldap operations.
             -->
-            <testcase name="'Privileges: New Root User: config-write'">
+            <testcase name="getTestCaseName('config-write')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -1107,7 +1107,7 @@
                                             for step 3, 6, and 8, and 0
                                             for all other ldap operations.
             -->
-            <testcase name="'Privileges: New Root User: config-write - add global aci'">
+            <testcase name="getTestCaseName('config-write - add global aci')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -1301,7 +1301,7 @@
                                             for step 3, and 0
                                             for all other ldap operations.
             -->
-            <testcase name="'Privileges: New Root User: password-reset'">
+            <testcase name="getTestCaseName('password-reset')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -1412,7 +1412,7 @@
                                             for step 3, 65 for step 1, and 0
                                             for all other ldap operations.
             -->
-            <testcase name="'Privileges: New Root User: update-schema'">
+            <testcase name="getTestCaseName('update-schema')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -1553,7 +1553,7 @@
                                             for step 2, and 0
                                             for all other ldap operations.
             -->
-            <testcase name="'Privileges: New Root User: privilege-change'">
+            <testcase name="getTestCaseName('privilege-change')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -1730,7 +1730,7 @@
                                             for step 2, and 0
                                             for all other ldap operations.
             -->
-            <testcase name="'Privileges: New Root User: server-shutdown'">
+            <testcase name="getTestCaseName('server-shutdown')">
     
             <sequence>
     
@@ -1872,7 +1872,7 @@
                                             for step 2, and 0
                                             for all other ldap operations.
             -->
-            <testcase name="'Privileges: New Root User: server-restart'">
+            <testcase name="getTestCaseName('server-restart')">
     
             <sequence>
     
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/privileges/privileges_restore_task.xml b/opendj-sdk/opends/tests/functional-tests/testcases/privileges/privileges_restore_task.xml
index 815b545..1c14c4c 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/privileges/privileges_restore_task.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/privileges/privileges_restore_task.xml
@@ -82,7 +82,7 @@
                                             for all other ldap operations. 
                                             Proper entries returned for searches.
             -->
-          <testcase name="'Privileges: Restore Tasks: backend-restore'">
+          <testcase name="getTestCaseName('backend-restore')">
     
             <sequence>
     
@@ -287,7 +287,7 @@
                                             for all other ldap operations. 
                                             Proper entries returned for searches.
             -->
-          <testcase name="'Privileges: Restore Tasks: backend-restore Directory Manager'">
+          <testcase name="getTestCaseName('backend-restore Directory Manager')">
     
             <sequence>
     
@@ -474,7 +474,7 @@
                                             for all other ldap operations. 
                                             Proper entries returned for searches.
             -->
-          <testcase name="'Privileges: Restore Tasks: backend-restore New User Root'">
+          <testcase name="getTestCaseName('backend-restore New User Root')">
     
             <sequence>
     
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/privileges/privileges_users.xml b/opendj-sdk/opends/tests/functional-tests/testcases/privileges/privileges_users.xml
index 373d60d..4c3f93b 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/privileges/privileges_users.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/privileges/privileges_users.xml
@@ -79,7 +79,7 @@
                                             for all other ldap operations. 
                                             Proper entries returned for allowed searches.
             -->
-            <testcase name="'Privileges: Users: bypass-acl'">
+            <testcase name="getTestCaseName('bypass-acl')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -286,7 +286,7 @@
                                             for all ldap operations. 
                                             Proper entries returned for allowed searches.
             -->
-            <testcase name="'Privileges: Users: bypass-acl with proxy'">
+            <testcase name="getTestCaseName('bypass-acl with proxy')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -527,7 +527,7 @@
                                             for all ldap operations. 
                                             Proper entries returned for allowed searches.
             -->
-            <testcase name="'Privileges: Users: bypass-acl with minus notation'">
+            <testcase name="getTestCaseName('bypass-acl with minus notation')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -759,7 +759,7 @@
                                             for all other ldap operations. 
                                             Proper entries returned for allowed searches.
             -->
-            <testcase name="'Privileges: Users: bypass-acl self-modify add'">
+            <testcase name="getTestCaseName('bypass-acl self-modify add')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -881,7 +881,7 @@
                                             for steps 1, 3, 7 and 10, and 0
                                             for all other ldap operations.
             -->
-            <testcase name="'Privileges: Users: modify-acl - add aci'">
+            <testcase name="getTestCaseName('modify-acl - add aci')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -1091,7 +1091,7 @@
                                             for steps 1, 3, 7 and 9, and 0
                                             for all other ldap operations.
             -->
-            <testcase name="'Privileges: Users: modify-acl - replace aci'">
+            <testcase name="getTestCaseName('modify-acl - replace aci')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -1276,7 +1276,7 @@
                                             for steps 1 and 3, and 0
                                             for all other ldap operations.
             -->
-            <testcase name="'Privileges: Users: modify-acl - delete aci'">
+            <testcase name="getTestCaseName('modify-acl - delete aci')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -1426,7 +1426,7 @@
                                             for all other ldap operations. 
                                             Proper entries returned for allowed searches.
             -->
-            <testcase name="'Privileges: Users: config-read'">
+            <testcase name="getTestCaseName('config-read')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -1565,7 +1565,7 @@
                                             for steps 1, 3, 5, 9, 11, and 13, and 0
                                             for all other ldap operations. 
             -->
-            <testcase name="'Privileges: Users: config-write'">
+            <testcase name="getTestCaseName('config-write')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -1817,7 +1817,7 @@
                                             for steps 1, 3, 5, 9, 11, and 14, and 0
                                             for all other ldap operations. 
             -->
-            <testcase name="'Privileges: Users: config-write - add global aci'">
+            <testcase name="getTestCaseName('config-write - add global aci')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -2086,7 +2086,7 @@
                                             for steps 1, 6, and 8, and 0
                                             for all other ldap operations. 
             -->
-            <testcase name="'Privileges: Users: password-reset'">
+            <testcase name="getTestCaseName('password-reset')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -2281,7 +2281,7 @@
                                             for step 1, 65 for step 2, and 0
                                             for all other ldap operations. 
             -->
-            <testcase name="'Privileges: Users: update-schema'">
+            <testcase name="getTestCaseName('update-schema')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -2483,7 +2483,7 @@
                 #@TestResult                Success if OpenDS returns 0
                                             for all other ldap operations. 
             -->
-            <testcase name="'Privileges: Users: privilege-change'">
+            <testcase name="getTestCaseName('privilege-change')">
               <sequence>
                 <call function="'testCase_Preamble'"/>
                           
@@ -2647,7 +2647,7 @@
                                             for steps 1, 3, 7, and 9, and 0
                                             for all other ldap operations. 
             -->
-            <testcase name="'Privileges: Users: server-shutdown'">
+            <testcase name="getTestCaseName('server-shutdown')">
     
             <sequence>
     
@@ -2857,7 +2857,7 @@
                                             for steps 1, 3, 7, and 9, and 0
                                             for all other ldap operations. 
             -->
-            <testcase name="'Privileges: Users: server-restart'">
+            <testcase name="getTestCaseName('server-restart')">
     
             <sequence>
     
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/replication/basic/replication_basic.xml b/opendj-sdk/opends/tests/functional-tests/testcases/replication/basic/replication_basic.xml
index a10cd69..7dc5e55 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/replication/basic/replication_basic.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/replication/basic/replication_basic.xml
@@ -74,7 +74,7 @@
           #@TestPostamble
           #@TestResult
           -->									
-          <testcase name="'Replication: Basic: Add Entry'">
+          <testcase name="getTestCaseName('Add Entry')">
             <sequence>
               <call function="'testCase_Preamble'"/>
               <message>
@@ -126,7 +126,7 @@
           #@TestPostamble
           #@TestResult
           -->											
-          <testcase name="'Replication: Basic: Modify Entry'">
+          <testcase name="getTestCaseName('Modify Entry')">
             <sequence>
               <call function="'testCase_Preamble'"/>
               <message>
@@ -197,7 +197,7 @@
           #@TestPostamble
           #@TestResult
           -->											
-          <testcase name="'Replication: Basic: Delete Entry'">
+          <testcase name="getTestCaseName('Delete Entry')">
             <sequence>
               <call function="'testCase_Preamble'"/>
               <message>
@@ -250,7 +250,7 @@
           #@TestPostamble
           #@TestResult
           -->									
-          <testcase name="'Replication: Basic: Add Multiple Entries'">
+          <testcase name="getTestCaseName('Add Multiple Entries')">
             <sequence>
               <call function="'testCase_Preamble'"/>
               <message>
@@ -315,7 +315,7 @@
           #@TestPostamble
           #@TestResult
           -->											
-          <testcase name="'Replication: Basic: Modify Entry - add single attribute'">
+          <testcase name="getTestCaseName('Modify Entry - add single attribute')">
             <sequence>
               <call function="'testCase_Preamble'"/>
               <message>
@@ -381,7 +381,7 @@
           #@TestPostamble
           #@TestResult
           -->											
-          <testcase name="'Replication: Basic: Modify Entry - add single value'">
+          <testcase name="getTestCaseName('Modify Entry - add single value')">
             <sequence>
               <call function="'testCase_Preamble'"/>
               <message>
@@ -445,7 +445,7 @@
           #@TestPostamble
           #@TestResult
           -->											
-          <testcase name="'Replication: Basic: Modify Entry - delete single attribute'">
+          <testcase name="getTestCaseName('Modify Entry - delete single attribute')">
             <sequence>
               <call function="'testCase_Preamble'"/>
               <message>
@@ -529,7 +529,7 @@
           #@TestPostamble
           #@TestResult
           -->											
-          <testcase name="'Replication: Basic: Modify Entry - delete single value'">
+          <testcase name="getTestCaseName('Modify Entry - delete single value')">
             <sequence>
               <call function="'testCase_Preamble'"/>
               <message>
@@ -595,7 +595,7 @@
           #@TestPostamble
           #@TestResult
           -->											
-          <testcase name="'Replication: Basic: Modify Entry - add multiple values'">
+          <testcase name="getTestCaseName('Modify Entry - add multiple values')">
             <sequence>
               <call function="'testCase_Preamble'"/>
               <message>
@@ -667,7 +667,7 @@
           #@TestPostamble
           #@TestResult
           -->											
-          <testcase name="'Replication: Basic: Modify Entry - delete multiple values'">
+          <testcase name="getTestCaseName('Modify Entry - delete multiple values')">
             <sequence>
               <call function="'testCase_Preamble'"/>
               <message>
@@ -741,7 +741,7 @@
           #@TestPostamble
           #@TestResult
           -->											
-          <testcase name="'Replication: Basic: Modify Entry - replace multiple values'">
+          <testcase name="getTestCaseName('Modify Entry - replace multiple values')">
             <sequence>
               <call function="'testCase_Preamble'"/>
               <message>
@@ -814,7 +814,7 @@
           #@TestPostamble
           #@TestResult
           -->											
-          <testcase name="'Replication: Basic: Modify Entry - add single value to multiple valued attribute'">
+          <testcase name="getTestCaseName('Modify Entry - add single value to multiple valued attribute')">
             <sequence>
               <call function="'testCase_Preamble'"/>
               <message>
@@ -886,7 +886,7 @@
           #@TestPostamble
           #@TestResult
           -->											
-          <testcase name="'Replication: Basic: Modify Entry - delete single value from multiple valued attribute'">
+          <testcase name="getTestCaseName('Modify Entry - delete single value from multiple valued attribute')">
             <sequence>
               <call function="'testCase_Preamble'"/>
               <message>
@@ -957,7 +957,7 @@
           #@TestPostamble
           #@TestResult
           -->											
-          <testcase name="'Replication: Basic: Modify Entry - replace case sensitive attribute'">
+          <testcase name="getTestCaseName('Modify Entry - replace case sensitive attribute')">
             <sequence>
               <call function="'testCase_Preamble'"/>
               <message>
@@ -1038,7 +1038,7 @@
           #@TestPostamble
           #@TestResult
           -->											
-          <testcase name="'Replication: Basic: Modify Entry - add binary attribute'">
+          <testcase name="getTestCaseName('Modify Entry - add binary attribute')">
             <sequence>
               <call function="'testCase_Preamble'"/>
               <message>
@@ -1123,7 +1123,7 @@
           #@TestPostamble
           #@TestResult
           -->											
-          <testcase name="'Replication: Basic: Modify Entry - replace binary attribute'">
+          <testcase name="getTestCaseName('Modify Entry - replace binary attribute')">
             <sequence>
               <call function="'testCase_Preamble'"/>
               <message>
@@ -1208,7 +1208,7 @@
           #@TestPostamble
           #@TestResult
           -->											
-          <testcase name="'Replication: Basic: Modify Entry - delete binary attribute'">
+          <testcase name="getTestCaseName('Modify Entry - delete binary attribute')">
             <sequence>
               <call function="'testCase_Preamble'"/>
               <message>
@@ -1293,7 +1293,7 @@
           #@TestPostamble
           #@TestResult
           -->									
-          <testcase name="'Replication: Basic: Rename Entry'">
+          <testcase name="getTestCaseName('Rename Entry')">
             <sequence>
               <call function="'testCase_Preamble'"/>
               <message>
@@ -1382,7 +1382,7 @@
           #@TestPostamble
           #@TestResult
           -->									
-          <testcase name="'Replication: Basic: Rename Entry (preserving old rdn)'">
+          <testcase name="getTestCaseName('Rename Entry (preserving old rdn)')">
             <sequence>
               <call function="'testCase_Preamble'"/>
               <message>
@@ -1481,7 +1481,7 @@
           #@TestPostamble
           #@TestResult
           -->									
-          <testcase name="'Replication: Basic: Rename Subtree'">
+          <testcase name="getTestCaseName('Rename Subtree')">
             <sequence>
               <call function="'testCase_Preamble'"/>
               <message>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/replication/totalupdate/replication_binarycopy.xml b/opendj-sdk/opends/tests/functional-tests/testcases/replication/totalupdate/replication_binarycopy.xml
index 6f4ce66..5bdc278 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/replication/totalupdate/replication_binarycopy.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/replication/totalupdate/replication_binarycopy.xml
@@ -74,7 +74,7 @@
           #@TestPostamble
           #@TestResult
           -->					     
-          <testcase name="'Replication: Binary Copy: Off-line initialisation'">
+          <testcase name="getTestCaseName('Off-line initialisation')">
             <sequence>            
               <call function="'testCase_Preamble'"/>
               <message>
@@ -175,7 +175,7 @@
           #@TestPostamble
           #@TestResult
           -->					     
-          <testcase name="'Replication: Binary Copy: On-line initialisation'">
+          <testcase name="getTestCaseName('On-line initialisation')">
             <sequence>            
               <call function="'testCase_Preamble'"/>
               <message>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/replication/totalupdate/replication_ldifimport.xml b/opendj-sdk/opends/tests/functional-tests/testcases/replication/totalupdate/replication_ldifimport.xml
index 9ab4efe..94bbfa6 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/replication/totalupdate/replication_ldifimport.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/replication/totalupdate/replication_ldifimport.xml
@@ -74,7 +74,7 @@
           #@TestPostamble
           #@TestResult
           -->					     
-          <testcase name="'Replication: Ldif Import: Off-line initialisation'">
+          <testcase name="getTestCaseName('Off-line initialisation')">
             <sequence>            
               <call function="'testCase_Preamble'"/>
               <message>
@@ -173,7 +173,7 @@
           #@TestPostamble
           #@TestResult
           -->					     
-          <testcase name="'Replication: Ldif Import: On-line initialisation'">
+          <testcase name="getTestCaseName('On-line initialisation')">
             <sequence>            
               <call function="'testCase_Preamble'"/>
               <message>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/replication/totalupdate/replication_resynchronization.xml b/opendj-sdk/opends/tests/functional-tests/testcases/replication/totalupdate/replication_resynchronization.xml
index 604123a..1e6d330 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/replication/totalupdate/replication_resynchronization.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/replication/totalupdate/replication_resynchronization.xml
@@ -74,7 +74,7 @@
           #@TestPostamble
           #@TestResult
           -->					     
-          <testcase name="'Replication: Re-Synchronization: Off-line initialisation'">
+          <testcase name="getTestCaseName('Off-line initialisation')">
             <sequence>            
               <call function="'testCase_Preamble'"/>
               <message>
@@ -186,7 +186,7 @@
           #@TestPostamble
           #@TestResult
           -->					     
-          <testcase name="'Replication: Re-Synchronization: On-line initialisation'">
+          <testcase name="getTestCaseName('On-line initialisation')">
             <sequence>            
               <call function="'testCase_Preamble'"/>
               <message>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/replication/totalupdate/replication_schema.xml b/opendj-sdk/opends/tests/functional-tests/testcases/replication/totalupdate/replication_schema.xml
index 6f8c307..002b6f9 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/replication/totalupdate/replication_schema.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/replication/totalupdate/replication_schema.xml
@@ -97,7 +97,7 @@
           #@TestPostamble
           #@TestResult
           -->					     
-          <testcase name="'Replication: Schema Replication: Add objectclass'">
+          <testcase name="getTestCaseName('Add objectclass')">
             <sequence>            
               <call function="'testCase_Preamble'"/>
               <message>
@@ -170,7 +170,7 @@
           #@TestPostamble
           #@TestResult
           -->					     
-          <testcase name="'Replication: Schema Replication: Add attributetype'">
+          <testcase name="getTestCaseName('Add attributetype')">
             <sequence>            
               <call function="'testCase_Preamble'"/>
               <message>
@@ -243,7 +243,7 @@
           #@TestPostamble
           #@TestResult
           	     
-          <testcase name="'Replication: Schema Replication: Delete objectclass'">
+          <testcase name="getTestCaseName('Delete objectclass')">
             <sequence>            
               <call function="'testCase_Preamble'"/>
               <message>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/replication/totalupdate/totalupdate.xml b/opendj-sdk/opends/tests/functional-tests/testcases/replication/totalupdate/totalupdate.xml
index f1db1af..ff2b70c 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/replication/totalupdate/totalupdate.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/replication/totalupdate/totalupdate.xml
@@ -54,7 +54,7 @@
           </script>
           
           <!--- Test Case : Total Update -->          
-          <testcase name="'Replication: Total Update: Simple LDIF'">
+          <testcase name="getTestCaseName('Simple LDIF')">
             <sequence>
             
               <call function="'testCase_Preamble'"/>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/runFuncTests.xml b/opendj-sdk/opends/tests/functional-tests/testcases/runFuncTests.xml
index 64a0355..aa7c698 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/runFuncTests.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/runFuncTests.xml
@@ -104,6 +104,10 @@
       <import machine="STAF_LOCAL_HOSTNAME"
               file="'%s/testcases/sample/sample.xml' % TESTS_DIR" />
       <script>
+        # this function return a well-formatted testcase name
+        def getTestCaseName(name):
+          return '%s: %s: %s' % (CurrentTestPath['group'],CurrentTestPath['suite'],name)
+        
         class functionToRun:
           def __init__(self, name):
             self.name = name
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/sample/sample.xml b/opendj-sdk/opends/tests/functional-tests/testcases/sample/sample.xml
index 746b62e..7a718b5 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/sample/sample.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/sample/sample.xml
@@ -109,7 +109,7 @@
         <script>
           CurrentTestPath['suite']= 'search'
         </script>
-        <testcase name="'%s: %s: %s' % (CurrentTestPath['group'],CurrentTestPath['suite'],STAXCurrentBlock)">
+        <testcase name="getTestCaseName(STAXCurrentBlock)">
           <sequence>
             <call function="'testCase_Preamble'" />
             <call function="'SearchObject'">
@@ -146,7 +146,7 @@
         <script>
           CurrentTestPath['suite']= 'dummy'
         </script>
-        <testcase name="'%s: %s: %s' % (CurrentTestPath['group'],CurrentTestPath['suite'],STAXCurrentBlock)">
+        <testcase name="getTestCaseName(STAXCurrentBlock)">
           <sequence>
             <call function="'testCase_Preamble'" />
             <tcstatus result="'fail'" />
@@ -176,7 +176,7 @@
         <script>
           CurrentTestPath['suite']= 'dummy'
         </script>
-        <testcase name="'%s: %s: %s' % (CurrentTestPath['group'],CurrentTestPath['suite'],STAXCurrentBlock)">
+        <testcase name="getTestCaseName(STAXCurrentBlock)">
           <sequence>
             <call function="'testCase_Preamble'" />
             <tcstatus result="'pass'" />
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/schema/schema_dynamic.xml b/opendj-sdk/opends/tests/functional-tests/testcases/schema/schema_dynamic.xml
index 620413f..85030e5 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/schema/schema_dynamic.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/schema/schema_dynamic.xml
@@ -80,7 +80,7 @@
               #@TestResult                Success if OpenDS returns 0
           --> 
         
-              <testcase name="'Schema: Dynamic Schema: Update via File'">
+              <testcase name="getTestCaseName('Update via File')">
            
                 <sequence>
         
@@ -161,7 +161,7 @@
           -->  
     
           <!--- Test Case : Schema: Update Over Protocol: Add -->
-          <testcase name="'Schema: Update Over Protocol: Add'">
+          <testcase name="getTestCaseName('Add')">
             <sequence>
               <call function="'testCase_Preamble'"/>
               <message>
@@ -240,7 +240,7 @@
         -->
 
         
-          <testcase name="'Schema: Update Over Protocol: Replace'">
+          <testcase name="getTestCaseName('Replace')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -316,7 +316,7 @@
             #@TestPostamble             none
             #@TestResult                Success if OpenDS returns 0
         -->
-          <testcase name="'Schema: Update Over Protocol: Remove'">
+          <testcase name="getTestCaseName('Remove')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/schema/schema_rfc_tests.xml b/opendj-sdk/opends/tests/functional-tests/testcases/schema/schema_rfc_tests.xml
index 4cbf30e..0619a7c 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/schema/schema_rfc_tests.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/schema/schema_rfc_tests.xml
@@ -52,7 +52,7 @@
 									      
          
           <!--- Test Case : Schema RFC Test 2079 -->
-          <testcase name="'Core: Schema: RFC 2079'">
+          <testcase name="getTestCaseName('RFC 2079')">
             <sequence>
               <call function="'testCase_Preamble'"/>
               <message>
@@ -76,7 +76,7 @@
           </testcase> 
         
           <!--- Test Case : Schema RFC Test 2247 -->
-          <testcase name="'Core: Schema: RFC 2247 1'">
+          <testcase name="getTestCaseName('RFC 2247 1')">
             <sequence>
               <call function="'testCase_Preamble'"/>
               <message>
@@ -100,7 +100,7 @@
           </testcase>
           
           <!--- Test Case : Schema RFC Test 2247 -->
-          <testcase name="'Core: Schema: RFC 2247 2'">
+          <testcase name="getTestCaseName('RFC 2247 2')">
             <sequence>
               <call function="'testCase_Preamble'"/>
               <message>
@@ -124,7 +124,7 @@
           </testcase>
           
           <!--- Test Case : Schema RFC Test 2247 -->
-          <testcase name="'Core: Schema: RFC 2247 3'">
+          <testcase name="getTestCaseName('RFC 2247 3')">
             <sequence>
               <call function="'testCase_Preamble'"/>
               <message>
@@ -146,7 +146,7 @@
           </testcase>
           
           <!--- Test Case : Schema RFC 2247 -->
-          <testcase name="'Core: Schema: RFC 2247 4'">
+          <testcase name="getTestCaseName('RFC 2247 4')">
             <sequence>
               <call function="'testCase_Preamble'"/>
               <message>
@@ -168,7 +168,7 @@
           </testcase>
           
           <!--- Test Case : Schema RFC 2247 -->
-          <testcase name="'Core: Schema: RFC 2247 5'">
+          <testcase name="getTestCaseName('RFC 2247 5')">
             <sequence>
               <call function="'testCase_Preamble'"/>
               <message>
@@ -190,7 +190,7 @@
           </testcase>   
       
           <!--- Test Case : Schema RFC Test 2377 -->
-          <testcase name="'Core: Schema: RFC 2377'">
+          <testcase name="getTestCaseName('RFC 2377')">
             <sequence>
               <call function="'testCase_Preamble'"/>
               <message>
@@ -214,7 +214,7 @@
           </testcase>
           
           <!--- Test Case : Schema RFC Test 2798 -->
-          <testcase name="'Core: Schema: RFC 2798'">
+          <testcase name="getTestCaseName('RFC 2798')">
             <sequence>
               <call function="'testCase_Preamble'"/>
               <message>
@@ -238,7 +238,7 @@
           </testcase> 
           
           <!--- Test Case : Schema RFC 3045 -->
-          <testcase name="'Core: Schema: RFC 3045 1'">
+          <testcase name="getTestCaseName('RFC 3045 1')">
             <sequence>
               <call function="'testCase_Preamble'"/>
               <message>
@@ -260,7 +260,7 @@
           </testcase>
           
           <!--- Test Case : Schema RFC 3045 -->
-          <testcase name="'Core: Schema: RFC 3045 2'">
+          <testcase name="getTestCaseName('RFC 3045 2')">
             <sequence>
               <call function="'testCase_Preamble'"/>
               <message>
@@ -282,7 +282,7 @@
           </testcase>
           
           <!--- Test Case : Schema RFC 4403 -->
-          <testcase name="'Core: Schema: RFC 4403 1'">
+          <testcase name="getTestCaseName('RFC 4403 1')">
             <sequence>
               <call function="'testCase_Preamble'"/>
               <message>
@@ -306,7 +306,7 @@
           </testcase>
           
           <!--- Test Case : Schema RFC 4403 -->
-          <testcase name="'Core: Schema: RFC 4403 2'">
+          <testcase name="getTestCaseName('RFC 4403 2')">
             <sequence>
               <call function="'testCase_Preamble'"/>
               <message>
@@ -330,7 +330,7 @@
           </testcase>
           
           <!--- Test Case : Schema RFC Test 4403 -->
-          <testcase name="'Core: Schema: RFC 4403 3'">
+          <testcase name="getTestCaseName('RFC 4403 3')">
             <sequence>
               <call function="'testCase_Preamble'"/>
               <message>
@@ -352,7 +352,7 @@
           </testcase>  
       
           <!--- Test Case : Schema RFC Test 4403 -->
-          <testcase name="'Core: Schema: RFC 4403 4'">
+          <testcase name="getTestCaseName('RFC 4403 4')">
             <sequence>
               <call function="'testCase_Preamble'"/>
               <message>
@@ -376,7 +376,7 @@
           </testcase>
           
           <!--- Test Case : Schema RFC Test 4403 -->
-          <testcase name="'Core: Schema: RFC 4403 5'">
+          <testcase name="getTestCaseName('RFC 4403 5')">
             <sequence>
               <call function="'testCase_Preamble'"/>
               <message>
@@ -398,7 +398,7 @@
           </testcase>
           
           <!--- Test Case : Schema RFC Test 2307 -->
-          <testcase name="'Core: Schema: Draft Howard RFC 2307bis 1'">
+          <testcase name="getTestCaseName('Draft Howard RFC 2307bis 1')">
             <sequence>
               <call function="'testCase_Preamble'"/>
               <message>
@@ -422,7 +422,7 @@
           </testcase>
           
           <!--- Test Case : Schema RFC 2307 -->
-          <testcase name="'Core: Schema: Draft Howard RFC 2307bis 2'">
+          <testcase name="getTestCaseName('Draft Howard RFC 2307bis 2')">
             <sequence>
               <call function="'testCase_Preamble'"/>
               <message>
@@ -446,7 +446,7 @@
           </testcase>  
   
           <!--- Test Case : Schema RFC 2307 -->
-          <testcase name="'Core: Schema: Draft Howard RFC 2307bis 1'">
+          <testcase name="getTestCaseName('Draft Howard RFC 2307bis 1')">
             <sequence>
               <call function="'testCase_Preamble'"/>
               <message>
@@ -470,7 +470,7 @@
           </testcase>
           
           <!--- Test Case : Schema RFC Test 2307 -->
-          <testcase name="'Core: Schema: Draft Howard RFC 2307bis 1'">
+          <testcase name="getTestCaseName('Draft Howard RFC 2307bis 1')">
             <sequence>
               <call function="'testCase_Preamble'"/>
               <message>
@@ -492,7 +492,7 @@
           </testcase>  
       
           <!--- Test Case : Schema RFC draft-furseth-ldap-untypedobject -->
-          <testcase name="'Core: Schema: Draft Furseth LDAP Untypedobject'">
+          <testcase name="getTestCaseName('Draft Furseth LDAP Untypedobject')">
             <sequence>
               <call function="'testCase_Preamble'"/>
               <message>
@@ -516,7 +516,7 @@
           </testcase> 
          
           <!--- Test Case : Schema RFC draft-good-ldap-changelog -->
-          <testcase name="'Core: Schema: Draft Good LDAP Changelog 1'">
+          <testcase name="getTestCaseName('Draft Good LDAP Changelog 1')">
             <sequence>
               <call function="'testCase_Preamble'"/>
               <message>
@@ -540,7 +540,7 @@
           </testcase>
           
           <!--- Test Case : Schema RFC draft-good-ldap-changelog -->
-          <testcase name="'Core: Schema: Draft Good LDAP Changelog 2'">
+          <testcase name="getTestCaseName('Draft Good LDAP Changelog 2')">
             <sequence>
               <call function="'testCase_Preamble'"/>
               <message>
@@ -564,7 +564,7 @@
           </testcase>  
       
           <!--- Test Case : Schema RFC draft-good-ldap-changelog -->
-          <testcase name="'Core: Schema: Draft Good LDAP Changelog 2'">
+          <testcase name="getTestCaseName('Draft Good LDAP Changelog 2')">
             <sequence>
               <call function="'testCase_Preamble'"/>
               <message>
@@ -588,7 +588,7 @@
           </testcase> 
       
           <!--- Test Case : Schema RFC Test draft-howard-namedobject -->
-          <testcase name="'Core: Schema: Draft Howard NamedObject 1'">
+          <testcase name="getTestCaseName('Draft Howard NamedObject 1')">
             <sequence>
               <call function="'testCase_Preamble'"/>
               <message>
@@ -612,7 +612,7 @@
           </testcase>  
         
           <!--- Test Case : Schema RFC Test draft-howard-namedobject -->
-          <testcase name="'Core: Schema: Draft Howard NamedObject 2'">
+          <testcase name="getTestCaseName('Draft Howard NamedObject 2')">
             <sequence>
               <call function="'testCase_Preamble'"/>
               <message>
@@ -636,7 +636,7 @@
         </testcase>  
     
         <!--- Test Case : Schema RFC Test draft-ietf-ldup-subentry -->
-        <testcase name="'Core: Schema: Draft IETF LDUP Subentry 1'">
+        <testcase name="getTestCaseName('Draft IETF LDUP Subentry 1')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -660,7 +660,7 @@
         </testcase> 
         
         <!--- Test Case : Schema RFC Test draft-ietf-ldup-subentry -->
-        <testcase name="'Core: Schema: Draft IETF LDUP Subentry 2'">
+        <testcase name="getTestCaseName('Draft IETF LDUP Subentry 2')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -684,7 +684,7 @@
         </testcase>
     
         <!--- Test Case : Schema RFC Test draft-ietf-ldup-subentry -->
-        <testcase name="'Core: Schema: Draft IETF LDUP Subentry 3'">
+        <testcase name="getTestCaseName('Draft IETF LDUP Subentry 3')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -706,7 +706,7 @@
         </testcase>  
     
         <!--- Test Case : Schema Disable Schema Checking -->
-        <testcase name="'Core: Schema: Disable Schema Checking'">
+        <testcase name="getTestCaseName('Disable Schema Checking')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -731,7 +731,7 @@
         </testcase>
         
         <!--- Test Case : Schema: Enable Schema Checking' -->
-        <testcase name="'Core: Schema: Enable Schema Checking'">
+        <testcase name="getTestCaseName('Enable Schema Checking')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -756,7 +756,7 @@
         </testcase>
                 
         <!--- Test Case : Schema: Disable Syntax Checking -->
-        <testcase name="'Core: Schema: Disable Syntax Checking'">
+        <testcase name="getTestCaseName('Disable Syntax Checking')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -784,7 +784,7 @@
         </testcase>
         
         <!--- Test Case : Schema: Enable Syntax Checking -->
-        <testcase name="'Core: Schema: Enable Syntax Checking'">
+        <testcase name="getTestCaseName('Enable Syntax Checking')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -812,7 +812,7 @@
         </testcase>
         
         <!--- Test Case : Schema RFC Test draft-ietf-zeilenga-ldap-cosine -->
-        <testcase name="'Core: Schema: Draft IETF Zeilenga LDAP COSINE 1'">
+        <testcase name="getTestCaseName('Draft IETF Zeilenga LDAP COSINE 1')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -836,7 +836,7 @@
         </testcase>
         
         <!--- Test Case : Schema RFC Test draft-ietf-zeilenga-ldap-cosine -->
-        <testcase name="'Core: Schema: Draft IETF Zeilenga LDAP COSINE 2'">
+        <testcase name="getTestCaseName('Draft IETF Zeilenga LDAP COSINE 2')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -860,7 +860,7 @@
         </testcase>
         
         <!--- Test Case : Schema RFC Test draft-ietf-zeilenga-ldap-cosine -->
-        <testcase name="'Core: Schema: Draft IETF Zeilenga LDAP COSINE 3'">
+        <testcase name="getTestCaseName('Draft IETF Zeilenga LDAP COSINE 3')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -881,7 +881,7 @@
           </sequence>
         </testcase>
         
-        <testcase name="'Core: Schema: RFC 2739'">
+        <testcase name="getTestCaseName('RFC 2739')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -923,7 +923,7 @@
           </sequence>
         </testcase>
         
-        <testcase name="'Core: Schema: RFC 2714 1'">
+        <testcase name="getTestCaseName('RFC 2714 1')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -944,7 +944,7 @@
           </sequence>
         </testcase>
         
-        <testcase name="'Core: Schema: RFC 2714 2'">
+        <testcase name="getTestCaseName('RFC 2714 2')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -985,7 +985,7 @@
           </sequence>
         </testcase>
         
-        <testcase name="'Core: Schema: RFC 2713'">
+        <testcase name="getTestCaseName('RFC 2713')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/account_activation/security_account_expiration.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/account_activation/security_account_expiration.xml
index a273e3d..2a2de49 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/account_activation/security_account_expiration.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/account_activation/security_account_expiration.xml
@@ -34,7 +34,7 @@
     <sequence>
       
       <!--- Test case: User Bind Before Deactivation -->
-      <testcase name="'Security: Acct Exp: Preamble'">
+      <testcase name="getTestCaseName('Preamble')">
         <sequence>
           <call function="'testCase_Preamble'"/>
           <message>
@@ -56,7 +56,7 @@
       </testcase>
 
       <!--- Test Case : Admin Expire User-->
-      <testcase name="'Security: Acct Exp: Admin Expire User'">
+      <testcase name="getTestCaseName('Admin Expire User')">
         <sequence>
           <call function="'testCase_Preamble'"/>
           <message>
@@ -79,7 +79,7 @@
       </testcase>
 
       <!--- Test Case : User Bind After Expiration-->
-      <testcase name="'Security: Acct Exp: User Bind After Expiration'">
+      <testcase name="getTestCaseName('User Bind After Expiration')">
         <sequence>
           <call function="'testCase_Preamble'"/>
           <message>
@@ -101,7 +101,7 @@
         </sequence>
       </testcase>
 
-      <testcase name="'Security: Acct Exp: Admin Expire User in Future'">
+      <testcase name="getTestCaseName('Admin Expire User in Future')">
         <sequence>
           <call function="'testCase_Preamble'"/>
           <message>
@@ -124,7 +124,7 @@
       </testcase>
 
       <!--- Test Case : User Bind After Expiration-->
-      <testcase name="'Security: Acct Exp: User Bind With Future Expiration'">
+      <testcase name="getTestCaseName('User Bind With Future Expiration')">
         <sequence>
           <call function="'testCase_Preamble'"/>
           <message>
@@ -146,7 +146,7 @@
       </testcase>
 
      <!--- Test case: Admin Reactivate User -->
-      <testcase name="'Security: Acct Exp: Postamble'">
+      <testcase name="getTestCaseName('Postamble')">
         <sequence>
           <call function="'testCase_Preamble'"/>
           <message>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/account_activation/security_setup_account_activation.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/account_activation/security_setup_account_activation.xml
index 0c2cecb..985dd0b 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/account_activation/security_setup_account_activation.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/account_activation/security_setup_account_activation.xml
@@ -34,7 +34,7 @@
       <sequence>
 
         <!--- Test Case : Add Entries for Acount Activation Tests -->
-        <testcase name="'Security: Acct Act: Add Initial Entries'">
+        <testcase name="getTestCaseName('Add Initial Entries')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/account_activation/security_teardown_account_activation.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/account_activation/security_teardown_account_activation.xml
index b65d7b6..210145c 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/account_activation/security_teardown_account_activation.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/account_activation/security_teardown_account_activation.xml
@@ -35,7 +35,7 @@
 
         <!--- Test Case : Password Policy Teardown -->
         <!--- Delete Branch -->
-        <testcase name="'Security: Acct Act: Reset'">
+        <testcase name="getTestCaseName('Reset')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/account_activation/security_test_account.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/account_activation/security_test_account.xml
index 6e0e7d8..e1f49eb 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/account_activation/security_test_account.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/account_activation/security_test_account.xml
@@ -34,7 +34,7 @@
       <sequence>
 
         <!--- Test case: User Bind Before Deactivation -->
-        <testcase name="'Security: Acct Act: Preamble'">
+        <testcase name="getTestCaseName('Preamble')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -56,7 +56,7 @@
         </testcase>
 
         <!--- Test Case : Admin Deactivate User-->
-        <testcase name="'Security: Acct Act: Admin Deactivate User'">
+        <testcase name="getTestCaseName('Admin Deactivate User')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -79,7 +79,7 @@
         </testcase>
 
         <!--- Test Case : User Bind After Deactivation-->
-        <testcase name="'Security: Acct Act: User Bind After Deactivation'">
+        <testcase name="getTestCaseName('User Bind After Deactivation')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -102,7 +102,7 @@
         </testcase>
 
        <!--- Test case: Admin Reactivate User -->
-        <testcase name="'Security: Acct Act: Postamble'">
+        <testcase name="getTestCaseName('Postamble')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_MD5_policy.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_MD5_policy.xml
index 34e1eb2..8de4f45 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_MD5_policy.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_MD5_policy.xml
@@ -53,7 +53,7 @@
             #@TestPostamble             none
             #@TestResult                Success if OpenDS returns 0
         -->
-        <testcase name="'Security: Auth Pwd Syntax: MD5 Policy - Preamble'">
+        <testcase name="getTestCaseName('MD5 Policy - Preamble')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -91,7 +91,7 @@
             #@TestResult                Success if OpenDS returns 0
                                         for all ldap operations.
         -->
-        <testcase name="'Security: Auth Pwd Syntax: MD5 Policy - Add Users'">
+        <testcase name="getTestCaseName('MD5 Policy - Add Users')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -158,7 +158,7 @@
             #@TestResult                Success if OpenDS returns 65
                                         and a search for the user returns 49.
         -->
-        <testcase name="'Security: Auth Pwd Syntax: MD5 Policy - Add User w/o Objectclass'">
+        <testcase name="getTestCaseName('MD5 Policy - Add User w/o Objectclass')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -211,7 +211,7 @@
             #@TestResult                Success if OpenDS returns 21
                                         and a search for the user returns 49.
         -->
-        <testcase name="'Security: Auth Pwd Syntax: MD5 Policy - Add User w/o Pwd Policy'">
+        <testcase name="getTestCaseName('MD5 Policy - Add User w/o Pwd Policy')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -262,7 +262,7 @@
             #@TestPostamble             none
             #@TestResult                Success if OpenDS returns 0
         -->
-        <testcase name="'Security: Auth Pwd Syntax: MD5 Policy - Postamble'">
+        <testcase name="getTestCaseName('MD5 Policy - Postamble')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_SHA1_policy.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_SHA1_policy.xml
index c63dcb8..01ece08 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_SHA1_policy.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_SHA1_policy.xml
@@ -53,7 +53,7 @@
             #@TestPostamble             none
             #@TestResult                Success if OpenDS returns 0
         -->
-        <testcase name="'Security: Auth Pwd Syntax: SHA1 Policy - Preamble'">
+        <testcase name="getTestCaseName('SHA1 Policy - Preamble')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -90,7 +90,7 @@
             #@TestResult                Success if OpenDS returns 0
                                         for all ldap operations.
         -->
-        <testcase name="'Security: Auth Pwd Syntax: SHA1 Policy - Add Users'">
+        <testcase name="getTestCaseName('SHA1 Policy - Add Users')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -157,7 +157,7 @@
             #@TestResult                Success if OpenDS returns 65
                                         and a search for the user returns 49.
         -->
-        <testcase name="'Security: Auth Pwd Syntax: SHA1 Policy - Add User w/o Objectclass'">
+        <testcase name="getTestCaseName('SHA1 Policy - Add User w/o Objectclass')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -209,7 +209,7 @@
             #@TestResult                Success if OpenDS returns 21
                                         and a search for the user returns 49.
         -->
-        <testcase name="'Security: Auth Pwd Syntax: SHA1 Policy - Add User w/o Pwd Policy'">
+        <testcase name="getTestCaseName('SHA1 Policy - Add User w/o Pwd Policy')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -258,7 +258,7 @@
             #@TestPostamble             none
             #@TestResult                Success if OpenDS returns 0
         -->
-        <testcase name="'Security: Auth Pwd Syntax: SHA1 Policy - Postamble'">
+        <testcase name="getTestCaseName('SHA1 Policy - Postamble')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_SHA256_policy.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_SHA256_policy.xml
index 8d023f1..f9193b1 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_SHA256_policy.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_SHA256_policy.xml
@@ -53,7 +53,7 @@
             #@TestPostamble             none
             #@TestResult                Success if OpenDS returns 0
         -->
-        <testcase name="'Security: Auth Pwd Syntax: SHA256 Policy - Preamble'">
+        <testcase name="getTestCaseName('SHA256 Policy - Preamble')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -89,7 +89,7 @@
             #@TestResult                Success if OpenDS returns 0
                                         for all ldap operations.
         -->
-        <testcase name="'Security: Auth Pwd Syntax: SHA256 Policy - Add Users'">
+        <testcase name="getTestCaseName('SHA256 Policy - Add Users')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -154,7 +154,7 @@
             #@TestResult                Success if OpenDS returns 65
                                         and a search for the user returns 49.
         -->
-        <testcase name="'Security: Auth Pwd Syntax: SHA256 Policy - Add User w/o Objectclass'">
+        <testcase name="getTestCaseName('SHA256 Policy - Add User w/o Objectclass')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -206,7 +206,7 @@
             #@TestResult                Success if OpenDS returns 21
                                         and a search for the user returns 49.
         -->
-        <testcase name="'Security: Auth Pwd Syntax: SHA256 Policy - Add User w/o Pwd Policy'">
+        <testcase name="getTestCaseName('SHA256 Policy - Add User w/o Pwd Policy')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -257,7 +257,7 @@
             #@TestPostamble             none
             #@TestResult                Success if OpenDS returns 0
         -->
-        <testcase name="'Security: Auth Pwd Syntax: SHA256 Policy - Postamble'">
+        <testcase name="getTestCaseName('SHA256 Policy - Postamble')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_SHA384_policy.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_SHA384_policy.xml
index 21ca2a4..c8bf986 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_SHA384_policy.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_SHA384_policy.xml
@@ -53,7 +53,7 @@
             #@TestPostamble             none
             #@TestResult                Success if OpenDS returns 0
         -->
-        <testcase name="'Security: Auth Pwd Syntax: SHA384 Policy - Preamble'">
+        <testcase name="getTestCaseName('SHA384 Policy - Preamble')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -89,7 +89,7 @@
             #@TestResult                Success if OpenDS returns 0
                                         for all ldap operations.
         -->
-        <testcase name="'Security: Auth Pwd Syntax: SHA384 Policy - Add Users'">
+        <testcase name="getTestCaseName('SHA384 Policy - Add Users')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -155,7 +155,7 @@
             #@TestResult                Success if OpenDS returns 65
                                         and a search for the user returns 49.
         -->
-        <testcase name="'Security: Auth Pwd Syntax: SHA384 Policy - Add User w/o Objectclass'">
+        <testcase name="getTestCaseName('SHA384 Policy - Add User w/o Objectclass')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -207,7 +207,7 @@
             #@TestResult                Success if OpenDS returns 21
                                         and a search for the user returns 49.
         -->
-        <testcase name="'Security: Auth Pwd Syntax: SHA384 Policy - Add User w/o Pwd Policy'">
+        <testcase name="getTestCaseName('SHA384 Policy - Add User w/o Pwd Policy')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -258,7 +258,7 @@
             #@TestPostamble             none
             #@TestResult                Success if OpenDS returns 0
         -->
-        <testcase name="'Security: Auth Pwd Syntax: SHA384 Policy - Postamble'">
+        <testcase name="getTestCaseName('SHA384 Policy - Postamble')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_SHA512_policy.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_SHA512_policy.xml
index 1f4bec8..667272a 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_SHA512_policy.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_SHA512_policy.xml
@@ -53,7 +53,7 @@
             #@TestPostamble             none
             #@TestResult                Success if OpenDS returns 0
         -->
-        <testcase name="'Security: Auth Pwd Syntax: SHA512 Policy - Preamble'">
+        <testcase name="getTestCaseName('SHA512 Policy - Preamble')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -89,7 +89,7 @@
             #@TestResult                Success if OpenDS returns 0
                                         for all ldap operations.
         -->
-        <testcase name="'Security: Auth Pwd Syntax: SHA512 Policy - Add Users'">
+        <testcase name="getTestCaseName('SHA512 Policy - Add Users')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -154,7 +154,7 @@
             #@TestResult                Success if OpenDS returns 65
                                         and a search for the user returns 49.
         -->
-        <testcase name="'Security: Auth Pwd Syntax: SHA512 Policy - Add User w/o Objectclass'">
+        <testcase name="getTestCaseName('SHA512 Policy - Add User w/o Objectclass')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -207,7 +207,7 @@
             #@TestResult                Success if OpenDS returns 21
                                         and a search for the user returns 49.
         -->
-        <testcase name="'Security: Auth Pwd Syntax: SHA512 Policy - Add User w/o Pwd Policy'">
+        <testcase name="getTestCaseName('SHA512 Policy - Add User w/o Pwd Policy')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -257,7 +257,7 @@
             #@TestPostamble             none
             #@TestResult                Success if OpenDS returns 0
         -->
-        <testcase name="'Security: Auth Pwd Syntax: SHA512 Policy - Postamble'">
+        <testcase name="getTestCaseName('SHA512 Policy - Postamble')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_def_policy.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_def_policy.xml
index edcef63..b0a99b8 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_def_policy.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_def_policy.xml
@@ -52,7 +52,7 @@
             #@TestPostamble             none
             #@TestResult                Success if OpenDS returns 0
         -->
-        <testcase name="'Security: Auth Pwd Syntax: Default Policy - Preamble'">
+        <testcase name="getTestCaseName('Default Policy - Preamble')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -93,7 +93,7 @@
                                         new user. The bind by the old user should 
                                         return 49.
         -->
-        <testcase name="'Security: Auth Pwd Syntax: Default Policy - Add Users'">
+        <testcase name="getTestCaseName('Default Policy - Add Users')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -161,7 +161,7 @@
             #@TestPostamble             none
             #@TestResult                Success if OpenDS returns 0
         -->
-        <testcase name="'Security: Auth Pwd Syntax: Default Policy - Postamble'">
+        <testcase name="getTestCaseName('Default Policy - Postamble')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_setup_auth_pwd_syntax.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_setup_auth_pwd_syntax.xml
index f4ce85e..70ea325 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_setup_auth_pwd_syntax.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_setup_auth_pwd_syntax.xml
@@ -57,7 +57,7 @@
             #@TestPostamble             none
             #@TestResult                Success if OpenDS returns 0 for all operations
         -->
-        <testcase name="'Security: Auth Pwd Syntax: Add Initial Entries'">
+        <testcase name="getTestCaseName('Add Initial Entries')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_teardown_auth_pwd_syntax.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_teardown_auth_pwd_syntax.xml
index 86a3e1f..28bdeda 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_teardown_auth_pwd_syntax.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_teardown_auth_pwd_syntax.xml
@@ -53,7 +53,7 @@
             #@TestPostamble             none
             #@TestResult                Success if OpenDS returns 0 for all operations
          -->
-        <testcase name="'Security: Auth Pwd Syntax: Postamble Reset'">
+        <testcase name="getTestCaseName('Postamble Reset')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/bind_no_pwd/security_pwd_null.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/bind_no_pwd/security_pwd_null.xml
index e3e0246..a1e1d4a 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/bind_no_pwd/security_pwd_null.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/bind_no_pwd/security_pwd_null.xml
@@ -34,7 +34,7 @@
       <sequence>
 
         <!--- Test Case : Default - Search Entry With Pwd -->
-        <testcase name="'Security: Bind No Pwd: Default - Search Entry With Pwd'">
+        <testcase name="getTestCaseName('Default - Search Entry With Pwd')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -55,7 +55,7 @@
         </testcase>
 
         <!--- Test Case : Default - Search Entry With No Pwd -->
-        <testcase name="'Security: Bind No Pwd: Default - Search Entry With No Pwd'">
+        <testcase name="getTestCaseName('Default - Search Entry With No Pwd')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -77,7 +77,7 @@
         </testcase>
 
         <!--- Test Case : Enable Binds With No Password -->
-        <testcase name="'Security: Bind No Pwd: Enable'">
+        <testcase name="getTestCaseName('Enable')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -98,7 +98,7 @@
         </testcase>
 
         <!--- Test Case : Enabled - Search Entry With Pwd -->
-        <testcase name="'Security: Bind No Pwd: Enabled - Search Entry With Pwd'">
+        <testcase name="getTestCaseName('Enabled - Search Entry With Pwd')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -119,7 +119,7 @@
         </testcase>
 
         <!--- Test Case : Enabled - Search Entry With No Pwd -->
-        <testcase name="'Security: Bind No Pwd: Enabled - Search Entry With No Pwd'">
+        <testcase name="getTestCaseName('Enabled - Search Entry With No Pwd')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -140,7 +140,7 @@
         </testcase>
 
         <!--- Test Case : Enabled - Search As User With No Pwd -->
-        <testcase name="'Security: Bind No Pwd: Enabled - Search As User With No Pwd'">
+        <testcase name="getTestCaseName('Enabled - Search As User With No Pwd')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -161,7 +161,7 @@
         </testcase>
 
         <!--- Test Case : Enabled - Search As Non-exist User -->
-        <testcase name="'Security: Bind No Pwd: Enabled - Search As Non-exist User'">
+        <testcase name="getTestCaseName('Enabled - Search As Non-exist User')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -182,7 +182,7 @@
         </testcase>
 
         <!--- Test Case : Reset Configuration -->
-        <testcase name="'Security: Bind No Pwd: Postamble'">
+        <testcase name="getTestCaseName('Postamble')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/bind_no_pwd/security_setup_bind_no_pwd.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/bind_no_pwd/security_setup_bind_no_pwd.xml
index 9ec5642..3d27f7b 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/bind_no_pwd/security_setup_bind_no_pwd.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/bind_no_pwd/security_setup_bind_no_pwd.xml
@@ -34,7 +34,7 @@
       <sequence>
 
         <!--- Test Case : Add Entries for Bind No Pwd Tests -->
-        <testcase name="'Security: Bind No Pwd: Add Initial Entries'">
+        <testcase name="getTestCaseName('Add Initial Entries')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/bind_no_pwd/security_teardown_bind_no_pwd.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/bind_no_pwd/security_teardown_bind_no_pwd.xml
index bb18948..beaec4d 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/bind_no_pwd/security_teardown_bind_no_pwd.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/bind_no_pwd/security_teardown_bind_no_pwd.xml
@@ -35,7 +35,7 @@
 
         <!--- Test Case : Password Policy Teardown -->
         <!--- Delete Branch -->
-        <testcase name="'Security: Bind No Pwd: Postamble Reset'">
+        <testcase name="getTestCaseName('Postamble Reset')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/client_auth/client_auth_setup.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/client_auth/client_auth_setup.xml
index 8e78f53..c26c841 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/client_auth/client_auth_setup.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/client_auth/client_auth_setup.xml
@@ -42,7 +42,7 @@
           #@TestResult                Success if OpenDS returns 0 for all operations
       -->
       <!-- Generate Server Cert -->
-      <testcase name="'Security: client_auth:  Setup. certificates configuration'">
+      <testcase name="getTestCaseName(' Setup. certificates configuration')">
         <sequence>
           <call function="'testCase_Preamble'"/>
           <!-- Load in the local shared python objects from libraries -->
@@ -159,7 +159,7 @@
             #@TestResult                Success if OpenDS returns 0 for all operations
         -->
 		  
-      <testcase name="'Security: client_auth:  setup. Export and Import certificates'">
+      <testcase name="getTestCaseName(' setup. Export and Import certificates')">
         <sequence>
           <call function="'testCase_Preamble'" />
           
@@ -273,7 +273,7 @@
             #@TestPostamble          none
             #@TestResult                Success if OpenDS returns 0 for all operations
       -->
-      <testcase name="'Security: client_auth: setup. Configure SSL and StartTLS'">
+      <testcase name="getTestCaseName('setup. Configure SSL and StartTLS')">
         <sequence>
           <call function="'testCase_Preamble'"/>
           <!-- Load in the local shared python objects from libraries -->
@@ -337,7 +337,7 @@
             #@TestPostamble          none
             #@TestResult                Success if OpenDS returns 0 for all operations
        -->
-      <testcase name="'Security: client_auth: setup. Create users entries'">
+      <testcase name="getTestCaseName('setup. Create users entries')">
         <sequence>
           <call function="'testCase_Preamble'"/>
           <!-- Load in the local shared python objects from libraries -->
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/client_auth/client_auth_teardown.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/client_auth/client_auth_teardown.xml
index ad5fc19..e8245ee 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/client_auth/client_auth_teardown.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/client_auth/client_auth_teardown.xml
@@ -42,7 +42,7 @@
             #@TestScript                   teardown_client_auth.xml
       -->
      <!--- Delete Branch through SSL port -->
-     <testcase name="'Security: client_auth: teardown'">
+     <testcase name="getTestCaseName('teardown')">
         <!---
             Place test-specific test information here.
             The tag, TestMarker, must be the same as the tag, TestSuiteName.
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/client_auth/equal_dn_mapper.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/client_auth/equal_dn_mapper.xml
index f773560..c5a81dd 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/client_auth/equal_dn_mapper.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/client_auth/equal_dn_mapper.xml
@@ -45,7 +45,7 @@
       -->
 		  
     
-  <testcase name="'Security: client_auth:  setup - equal_dn_mapper'">
+  <testcase name="getTestCaseName(' setup - equal_dn_mapper')">
 
 	  <sequence>
       <call function="'testCase_Preamble'"/>
@@ -84,7 +84,7 @@
 	#@TestResult               Success if OpenDS returns 0 for all operations
       -->
     
-  <testcase name="'Security: client_auth: Equal DN mapping '">
+  <testcase name="getTestCaseName('Equal DN mapping ')">
     <sequence>
 
     <call function="'testCase_Preamble'"/>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/client_auth/fingerprint_mapper.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/client_auth/fingerprint_mapper.xml
index 296e81a..d06a452 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/client_auth/fingerprint_mapper.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/client_auth/fingerprint_mapper.xml
@@ -46,7 +46,7 @@
       -->
 		  
     
-  <testcase name="'Security: client_auth:  setup - fingerprint_mapper'">
+  <testcase name="getTestCaseName(' setup - fingerprint_mapper')">
 
    <sequence>
     <call function="'testCase_Preamble'"/>
@@ -88,7 +88,7 @@
 #@TestResult               Success if OpenDS returns 0 for all operations
  -->
     
-  <testcase name="'Security: client_auth: fingerprint mapping on ds-certificate-fingerprint attribute'">
+  <testcase name="getTestCaseName('fingerprint mapping on ds-certificate-fingerprint attribute')">
     <sequence>
  
     <call function="'testCase_Preamble'"/>
@@ -466,7 +466,7 @@
 #@TestResult               Success if OpenDS returns 0 for all operations
  -->
     
-  <testcase name="'Security: client_auth: fingerprint mapping on description attribute'">
+  <testcase name="getTestCaseName('fingerprint mapping on description attribute')">
     <sequence>
  
     <call function="'testCase_Preamble'"/>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/client_auth/subject_attribute_mapper.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/client_auth/subject_attribute_mapper.xml
index a22f988..9406e17 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/client_auth/subject_attribute_mapper.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/client_auth/subject_attribute_mapper.xml
@@ -45,7 +45,7 @@
       -->
 		  
     
-  <testcase name="'Security: client_auth:  setup - subject_attribute_mapper'">
+  <testcase name="getTestCaseName(' setup - subject_attribute_mapper')">
 
 	  <sequence>
       <call function="'testCase_Preamble'"/>
@@ -94,7 +94,7 @@
 	#@TestResult               Success if OpenDS returns 0 for all operations
       -->
     
-  <testcase name="'Security: client_auth: subject attribute mapping'">
+  <testcase name="getTestCaseName('subject attribute mapping')">
     <sequence>
 
     <call function="'testCase_Preamble'"/>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/client_auth/subject_dn_mapper.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/client_auth/subject_dn_mapper.xml
index a199fa3..f73aa33 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/client_auth/subject_dn_mapper.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/client_auth/subject_dn_mapper.xml
@@ -46,7 +46,7 @@
       -->
 		  
     
-  <testcase name="'Security: client_auth:  setup - Subject_dn_mapper'">
+  <testcase name="getTestCaseName(' setup - Subject_dn_mapper')">
 
    <sequence>
     <call function="'testCase_Preamble'"/>
@@ -88,7 +88,7 @@
 #@TestResult               Success if OpenDS returns 0 for all operations
  -->
     
-  <testcase name="'Security: client_auth: subject dn mapping on ds-certificate-subject-dn'">
+  <testcase name="getTestCaseName('subject dn mapping on ds-certificate-subject-dn')">
     <sequence>
 
     <call function="'testCase_Preamble'"/>
@@ -277,7 +277,7 @@
 #@TestResult               Success if OpenDS returns 0 for all operations
   -->
     
-  <testcase name="'Security: client_auth: subject dn mapping on attribut description'">
+  <testcase name="getTestCaseName('subject dn mapping on attribut description')">
     <sequence>
 	
     <call function="'testCase_Preamble'"/>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/jks/security_bob_jks.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/jks/security_bob_jks.xml
index 166e95a..c7cacf9 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/jks/security_bob_jks.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/jks/security_bob_jks.xml
@@ -55,7 +55,7 @@
             #@TestResult                Success if OpenDS returns 0
         -->
 
-        <testcase name="'Security: JKS: Add Entries'">
+        <testcase name="getTestCaseName('Add Entries')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -90,7 +90,7 @@
             #@TestPostamble             none
             #@TestResult                Success if OpenDS returns 0
         -->
-        <testcase name="'Security: JKS: Modify Entry'">
+        <testcase name="getTestCaseName('Modify Entry')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -125,7 +125,7 @@
             #@TestPostamble             none
             #@TestResult                Success if OpenDS returns 0
         -->
-        <testcase name="'Security: JKS: Add Attr to Entry'">
+        <testcase name="getTestCaseName('Add Attr to Entry')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -160,7 +160,7 @@
             #@TestPostamble             none
             #@TestResult                Success if OpenDS returns 0
         -->
-        <testcase name="'Security: JKS: Modify Attr in Entry'">
+        <testcase name="getTestCaseName('Modify Attr in Entry')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -195,7 +195,7 @@
             #@TestPostamble             none
             #@TestResult                Success if OpenDS returns 0
         -->
-        <testcase name="'Security: JKS: Delete Entry'">
+        <testcase name="getTestCaseName('Delete Entry')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/jks/security_setup_jks.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/jks/security_setup_jks.xml
index eeb1d17..2fd2a23 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/jks/security_setup_jks.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/jks/security_setup_jks.xml
@@ -61,7 +61,7 @@
             #@TestResult                Success if OpenDS returns 0 for all operations
         -->
         <!--- Generate Server Cert -->
-        <testcase name="'Security: JKS: Preamble Setup'">
+        <testcase name="getTestCaseName('Preamble Setup')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/jks/security_teardown_jks.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/jks/security_teardown_jks.xml
index cba8ddc..92d6d62 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/jks/security_teardown_jks.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/jks/security_teardown_jks.xml
@@ -42,7 +42,7 @@
             #@TestScript                security_teardown_jks.xml
         -->
         <!--- Delete Branch through SSL port -->
-        <testcase name="'Security: JKS: Postamble Reset'">
+        <testcase name="getTestCaseName('Postamble Reset')">
         <!---
             Place test-specific test information here.
             The tag, TestMarker, must be the same as the tag, TestSuiteName.
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/pkcs12/security_bob_pkcs12.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/pkcs12/security_bob_pkcs12.xml
index 386c92e..a8b3d68 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/pkcs12/security_bob_pkcs12.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/pkcs12/security_bob_pkcs12.xml
@@ -54,7 +54,7 @@
             #@TestPostamble             none
             #@TestResult                Success if OpenDS returns 0
         -->
-        <testcase name="'Security: PKCS12: Add Entries'">
+        <testcase name="getTestCaseName('Add Entries')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -89,7 +89,7 @@
             #@TestPostamble             none
             #@TestResult                Success if OpenDS returns 0
         -->
-        <testcase name="'Security: PKCS12: Modify Entry'">
+        <testcase name="getTestCaseName('Modify Entry')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -124,7 +124,7 @@
             #@TestPostamble             none
             #@TestResult                Success if OpenDS returns 0
         -->
-        <testcase name="'Security: PKCS12: Add Attr to Entry'">
+        <testcase name="getTestCaseName('Add Attr to Entry')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -159,7 +159,7 @@
             #@TestPostamble             none
             #@TestResult                Success if OpenDS returns 0
         -->
-        <testcase name="'Security: PKCS12: Modify Attr in Entry'">
+        <testcase name="getTestCaseName('Modify Attr in Entry')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -194,7 +194,7 @@
             #@TestPostamble             none
             #@TestResult                Success if OpenDS returns 0
         -->
-        <testcase name="'Security: PKCS12: Delete Entry'">
+        <testcase name="getTestCaseName('Delete Entry')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/pkcs12/security_setup_pkcs12.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/pkcs12/security_setup_pkcs12.xml
index 69f519b..6e5feca 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/pkcs12/security_setup_pkcs12.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/pkcs12/security_setup_pkcs12.xml
@@ -62,7 +62,7 @@
         -->
         <!--- Test Case : PKCS12 Setup -->
         <!--- Generate Server Cert -->
-        <testcase name="'Security: PKCS12: Preamble Setup'">
+        <testcase name="getTestCaseName('Preamble Setup')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/pkcs12/security_teardown_pkcs12.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/pkcs12/security_teardown_pkcs12.xml
index f56777f..1f3fe33 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/pkcs12/security_teardown_pkcs12.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/pkcs12/security_teardown_pkcs12.xml
@@ -42,7 +42,7 @@
 
         <!--- Test Case : PKCS12 Teardown -->
         <!--- Delete Branch through SSL port -->
-        <testcase name="'Security: PKCS12: Postamble Reset'">
+        <testcase name="getTestCaseName('Postamble Reset')">
         <!---
             Place test-specific test information here.
             The tag, TestMarker, must be the same as the tag, TestSuiteName.
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_disable_max_pwd_age.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_disable_max_pwd_age.xml
index 04b2271..9b510c5 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_disable_max_pwd_age.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_disable_max_pwd_age.xml
@@ -34,7 +34,7 @@
       <sequence>
 
         <!--- Test Case : Admin Reset Max Pwd Age -->
-        <testcase name="'Security:Pwd Change: Admin Reset Max Pwd Age'">
+        <testcase name="getTestCaseName('Admin Reset Max Pwd Age')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_enable_max_pwd_age.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_enable_max_pwd_age.xml
index e447cda..f14002b 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_enable_max_pwd_age.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_enable_max_pwd_age.xml
@@ -34,7 +34,7 @@
       <sequence>
 
         <!--- Test Case : Check Existence of ds-cfg-maximum-password-age -->
-        <testcase name="'Security:Pwd Change: Check Existence of ds-cfg-maximum-password-age'">
+        <testcase name="getTestCaseName('Check Existence of ds-cfg-maximum-password-age')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -57,7 +57,7 @@
         </testcase>
 
         <!--- Test Case : Admin Change Max Pwd Age -->
-        <testcase name="'Security:Pwd Change: Admin Change Max Pwd Age'">
+        <testcase name="getTestCaseName('Admin Change Max Pwd Age')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_force_pwd_change.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_force_pwd_change.xml
index a86194f..8b5b871 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_force_pwd_change.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_force_pwd_change.xml
@@ -33,7 +33,7 @@
 
       <sequence>
 
-        <testcase name="'Security: Pwd Change: Preamble - Force Pwd Change On Add'">
+        <testcase name="getTestCaseName('Preamble - Force Pwd Change On Add')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -69,7 +69,7 @@
         </testcase>
 
         <!--- Test Case : Add Single New User -->
-        <testcase name="'Security: Pwd Change: Add Single New User'">
+        <testcase name="getTestCaseName('Add Single New User')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -104,7 +104,7 @@
         </testcase>
 
         <!--- Test Case : User Change Password -->
-        <testcase name="'Security: Pwd Change: Added User Change Password'">
+        <testcase name="getTestCaseName('Added User Change Password')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -141,7 +141,7 @@
         </testcase>
 
         <!--- Test Case : Admin Disable Force Password On Add -->
-        <testcase name="'Security: Pwd Change: Postamble - Disable Force Pwd On Add'">
+        <testcase name="getTestCaseName('Postamble - Disable Force Pwd On Add')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -189,7 +189,7 @@
           </sequence>
         </testcase>
 
-        <testcase name="'Security: Pwd Change: Preamble - Force Pwd Change On Reset'">
+        <testcase name="getTestCaseName('Preamble - Force Pwd Change On Reset')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -224,7 +224,7 @@
         </testcase>
 
         <!--- Test Case : Admin Change User Pwd -->
-        <testcase name="'Security: Pwd Change: Admin Reset User Pwd'">
+        <testcase name="getTestCaseName('Admin Reset User Pwd')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -247,7 +247,7 @@
         </testcase>
 
         <!--- Test Case : User Search With Old Pwd -->
-        <testcase name="'Security: Pwd Change: Old Pwd - Search'">
+        <testcase name="getTestCaseName('Old Pwd - Search')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -270,7 +270,7 @@
         </testcase>
 
         <!--- Test Case : User Add With Old Pwd -->
-        <testcase name="'Security: Pwd Change: Old Pwd - Add'">
+        <testcase name="getTestCaseName('Old Pwd - Add')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -308,7 +308,7 @@
         </testcase>
 
      <!--- Test Case : User Delete With Old Pwd -->
-        <testcase name="'Security: Pwd Change: Old Pwd - Delete'">
+        <testcase name="getTestCaseName('Old Pwd - Delete')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -344,7 +344,7 @@
         </testcase>
 
      <!--- Test Case : User Delete With Old Pwd -->
-        <testcase name="'Security: Pwd Change: Old Pwd - Compare'">
+        <testcase name="getTestCaseName('Old Pwd - Compare')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -366,7 +366,7 @@
         </testcase>
 
         <!--- Test Case : User Search With Assigned Pwd -->
-        <testcase name="'Security: Pwd Change: Search With Assigned Pwd'">
+        <testcase name="getTestCaseName('Search With Assigned Pwd')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -389,7 +389,7 @@
         </testcase>
 
         <!--- Test Case : User Change Password -->
-        <testcase name="'Security: Pwd Change: User Change Password After Reset'">
+        <testcase name="getTestCaseName('User Change Password After Reset')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -442,7 +442,7 @@
         </testcase>
 
         <!--- Test Case : Admin Enable Maximum Reset Age -->
-        <testcase name="'Security: Pwd Change: Admin Enable Max Reset Age Long'">
+        <testcase name="getTestCaseName('Admin Enable Max Reset Age Long')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -464,7 +464,7 @@
         </testcase>
 
         <!--- Test Case : Admin Change User Pwd -->
-        <testcase name="'Security: Pwd Change: Admin Reset User Pwd - Long Reset Time'">
+        <testcase name="getTestCaseName('Admin Reset User Pwd - Long Reset Time')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -487,7 +487,7 @@
         </testcase>
 
         <!--- Test Case : User Change Password -->
-        <testcase name="'Security: Pwd Change: User Change Password - Long Reset Time'">
+        <testcase name="getTestCaseName('User Change Password - Long Reset Time')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -524,7 +524,7 @@
         </testcase>
 
         <!--- Test Case : Admin Enable Maxmimum Reset Age -->
-        <testcase name="'Security: Pwd Change: Admin Enable Max Reset Age Short'">
+        <testcase name="getTestCaseName('Admin Enable Max Reset Age Short')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -546,7 +546,7 @@
         </testcase>
 
         <!--- Test Case : Admin Change User Pwd -->
-        <testcase name="'Security: Pwd Change: Admin Reset User Pwd - Short Reset Time'">
+        <testcase name="getTestCaseName('Admin Reset User Pwd - Short Reset Time')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -569,7 +569,7 @@
         </testcase>
 
         <!--- Test Case : User Change Password -->
-        <testcase name="'Security: Pwd Change: User Change Password - Short Reset Time'">
+        <testcase name="getTestCaseName('User Change Password - Short Reset Time')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -616,7 +616,7 @@
         </testcase>
 
         <!--- Test Case : Admin Disable Force Password On Reset -->
-        <testcase name="'Security: Pwd Change: Postamble - Disable Force Pwd On Reset'">
+        <testcase name="getTestCaseName('Postamble - Disable Force Pwd On Reset')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_force_pwd_change_all_users.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_force_pwd_change_all_users.xml
index 3e6e0fd..8e7d747 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_force_pwd_change_all_users.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_force_pwd_change_all_users.xml
@@ -34,7 +34,7 @@
       <sequence>
 
         <!--- Test Case : User Search With Password -->
-        <testcase name="'Security: Pwd Change: Preamble Setup'">
+        <testcase name="getTestCaseName('Preamble Setup')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -85,7 +85,7 @@
         </testcase>
 
         <!--- Test Case : User Search With Expired Password -->
-        <testcase name="'Security: Pwd Change: User Search With Exp Password'">
+        <testcase name="getTestCaseName('User Search With Exp Password')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -108,7 +108,7 @@
         </testcase>
 
         <!--- Test Case : Admin Disable Exp Pwd No Warning -->
-        <testcase name="'Security: Pwd Change: Admin Disable Exp Pwd No Warning'">
+        <testcase name="getTestCaseName('Admin Disable Exp Pwd No Warning')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -130,7 +130,7 @@
         </testcase>
 
         <!--- Test Case : User Search With Expired Password 2-->
-        <testcase name="'Security: Pwd Change: User Search With Exp Password 2'">
+        <testcase name="getTestCaseName('User Search With Exp Password 2')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -160,7 +160,7 @@
         </testcase>
 
         <!--- Test Case : Admin Reset Pwd Time Exp -->
-        <testcase name="'Security: Pwd Change: Postamble Reset'">
+        <testcase name="getTestCaseName('Postamble Reset')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_grace_login.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_grace_login.xml
index 7578b48..c31f437 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_grace_login.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_grace_login.xml
@@ -33,7 +33,7 @@
 
       <sequence>
 
-        <testcase name="'Security: Grace Login: Preamble, Admin Changing Pwd Policy Settings'">
+        <testcase name="getTestCaseName('Preamble, Admin Changing Pwd Policy Settings')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             
@@ -64,7 +64,7 @@
           </sequence>
         </testcase>
 
-        <testcase name="'Security: Grace Login: Search Bad Pwd 4x'">
+        <testcase name="getTestCaseName('Search Bad Pwd 4x')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             
@@ -140,7 +140,7 @@
           </sequence>
         </testcase>
 
-        <testcase name="'Security: Grace Login: Reset Pwd'">
+        <testcase name="getTestCaseName('Reset Pwd')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             
@@ -221,7 +221,7 @@
           </sequence>
         </testcase>
 
-        <testcase name="'Security: Grace Login: Postamble, Admin Resetting Pwd Policy Settings'">
+        <testcase name="getTestCaseName('Postamble, Admin Resetting Pwd Policy Settings')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_last_login.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_last_login.xml
index 8ed0ac7..8b410ff 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_last_login.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_last_login.xml
@@ -34,7 +34,7 @@
       <sequence>
 
         <!--- Test Case : Check for ds-cfg-idle-lockout-interval -->
-        <testcase name="'Security: Last Login: Preamble'">
+        <testcase name="getTestCaseName('Preamble')">
           <sequence>
             <call function="'testCase_Preamble'"/>          
             <message>
@@ -56,7 +56,7 @@
         </testcase>
 
         <!--- Test Case : Admin enable last login attribute only-->
-        <testcase name="'Security: Last Login: Admin Enable Last Login Attr Only'">
+        <testcase name="getTestCaseName('Admin Enable Last Login Attr Only')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -116,7 +116,7 @@
         </testcase>
 
         <!--- Test Case : Admin enable last login format only -->
-        <testcase name="'Security: Last Login: Admin Enable Last Login Format Only'">
+        <testcase name="getTestCaseName('Admin Enable Last Login Format Only')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -190,7 +190,7 @@
         </testcase>
 
         <!--- Test Case : Admin enable both last login attribute and format-->
-        <testcase name="'Security: Last Login: Admin Enable Last Login Attr And Format'">
+        <testcase name="getTestCaseName('Admin Enable Last Login Attr And Format')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -250,7 +250,7 @@
         </testcase>
 
         <!--- Test Case : Long Idle Lockout Interval -->
-        <testcase name="'Security: Last Login: Long Idle Lockout'">
+        <testcase name="getTestCaseName('Long Idle Lockout')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -326,7 +326,7 @@
         </testcase>
 
         <!--- Test Case : Amin Reset Idle Lockout Interval -->
-        <testcase name="'Security: Last Login: Reset Idle Lockout'">
+        <testcase name="getTestCaseName('Reset Idle Lockout')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -386,7 +386,7 @@
         </testcase>
 
         <!--- Test Case : Password Change Override -->
-        <testcase name="'Security: Last Login: Long Idle Lockout - Pwd Change Override'">
+        <testcase name="getTestCaseName('Long Idle Lockout - Pwd Change Override')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -484,7 +484,7 @@
         </testcase>
 
         <!--- Test Case : Amin Reset Idle Lockout Interval -->
-        <testcase name="'Security: Last Login: Reset Idle Lockout 2'">
+        <testcase name="getTestCaseName('Reset Idle Lockout 2')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -543,7 +543,7 @@
         </testcase>
 
         <!--- Test Case : User Bind Reset Last Login Time -->
-        <testcase name="'Security: Last Login: Long Idle Lockout - User Bind Reset'">
+        <testcase name="getTestCaseName('Long Idle Lockout - User Bind Reset')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -641,7 +641,7 @@
         </testcase>
 
         <!--- Test Case : Amin Reset Idle Lockout Interval -->
-        <testcase name="'Security: Last Login: Reset Idle Lockout 3'">
+        <testcase name="getTestCaseName('Reset Idle Lockout 3')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -700,7 +700,7 @@
         </testcase>
 
         <!--- Test Case : Long Idle Lockout Interval -->
-        <testcase name="'Security: Last Login: Long Idle Lockout - Disabled Last Login'">
+        <testcase name="getTestCaseName('Long Idle Lockout - Disabled Last Login')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -766,7 +766,7 @@
         </testcase>
 
         <!--- Test Case : Amin Reset Idle Lockout Interval -->
-        <testcase name="'Security: Last Login: Reset Idle Lockout 4'">
+        <testcase name="getTestCaseName('Reset Idle Lockout 4')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -839,7 +839,7 @@
         </testcase>
 
         <!--- Test Case : Long Idle Lockout Interval -->
-        <testcase name="'Security: Last Login: Long Idle Lockout - Disabled Last Login 2'">
+        <testcase name="getTestCaseName('Long Idle Lockout - Disabled Last Login 2')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -905,7 +905,7 @@
         </testcase>
 
         <!--- Test Case : Amin Reset Idle Lockout Interval -->
-        <testcase name="'Security: Last Login: Reset Idle Lockout 5'">
+        <testcase name="getTestCaseName('Reset Idle Lockout 5')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -979,7 +979,7 @@
         </testcase>
 
         <!--- Test Case : Long Idle Lockout Interval -->
-        <testcase name="'Security: Last Login: Long Idle Lockout - Repeat'">
+        <testcase name="getTestCaseName('Long Idle Lockout - Repeat')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -1055,7 +1055,7 @@
         </testcase>
 
         <!--- Test Case : Amin Reset Idle Lockout Interval -->
-        <testcase name="'Security: Last Login: Reset Idle Lockout 6'">
+        <testcase name="getTestCaseName('Reset Idle Lockout 6')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -1116,7 +1116,7 @@
         </testcase>
 
         <!--- Test Case : Long Idle Lockout Interval -->
-        <testcase name="'Security: Last Login: Long Idle Lockout - Pwd Change Override 2'">
+        <testcase name="getTestCaseName('Long Idle Lockout - Pwd Change Override 2')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -1206,7 +1206,7 @@
         </testcase>
 
         <!--- Test Case : Amin Reset Idle Lockout Interval -->
-        <testcase name="'Security: Last Login: Reset Idle Lockout 7'">
+        <testcase name="getTestCaseName('Reset Idle Lockout 7')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -1267,7 +1267,7 @@
         </testcase>
 
         <!--- Test Case : Long Idle Lockout Interval -->
-        <testcase name="'Security: Last Login: Long Idle Lockout - Pwd Change Override 3'">
+        <testcase name="getTestCaseName('Long Idle Lockout - Pwd Change Override 3')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -1363,7 +1363,7 @@
         </testcase>
 
         <!--- Test Case : Amin Reset Idle Lockout Interval -->
-        <testcase name="'Security: Last Login: Postamble'">
+        <testcase name="getTestCaseName('Postamble')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_lockout_duration.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_lockout_duration.xml
index f7becea..cea39e3 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_lockout_duration.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_lockout_duration.xml
@@ -33,7 +33,7 @@
 
       <sequence>
 
-        <testcase name="'Security: Lockout Duration: Preamble'">
+        <testcase name="getTestCaseName('Preamble')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -119,7 +119,7 @@
         </testcase>
 
         <!--- Test Case : Amin Change Lockout Cnt -->
-        <testcase name="'Security: Lockout Duration: Make Lockout Duration Short'">
+        <testcase name="getTestCaseName('Make Lockout Duration Short')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -142,7 +142,7 @@
         </testcase>
 
         <!--- Test Case : Amin Change Lockout Duration -->
-        <testcase name="'Security: Lockout Duration: Short Lockout Duration'">
+        <testcase name="getTestCaseName('Short Lockout Duration')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -209,7 +209,7 @@
         </testcase>
 
         <!--- Test Case : Amin Change Lockout Cnt -->
-        <testcase name="'Security: Lockout Duration: Make Lockout Duration Long'">
+        <testcase name="getTestCaseName('Make Lockout Duration Long')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -232,7 +232,7 @@
         </testcase>
 
         <!--- Test Case : Amin Change Lockout Duration -->
-        <testcase name="'Security: Lockout Duration: Long Lockout Duration'">
+        <testcase name="getTestCaseName('Long Lockout Duration')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -314,7 +314,7 @@
           </sequence>
         </testcase>
 
-        <testcase name="'Security: Lockout Duration: Postamble'">
+        <testcase name="getTestCaseName('Postamble')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_lockout_fail_cnt.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_lockout_fail_cnt.xml
index e7340ee..8d28213 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_lockout_fail_cnt.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_lockout_fail_cnt.xml
@@ -34,7 +34,7 @@
       <sequence>
 
         <!--- Test Case : Preamble 1 - Check Default-->
-        <testcase name="'Security: Lockout Fail Cnt: Preamble'">
+        <testcase name="getTestCaseName('Preamble')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -86,7 +86,7 @@
         </testcase>
 
         <!--- Test Case : Amin Change Lockout Cnt -->
-        <testcase name="'Security: Lockout Fail Cnt: Admin Change Lockout Cnt'">
+        <testcase name="getTestCaseName('Admin Change Lockout Cnt')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -109,7 +109,7 @@
         </testcase>
 
         <!--- Test Case : Lockout With Bad Pwd 3x -->
-        <testcase name="'Security: Lockout Fail Cnt: Lockout With Bad Pwd 3x'">
+        <testcase name="getTestCaseName('Lockout With Bad Pwd 3x')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -139,7 +139,7 @@
         </testcase>
 
         <!--- Test Case : Postamble Reset -->
-        <testcase name="'Security: Lockout Fail Cnt: Postamble Reset'">
+        <testcase name="getTestCaseName('Postamble Reset')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_min_pwd_age.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_min_pwd_age.xml
index dd1bb10..5dd8265 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_min_pwd_age.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_min_pwd_age.xml
@@ -34,7 +34,7 @@
       <sequence>
 
         <!--- Test Case : Preamble Check -->
-        <testcase name="'Security:Min Pwd Age: Preamble Check'">
+        <testcase name="getTestCaseName('Preamble Check')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -56,7 +56,7 @@
         </testcase>
 
         <!--- Test Case : Test -->
-        <testcase name="'Security:Min Pwd Age: Test'">
+        <testcase name="getTestCaseName('Test')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -111,7 +111,7 @@
         </testcase>
 
         <!--- Test Case : Postamble Reset -->
-        <testcase name="'Security:Min Pwd Age: Postamble Reset'">
+        <testcase name="getTestCaseName('Postamble Reset')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_mult_pwd_policies.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_mult_pwd_policies.xml
index 0fa6269..1c6c9c5 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_mult_pwd_policies.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_mult_pwd_policies.xml
@@ -34,7 +34,7 @@
       <sequence>
 
         <!--- Test Case : Preamble 1 - Add New Passwords Policy-->
-        <testcase name="'Security: Mult Pwd Policies: Preamble'">
+        <testcase name="getTestCaseName('Preamble')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -55,7 +55,7 @@
         </testcase>
 
         <!--- Test Case : Add Entry With New Password Policy -->
-        <testcase name="'Security: Mult Pwd Policies: Add New Entry'">
+        <testcase name="getTestCaseName('Add New Entry')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -96,7 +96,7 @@
         </testcase>
 
         <!--- Test Case : Modify Sales Pwd Policy -->
-        <testcase name="'Security: Mult Pwd Policies: Modify Sales Pwd Policy'">
+        <testcase name="getTestCaseName('Modify Sales Pwd Policy')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -120,7 +120,7 @@
 
             
         <!--- Test Case : Test Sales Password Policy -->
-        <testcase name="'Security: Mult Pwd Policies: Test Sales Pwd Policy'">
+        <testcase name="getTestCaseName('Test Sales Pwd Policy')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -149,7 +149,7 @@
         </testcase>
 
         <!--- Test Case : Test Default Password Policy -->
-        <testcase name="'Security: Mult Pwd Policies: Test Default Pwd Policy'">
+        <testcase name="getTestCaseName('Test Default Pwd Policy')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -189,7 +189,7 @@
         </testcase>
 
         <!--- Test Case : Delete Sales Pwd Policy -->
-        <testcase name="'Security: Mult Pwd Policies: Delete Sales Pwd Policy'">
+        <testcase name="getTestCaseName('Delete Sales Pwd Policy')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -210,7 +210,7 @@
         </testcase>
 
         <!--- Test Case : Test Sales Password Policy 2-->
-        <testcase name="'Security: Mult Pwd Policies: Test Sales Pwd Policy 2'">
+        <testcase name="getTestCaseName('Test Sales Pwd Policy 2')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_preencoded_pwds.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_preencoded_pwds.xml
index f462a87..f7bcb7c 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_preencoded_pwds.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_preencoded_pwds.xml
@@ -34,7 +34,7 @@
       <sequence>
 
         <!--- Test Case : Preamble 1 - Check Default-->
-        <testcase name="'Security: Preencoded Pwds: Preamble'">
+        <testcase name="getTestCaseName('Preamble')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -56,7 +56,7 @@
         </testcase>
 
         <!--- Test Case : Add Entry With Pre-encoded Password -->
-        <testcase name="'Security: Preencoded Pwds: Default - Add New Entry'">
+        <testcase name="getTestCaseName('Default - Add New Entry')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -89,7 +89,7 @@
         </testcase>
 
         <!--- Test Case : Enable Pre-encoded Passwords -->
-        <testcase name="'Security: Preencoded Pwds: Enable Preencoded Pwds'">
+        <testcase name="getTestCaseName('Enable Preencoded Pwds')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -113,7 +113,7 @@
 
             
         <!--- Test Case : Test Enabled Pre-encoded Passwords -->
-        <testcase name="'Security: Preencoded Pwds: Enabled - Add New Entry'">
+        <testcase name="getTestCaseName('Enabled - Add New Entry')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -144,7 +144,7 @@
         </testcase>
 
         <!--- Test Case : Disable Pre-encoded Passwordds -->
-        <testcase name="'Security: Preencoded Pwds: Disable Preencoded Pwds'">
+        <testcase name="getTestCaseName('Disable Preencoded Pwds')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_setup_pwd_policy.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_setup_pwd_policy.xml
index c488927..0feeb39 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_setup_pwd_policy.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_setup_pwd_policy.xml
@@ -34,7 +34,7 @@
       <sequence>
 
         <!--- Test Case : Add Entries for Password Policy Tests -->
-        <testcase name="'Security:Pwd Policy: Add Initial Entries'">
+        <testcase name="getTestCaseName('Add Initial Entries')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_teardown_pwd_policy.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_teardown_pwd_policy.xml
index 4fc7a2a..fca23fa 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_teardown_pwd_policy.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_teardown_pwd_policy.xml
@@ -35,7 +35,7 @@
 
         <!--- Test Case : Password Policy Teardown -->
         <!--- Delete Branch -->
-        <testcase name="'Security: Pwd Policy: Postamble Reset'">
+        <testcase name="getTestCaseName('Postamble Reset')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_user_pwd_policy.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_user_pwd_policy.xml
index b3a9106..5f59a78 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_user_pwd_policy.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_user_pwd_policy.xml
@@ -33,7 +33,7 @@
 
       <sequence>
 
-        <testcase name="'Security: Pwd Policy: Preamble'">
+        <testcase name="getTestCaseName('Preamble')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -55,7 +55,7 @@
         </testcase>
 
         <!--- Test Case : User Search With Password -->
-        <testcase name="'Security: Pwd Policy: User Search'">
+        <testcase name="getTestCaseName('User Search')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -78,7 +78,7 @@
         </testcase>
 
         <!--- Test Case : User Search With Bad Password -->
-        <testcase name="'Security: Pwd Policy: User Search With Bad Password'">
+        <testcase name="getTestCaseName('User Search With Bad Password')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -102,7 +102,7 @@
         </testcase>
 
         <!--- Test Case : User Change Password With Bad Credentials -->
-        <testcase name="'Security: Pwd Policy: User With Bad Credentials Change Password '">
+        <testcase name="getTestCaseName('User With Bad Credentials Change Password ')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -127,7 +127,7 @@
         </testcase>
 
         <!--- Test Case : User Change Password -->
-        <testcase name="'Security: Pwd Policy: User Change Password'">
+        <testcase name="getTestCaseName('User Change Password')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -180,7 +180,7 @@
         </testcase>
 
         <!--- Test Case : Admin Change Password Policy -->
-        <testcase name="'Security: Pwd Policy: Admin Change Password Policy'">
+        <testcase name="getTestCaseName('Admin Change Password Policy')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -219,7 +219,7 @@
         </testcase>
 
         <!--- Test Case : Admin Reset Password Policy -->
-        <testcase name="'Security: Pwd Policy: Postamble'">
+        <testcase name="getTestCaseName('Postamble')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy_root/security_root_user_tests.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy_root/security_root_user_tests.xml
index c951373..a546df9 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy_root/security_root_user_tests.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy_root/security_root_user_tests.xml
@@ -34,7 +34,7 @@
     <sequence>
 
       <!--- Check Existence of ds-cfg-default-password-storage-scheme Attr -->
-      <testcase name="'Security: Pwd Policy Root: Default Pwd Scheme'">
+      <testcase name="getTestCaseName('Default Pwd Scheme')">
         <sequence>
           <call function="'testCase_Preamble'"/>
           <message>
@@ -66,7 +66,7 @@
       </testcase>
 
       <!--- Check Existence of ds-cfg-password-generator-dn Attr -->
-      <testcase name="'Security: Pwd Policy Root: No Default Pwd Generator'">
+      <testcase name="getTestCaseName('No Default Pwd Generator')">
         <sequence>
           <call function="'testCase_Preamble'"/>
           <message>
@@ -89,7 +89,7 @@
       </testcase>
 
      <!--- Check Existence of ds-cfg-password-change-requires-current-password Attr -->
-      <testcase name="'Security: Pwd Policy Root: Default Pwd Change Setting'">
+      <testcase name="getTestCaseName('Default Pwd Change Setting')">
         <sequence>
           <call function="'testCase_Preamble'"/>
           <message>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_deprecated_schemes.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_deprecated_schemes.xml
index 8a28284..5e2bbb7 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_deprecated_schemes.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_deprecated_schemes.xml
@@ -57,7 +57,7 @@
                                         for all operations and a user password
                                         is successfully stored in the MD5 scheme.
         -->
-        <testcase name="'Security: Depr Pwd Schemes: Preamble'">
+        <testcase name="getTestCaseName('Preamble')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -155,7 +155,7 @@
             #@TestResult                Success if OpenDS returns 0
                                         for all operations.
         -->
-        <testcase name="'Security: Depr Pwd Schemes: Admin Deprecate MD5'">
+        <testcase name="getTestCaseName('Admin Deprecate MD5')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -206,7 +206,7 @@
             #@TestResult                Success if OpenDS returns 0
                                         and the user binds successfully.
         -->
-        <testcase name="'Security: Depr Pwd Schemes: User Bind'">
+        <testcase name="getTestCaseName('User Bind')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -242,7 +242,7 @@
             #@TestResult                Success if the prefix string, {MD5}, is not found
                                         in the userpassword.
         -->
-        <testcase name="'Security: Depr Pwd Schemes: Check For Deletion'">
+        <testcase name="getTestCaseName('Check For Deletion')">
           <sequence>
             <call function="'testCase_Preamble'"/>
              <message>
@@ -287,7 +287,7 @@
             #@TestResult                Success if the prefix string, {SSHA256}, is found
                                         in the userpassword.
         -->
-        <testcase name="'Security: Depr Pwd Schemes: Check For Non-Deletions - SSHA256'">
+        <testcase name="getTestCaseName('Check For Non-Deletions - SSHA256')">
           <sequence>
             <call function="'testCase_Preamble'"/>
              <message>
@@ -331,7 +331,7 @@
             #@TestResult                Success if the prefix string, {BASE64}, is found
                                         in the userpassword.
         -->
-        <testcase name="'Security: Depr Pwd Schemes: Check For Non-Deletions - BASE64'">
+        <testcase name="getTestCaseName('Check For Non-Deletions - BASE64')">
           <sequence>
             <call function="'testCase_Preamble'"/>
              <message>
@@ -375,7 +375,7 @@
             #@TestPostamble             none
             #@TestResult                Success if OpenDS returns 0
         -->
-        <testcase name="'Security: Depr Pwd Schemes: Postamble'">
+        <testcase name="getTestCaseName('Postamble')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_multiple_schemes.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_multiple_schemes.xml
index 81e42b4..ef9e306 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_multiple_schemes.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_multiple_schemes.xml
@@ -53,7 +53,7 @@
             #@TestPostamble             none
             #@TestResult                Success if OpenDS returns 0
         -->
-        <testcase name="'Security: Mult Pwd Schemes: Preamble'">
+        <testcase name="getTestCaseName('Preamble')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -91,7 +91,7 @@
             #@TestResult                Success if the string, "SSHA", 
                                         is part of the return string.
         -->
-        <testcase name="'Security: Mult Pwd Schemes: Check Pwd Schemes - SSHA'">
+        <testcase name="getTestCaseName('Check Pwd Schemes - SSHA')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -137,7 +137,7 @@
             #@TestResult                Success if the string, "BASE64", 
                                         is part of the return string.
         -->
-        <testcase name="'Security: Mult Pwd Schemes: Check Pwd Schemes - BASE64'">
+        <testcase name="getTestCaseName('Check Pwd Schemes - BASE64')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -188,7 +188,7 @@
                                         and the user password is stored in both
                                         SSHA and BASE64 schemes.
         -->
-        <testcase name="'Security: Mult Pwd Schemes: Pwd Change'">
+        <testcase name="getTestCaseName('Pwd Change')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -268,7 +268,7 @@
                                         and the user password is stored in both
                                         SSHA and BASE64 schemes.
         -->
-        <testcase name="'Security: Mult Pwd Schemes: Check for Second Scheme On Pwd Change'">
+        <testcase name="getTestCaseName('Check for Second Scheme On Pwd Change')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -312,7 +312,7 @@
             #@TestPostamble             none
             #@TestResult                Success if OpenDS returns 53
         -->
-        <testcase name="'Security: Mult Pwd Schemes: Improper Pwd Add'">
+        <testcase name="getTestCaseName('Improper Pwd Add')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -348,7 +348,7 @@
             #@TestPostamble             none
             #@TestResult                Success if OpenDS returns 0
         -->
-        <testcase name="'Security: Mult Pwd Schemes: Postamble'">
+        <testcase name="getTestCaseName('Postamble')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_BASE64.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_BASE64.xml
index 5c3470e..bb9840d 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_BASE64.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_BASE64.xml
@@ -53,7 +53,7 @@
             #@TestPostamble             none
             #@TestResult                Success if OpenDS returns 0
         -->
-        <testcase name="'Security: Pwd Storage BASE64: Preamble'">
+        <testcase name="getTestCaseName('Preamble')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -93,7 +93,7 @@
             #@TestResult                Success if OpenDS returns 0 for the ldap
                                         operations and the password has the {BASE64} prefix.
         -->
-        <testcase name="'Security: Pwd Storage BASE64: Pwd Change'">
+        <testcase name="getTestCaseName('Pwd Change')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -154,7 +154,7 @@
         </testcase>
 
         <!--- Test case: Admin Reset To SSHA Storage Scheme -->
-        <testcase name="'Security: Pwd Storage BASE64: Postamble'">
+        <testcase name="getTestCaseName('Postamble')">
         <!---
             Place test-specific test information here.
             The tag, TestMarker, must be the same as the tag, TestSuiteName.
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_CLEAR.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_CLEAR.xml
index e4ee0ab..110d57b 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_CLEAR.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_CLEAR.xml
@@ -53,7 +53,7 @@
             #@TestPostamble             none
             #@TestResult                Success if OpenDS returns 0
         -->
-        <testcase name="'Security: Pwd Storage CLEAR: Preamble'">
+        <testcase name="getTestCaseName('Preamble')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -92,7 +92,7 @@
             #@TestResult                Success if OpenDS returns 0 for the ldap
                                         operations and the password has the {CLEAR} prefix.
         -->
-        <testcase name="'Security: Pwd Storage CLEAR: Pwd Change'">
+        <testcase name="getTestCaseName('Pwd Change')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -167,7 +167,7 @@
             #@TestResult                Success if OpenDS returns 0 for the ldap
                                         operations and the password is the expected string.
         -->
-        <testcase name="'Security: Pwd Storage CLEAR: Check Pwd'">
+        <testcase name="getTestCaseName('Check Pwd')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <call function="'SearchObject'">
@@ -208,7 +208,7 @@
             #@TestPostamble             none
             #@TestResult                Success if OpenDS returns 0
          -->
-        <testcase name="'Security: Pwd Storage CLEAR: Postamble'">
+        <testcase name="getTestCaseName('Postamble')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_MD5.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_MD5.xml
index 12b7315..6f7f237 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_MD5.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_MD5.xml
@@ -53,7 +53,7 @@
             #@TestPostamble             none
             #@TestResult                Success if OpenDS returns 0
         -->
-        <testcase name="'Security: Pwd Storage MD5: Preamble'">
+        <testcase name="getTestCaseName('Preamble')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -93,7 +93,7 @@
             #@TestResult                Success if OpenDS returns 0 for the ldap
                                         operations and the password has the {MD5} prefix.
         -->
-        <testcase name="'Security: Pwd Storage MD5: Pwd Change'">
+        <testcase name="getTestCaseName('Pwd Change')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -167,7 +167,7 @@
             #@TestPostamble             none
             #@TestResult                Success if OpenDS returns 0
          -->
-        <testcase name="'Security: Pwd Storage MD5: Postamble'">
+        <testcase name="getTestCaseName('Postamble')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SHA.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SHA.xml
index 99c4872..991617f 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SHA.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SHA.xml
@@ -53,7 +53,7 @@
             #@TestPostamble             none
             #@TestResult                Success if OpenDS returns 0
         -->
-        <testcase name="'Security: Pwd Storage SHA: Preamble'">
+        <testcase name="getTestCaseName('Preamble')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -93,7 +93,7 @@
             #@TestResult                Success if OpenDS returns 0 for the ldap
                                         operations and the password has the {SHA} prefix.
         -->
-        <testcase name="'Security: Pwd Storage SHA: Pwd Change'">
+        <testcase name="getTestCaseName('Pwd Change')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -167,7 +167,7 @@
             #@TestPostamble             none
             #@TestResult                Success if OpenDS returns 0
          -->
-        <testcase name="'Security: Pwd Storage SHA: Postamble'">
+        <testcase name="getTestCaseName('Postamble')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SMD5.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SMD5.xml
index ea48b1d..62c121a 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SMD5.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SMD5.xml
@@ -53,7 +53,7 @@
             #@TestPostamble             none
             #@TestResult                Success if OpenDS returns 0
         -->
-        <testcase name="'Security: Pwd Storage SMD5: Preamble'">
+        <testcase name="getTestCaseName('Preamble')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -93,7 +93,7 @@
             #@TestResult                Success if OpenDS returns 0 for the ldap
                                         operations and the password has the {SMD5} prefix.
         -->
-        <testcase name="'Security: Pwd Storage SMD5: Pwd Change'">
+        <testcase name="getTestCaseName('Pwd Change')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -167,7 +167,7 @@
             #@TestPostamble             none
             #@TestResult                Success if OpenDS returns 0
          -->
-        <testcase name="'Security: Pwd Storage SMD5: Postamble'">
+        <testcase name="getTestCaseName('Postamble')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA.xml
index e60f422..80de388 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA.xml
@@ -54,7 +54,7 @@
             #@TestPostamble             none
             #@TestResult                Success if OpenDS returns 0
         -->
-        <testcase name="'Security: Pwd Storage SSHA: Preamble'">
+        <testcase name="getTestCaseName('Preamble')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -89,7 +89,7 @@
             #@TestResult                Success if OpenDS returns 0 for the ldap
                                         operations and the password has the {SSHA} prefix.
         -->
-        <testcase name="'Security: Pwd Storage SSHA: Default SSHA Scheme'">
+        <testcase name="getTestCaseName('Default SSHA Scheme')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -137,7 +137,7 @@
             #@TestResult                Success if OpenDS returns 0 for the ldap
                                         operations and the password has the {SSHA} prefix.
         -->
-        <testcase name="'Security: Pwd Storage SSHA: Pwd Change'">
+        <testcase name="getTestCaseName('Pwd Change')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -210,7 +210,7 @@
             #@TestPostamble             none
             #@TestResult                Success if OpenDS returns 53.
         -->
-        <testcase name="'Security: Pwd Storage SSHA: Unsupported Scheme'">
+        <testcase name="getTestCaseName('Unsupported Scheme')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA256.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA256.xml
index 357f1eb..ad92999 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA256.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA256.xml
@@ -53,7 +53,7 @@
             #@TestPostamble             none
             #@TestResult                Success if OpenDS returns 0
         -->
-        <testcase name="'Security: Pwd Storage SSHA256: Preamble'">
+        <testcase name="getTestCaseName('Preamble')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -92,7 +92,7 @@
             #@TestResult                Success if OpenDS returns 0 for the ldap
                                         operations and the password has the {SSHA256} prefix.
         -->
-        <testcase name="'Security: Pwd Storage SSHA256: Pwd Change'">
+        <testcase name="getTestCaseName('Pwd Change')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -166,7 +166,7 @@
             #@TestPostamble             none
             #@TestResult                Success if OpenDS returns 0
          -->
-        <testcase name="'Security: Pwd Storage SSHA256: Postamble'">
+        <testcase name="getTestCaseName('Postamble')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA384.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA384.xml
index 93d407c..75b117a 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA384.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA384.xml
@@ -53,7 +53,7 @@
             #@TestPostamble             none
             #@TestResult                Success if OpenDS returns 0
         -->
-        <testcase name="'Security: Pwd Storage SSHA384: Preamble'">
+        <testcase name="getTestCaseName('Preamble')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -92,7 +92,7 @@
             #@TestResult                Success if OpenDS returns 0 for the ldap
                                         operations and the password has the {SSHA384} prefix.
         -->
-        <testcase name="'Security: Pwd Storage SSHA384: Pwd Change'">
+        <testcase name="getTestCaseName('Pwd Change')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -166,7 +166,7 @@
             #@TestPostamble             none
             #@TestResult                Success if OpenDS returns 0
          -->
-        <testcase name="'Security: Pwd Storage SSHA384: Postamble'">
+        <testcase name="getTestCaseName('Postamble')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA512.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA512.xml
index ecbe4b4..e5fe080 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA512.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA512.xml
@@ -53,7 +53,7 @@
             #@TestPostamble             none
             #@TestResult                Success if OpenDS returns 0
         -->
-        <testcase name="'Security: Pwd Storage SSHA512: Preamble'">
+        <testcase name="getTestCaseName('Preamble')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -93,7 +93,7 @@
             #@TestResult                Success if OpenDS returns 0 for the ldap
                                         operations and the password has the {SSHA512} prefix.
         -->
-        <testcase name="'Security: Pwd Storage SSHA512: Pwd Change'">
+        <testcase name="getTestCaseName('Pwd Change')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -167,7 +167,7 @@
             #@TestPostamble             none
             #@TestResult                Success if OpenDS returns 0
          -->
-        <testcase name="'Security: Pwd Storage SSHA512: Postamble'">
+        <testcase name="getTestCaseName('Postamble')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_setup_pwd_storage.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_setup_pwd_storage.xml
index fc0f6ec..be95f5d 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_setup_pwd_storage.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_setup_pwd_storage.xml
@@ -57,7 +57,7 @@
             #@TestPostamble             none
             #@TestResult                Success if OpenDS returns 0 for all operations
         -->
-        <testcase name="'Security: Pwd Storage: Add Initial Entries'">
+        <testcase name="getTestCaseName('Add Initial Entries')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_teardown_pwd_storage.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_teardown_pwd_storage.xml
index e9e7860..21918b4 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_teardown_pwd_storage.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_teardown_pwd_storage.xml
@@ -53,7 +53,7 @@
             #@TestPostamble             none
             #@TestResult                Success if OpenDS returns 0 for all operations
          -->
-        <testcase name="'Security: Pwd Storage: Postamble Reset'">
+        <testcase name="getTestCaseName('Postamble Reset')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_validator/security_attribute_value.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_validator/security_attribute_value.xml
index a8cc2ed..126b8f3 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_validator/security_attribute_value.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_validator/security_attribute_value.xml
@@ -33,7 +33,7 @@
 
       <sequence>
 
-        <testcase name="'Security: Pwd Validator: Attribute Value: Preamble'">
+        <testcase name="getTestCaseName('Attribute Value: Preamble')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             
@@ -69,7 +69,7 @@
           </sequence>
         </testcase>
 
-        <testcase name="'Security: Pwd Validator: Attribute Value: add attribute sn'">
+        <testcase name="getTestCaseName('Attribute Value: add attribute sn')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -92,7 +92,7 @@
           </sequence>
         </testcase>
         
-        <testcase name="'Security: Pwd Validator: Attribute Value: user modifying password to sn'">
+        <testcase name="getTestCaseName('Attribute Value: user modifying password to sn')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             
@@ -132,7 +132,7 @@
           </sequence>
         </testcase>
 
-        <testcase name="'Security: Pwd Validator: Attribute Value: user modifying password to lower case sn'">
+        <testcase name="getTestCaseName('Attribute Value: user modifying password to lower case sn')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             
@@ -172,7 +172,7 @@
           </sequence>
         </testcase>
 
-        <testcase name="'Security: Pwd Validator: Attribute Value: user modifying password to upper case sn'">
+        <testcase name="getTestCaseName('Attribute Value: user modifying password to upper case sn')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             
@@ -212,7 +212,7 @@
           </sequence>
         </testcase>
 
-        <testcase name="'Security: Pwd Validator: Attribute Value: user modifying password to mixed case sn'">
+        <testcase name="getTestCaseName('Attribute Value: user modifying password to mixed case sn')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             
@@ -252,7 +252,7 @@
           </sequence>
         </testcase>
 
-        <testcase name="'Security: Pwd Validator: Attribute Value: user modifying password to reversed upper case sn'">
+        <testcase name="getTestCaseName('Attribute Value: user modifying password to reversed upper case sn')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             
@@ -292,7 +292,7 @@
           </sequence>
         </testcase>
 
-        <testcase name="'Security: Pwd Validator: Attribute Value: add attribute roomnumber'">
+        <testcase name="getTestCaseName('Attribute Value: add attribute roomnumber')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -315,7 +315,7 @@
           </sequence>
         </testcase>
         
-        <testcase name="'Security: Pwd Validator: Attribute Value: user modifying password to roomnumber'">
+        <testcase name="getTestCaseName('Attribute Value: user modifying password to roomnumber')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             
@@ -355,7 +355,7 @@
           </sequence>
         </testcase>
 
-        <testcase name="'Security: Pwd Validator: Attribute Value: user modifying password to sn 2'">
+        <testcase name="getTestCaseName('Attribute Value: user modifying password to sn 2')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             
@@ -395,7 +395,7 @@
           </sequence>
         </testcase>
 
-        <testcase name="'Security: Pwd Validator: Attribute Value: disable reverse match-attribute'">
+        <testcase name="getTestCaseName('Attribute Value: disable reverse match-attribute')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -418,7 +418,7 @@
           </sequence>
         </testcase>
         
-        <testcase name="'Security: Pwd Validator: Attribute Value: user modifying password to reverse sn'">
+        <testcase name="getTestCaseName('Attribute Value: user modifying password to reverse sn')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             
@@ -456,7 +456,7 @@
           </sequence>
         </testcase>
 
-        <testcase name="'Security: Pwd Validator: Attribute Value: user modifying password to sn 3'">
+        <testcase name="getTestCaseName('Attribute Value: user modifying password to sn 3')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             
@@ -497,7 +497,7 @@
         </testcase>
 
         
-        <testcase name="'Security: Pwd Validator: Attribute Value: Postamble'">
+        <testcase name="getTestCaseName('Attribute Value: Postamble')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_validator/security_character_set.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_validator/security_character_set.xml
index 61eadba..5a806c7 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_validator/security_character_set.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_validator/security_character_set.xml
@@ -33,7 +33,7 @@
 
       <sequence>
 
-        <testcase name="'Security: Pwd Validator: Character Set: Preamble'">
+        <testcase name="getTestCaseName('Character Set: Preamble')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             
@@ -69,7 +69,7 @@
           </sequence>
         </testcase>
 
-        <testcase name="'Security: Pwd Validator: Character Set: user modifying password to string with all letters'">
+        <testcase name="getTestCaseName('Character Set: user modifying password to string with all letters')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             
@@ -109,7 +109,7 @@
           </sequence>
         </testcase>
         
-        <testcase name="'Security: Pwd Validator: Character Set: user modifying password to string with all numbers'">
+        <testcase name="getTestCaseName('Character Set: user modifying password to string with all numbers')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             
@@ -149,7 +149,7 @@
           </sequence>
         </testcase>
         
-        <testcase name="'Security: Pwd Validator: Character Set: change letter characters'">
+        <testcase name="getTestCaseName('Character Set: change letter characters')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -194,7 +194,7 @@
           </sequence>
         </testcase>
         
-        <testcase name="'Security: Pwd Validator: Character Set: user modifying password to string with all letters 2'">
+        <testcase name="getTestCaseName('Character Set: user modifying password to string with all letters 2')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             
@@ -234,7 +234,7 @@
           </sequence>
         </testcase>
         
-        <testcase name="'Security: Pwd Validator: Character Set: user modifying password to string with all numbers 2'">
+        <testcase name="getTestCaseName('Character Set: user modifying password to string with all numbers 2')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             
@@ -274,7 +274,7 @@
           </sequence>
         </testcase>
         
-        <testcase name="'Security: Pwd Validator: Character Set: user modifying password to valid string'">
+        <testcase name="getTestCaseName('Character Set: user modifying password to valid string')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             
@@ -312,7 +312,7 @@
           </sequence>
         </testcase>
         
-        <testcase name="'Security: Pwd Validator: Character Set: disable validator'">
+        <testcase name="getTestCaseName('Character Set: disable validator')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -336,7 +336,7 @@
         </testcase>
         
         
-        <testcase name="'Security: Pwd Validator: Character Set: user modifying password to valid string 2'">
+        <testcase name="getTestCaseName('Character Set: user modifying password to valid string 2')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             
@@ -374,7 +374,7 @@
           </sequence>
         </testcase>
         
-        <testcase name="'Security: Pwd Validator: Character Set: Postamble'">
+        <testcase name="getTestCaseName('Character Set: Postamble')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_validator/security_dictionary.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_validator/security_dictionary.xml
index 04e0cd1..00502e6 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_validator/security_dictionary.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_validator/security_dictionary.xml
@@ -33,7 +33,7 @@
 
       <sequence>
 
-        <testcase name="'Security: Pwd Validator: Dictionary: Preamble'">
+        <testcase name="getTestCaseName('Dictionary: Preamble')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             
@@ -71,7 +71,7 @@
           </sequence>
         </testcase>
 
-        <testcase name="'Security: Pwd Validator: Dictionary: user modifying password to string with all letters'">
+        <testcase name="getTestCaseName('Dictionary: user modifying password to string with all letters')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             
@@ -111,7 +111,7 @@
           </sequence>
         </testcase>
         
-        <testcase name="'Security: Pwd Validator: Dictionary: Using Using Reverse Password'">
+        <testcase name="getTestCaseName('Dictionary: Using Using Reverse Password')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             
@@ -151,7 +151,7 @@
           </sequence>
         </testcase>
         
-        <testcase name="'Security: Pwd Validator: Dictionary: Disable Reverse Password'">
+        <testcase name="getTestCaseName('Dictionary: Disable Reverse Password')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             
@@ -175,7 +175,7 @@
           </sequence>
         </testcase>
 
-        <testcase name="'Security: Pwd Validator: Dictionary: Using Using Reverse Password 2'">
+        <testcase name="getTestCaseName('Dictionary: Using Using Reverse Password 2')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             
@@ -213,7 +213,7 @@
           </sequence>
         </testcase>
         
-        <testcase name="'Security: Pwd Validator: Dictionary: Postamble'">
+        <testcase name="getTestCaseName('Dictionary: Postamble')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_validator/security_history_based.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_validator/security_history_based.xml
index c672da0..aaa49d6 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_validator/security_history_based.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_validator/security_history_based.xml
@@ -33,7 +33,7 @@
 
       <sequence>
 
-        <testcase name="'Security: Pwd Validator: History Based: Preamble'">
+        <testcase name="getTestCaseName('History Based: Preamble')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             
@@ -56,7 +56,7 @@
           </sequence>
         </testcase>
 
-        <testcase name="'Security: Pwd Validator: History Based: user modifying password 1'">
+        <testcase name="getTestCaseName('History Based: user modifying password 1')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             
@@ -110,7 +110,7 @@
           </sequence>
         </testcase>
         
-        <testcase name="'Security: Pwd Validator: History Based: user modifying password 2'">
+        <testcase name="getTestCaseName('History Based: user modifying password 2')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             
@@ -170,7 +170,7 @@
           </sequence>
         </testcase>
         
-        <testcase name="'Security: Pwd Validator: History Based: user modifying password 3'">
+        <testcase name="getTestCaseName('History Based: user modifying password 3')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             
@@ -230,7 +230,7 @@
           </sequence>
         </testcase>
         
-        <testcase name="'Security: Pwd Validator: History Based: user modifying password 4'">
+        <testcase name="getTestCaseName('History Based: user modifying password 4')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             
@@ -305,7 +305,7 @@
           </sequence>
         </testcase>
         
-        <testcase name="'Security: Pwd Validator: History Based: Modify password history duration'">
+        <testcase name="getTestCaseName('History Based: Modify password history duration')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             
@@ -328,7 +328,7 @@
           </sequence>
         </testcase>
 
-        <testcase name="'Security: Pwd Validator: History Based: user modifying password after duration'">
+        <testcase name="getTestCaseName('History Based: user modifying password after duration')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             
@@ -374,7 +374,7 @@
           </sequence>
         </testcase>
         
-        <testcase name="'Security: Pwd Validator: History Based: Postamble'">
+        <testcase name="getTestCaseName('History Based: Postamble')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_validator/security_pwd_length.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_validator/security_pwd_length.xml
index b11f6ba..71aade3 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_validator/security_pwd_length.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_validator/security_pwd_length.xml
@@ -34,7 +34,7 @@
       <sequence>
 
         <!--- Admin Check Existence of Min Pwd Length Attr -->
-        <testcase name="'Security: Pwd Validator: Pwd Length Min: Preamble Setup'">
+        <testcase name="getTestCaseName('Pwd Length Min: Preamble Setup')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             
@@ -72,7 +72,7 @@
         </testcase>
 
         <!--- Test Case : User Change Password - Too Short-->
-        <testcase name="'Security: Pwd Validator: Pwd Length Min: Pwd Too Short 1'">
+        <testcase name="getTestCaseName('Pwd Length Min: Pwd Too Short 1')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -113,7 +113,7 @@
         </testcase>
 
         <!--- Test Case : Admin Change Minimum Pwd Length -->
-        <testcase name="'Security: Pwd Validator: Pwd Length Min: Admin Change Min Pwd Length'">
+        <testcase name="getTestCaseName('Pwd Length Min: Admin Change Min Pwd Length')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -138,7 +138,7 @@
         </testcase>
 
         <!--- Test Case : User Change Password - Too Short 2-->
-        <testcase name="'Security: Pwd Validator: Pwd Length Min: Pwd Too Short 2'">
+        <testcase name="getTestCaseName('Pwd Length Min: Pwd Too Short 2')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -179,7 +179,7 @@
         </testcase>
 
         <!--- Test Case : User Change Password-->
-        <testcase name="'Security: Pwd Validator: Pwd Length Min: User Change Pwd'">
+        <testcase name="getTestCaseName('Pwd Length Min: User Change Pwd')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -218,7 +218,7 @@
         </testcase>
 
         <!--- Test Case : Admin Reset Minimum Pwd Length -->
-        <testcase name="'Security: Pwd Validator: Pwd Length Min: Postamble Reset'">
+        <testcase name="getTestCaseName('Pwd Length Min: Postamble Reset')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -242,7 +242,7 @@
           </sequence>
         </testcase>
 
-        <testcase name="'Security: Pwd Validator: Pwd Length Max: Preamble Setup'">
+        <testcase name="getTestCaseName('Pwd Length Max: Preamble Setup')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -281,7 +281,7 @@
         </testcase>
 
         <!--- Test Case : User Change Password - Too Long-->
-        <testcase name="'Security: Pwd Validator: Pwd Length Max: Pwd Too Long 1'">
+        <testcase name="getTestCaseName('Pwd Length Max: Pwd Too Long 1')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -322,7 +322,7 @@
         </testcase>
 
         <!--- Test Case : User Change Password-->
-        <testcase name="'Security: Pwd Validator: Pwd Length Max: User Change Pwd'">
+        <testcase name="getTestCaseName('Pwd Length Max: User Change Pwd')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -361,7 +361,7 @@
         </testcase>
 
         <!--- Test Case : Admin Reset Maximum Pwd Length -->
-        <testcase name="'Security: Pwd Validator: Pwd Length Max: Postamble Reset'">
+        <testcase name="getTestCaseName('Pwd Length Max: Postamble Reset')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_validator/security_repeat_chars.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_validator/security_repeat_chars.xml
index 6ce5d3e..454bfc4 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_validator/security_repeat_chars.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_validator/security_repeat_chars.xml
@@ -33,7 +33,7 @@
 
       <sequence>
 
-        <testcase name="'Security: Pwd Validator: Repeat Chars: Preamble'">
+        <testcase name="getTestCaseName('Repeat Chars: Preamble')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             
@@ -56,7 +56,7 @@
           </sequence>
         </testcase>
 
-        <testcase name="'Security: Pwd Validator: Repeat Chars: password with 3 repeat chars'">
+        <testcase name="getTestCaseName('Repeat Chars: password with 3 repeat chars')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             
@@ -96,7 +96,7 @@
           </sequence>
         </testcase>
         
-        <testcase name="'Security: Pwd Validator: Repeat Chars: password with 2 repeat chars'">
+        <testcase name="getTestCaseName('Repeat Chars: password with 2 repeat chars')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             
@@ -134,7 +134,7 @@
           </sequence>
         </testcase>
         
-        <testcase name="'Security: Pwd Validator: Repeat Chars: change maximum length'">
+        <testcase name="getTestCaseName('Repeat Chars: change maximum length')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -157,7 +157,7 @@
           </sequence>
         </testcase>
 
-        <testcase name="'Security: Pwd Validator: Repeat Chars: password with 3 repeat chars 2'">
+        <testcase name="getTestCaseName('Repeat Chars: password with 3 repeat chars 2')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             
@@ -195,7 +195,7 @@
           </sequence>
         </testcase>
         
-        <testcase name="'Security: Pwd Validator: Repeat Chars: reset maximum length'">
+        <testcase name="getTestCaseName('Repeat Chars: reset maximum length')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -217,7 +217,7 @@
           </sequence>
         </testcase>
        
-        <testcase name="'Security: Pwd Validator: Repeat Chars: enable case sensitive chars'">
+        <testcase name="getTestCaseName('Repeat Chars: enable case sensitive chars')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -240,7 +240,7 @@
           </sequence>
         </testcase>
        
-        <testcase name="'Security: Pwd Validator: Repeat Chars: password with 3 repeat chars 3'">
+        <testcase name="getTestCaseName('Repeat Chars: password with 3 repeat chars 3')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             
@@ -280,7 +280,7 @@
           </sequence>
         </testcase>
         
-        <testcase name="'Security: Pwd Validator: Repeat Chars: password with 3 case sensitive repeat chars'">
+        <testcase name="getTestCaseName('Repeat Chars: password with 3 case sensitive repeat chars')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             
@@ -318,7 +318,7 @@
           </sequence>
         </testcase>
         
-        <testcase name="'Security: Pwd Validator: Repeat Chars: Postamble'">
+        <testcase name="getTestCaseName('Repeat Chars: Postamble')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_validator/security_setup_pwd_validator.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_validator/security_setup_pwd_validator.xml
index c18c0d8..d48ae93 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_validator/security_setup_pwd_validator.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_validator/security_setup_pwd_validator.xml
@@ -34,7 +34,7 @@
       <sequence>
 
         <!--- Test Case : Add Entries for Password Validator Tests -->
-        <testcase name="'Security:Pwd Validator: Add Initial Entries'">
+        <testcase name="getTestCaseName('Add Initial Entries')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_validator/security_skip_val_for_admins.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_validator/security_skip_val_for_admins.xml
index 2384f27..99fe26a 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_validator/security_skip_val_for_admins.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_validator/security_skip_val_for_admins.xml
@@ -34,7 +34,7 @@
       <sequence>
 
         <!--- Test Case : Setup -->
-        <testcase name="'Security: Pwd Validator: Root User Bypass Valid: Preamble Setup'">
+        <testcase name="getTestCaseName('Root User Bypass Valid: Preamble Setup')">
           <sequence>
           
             <call function="'testCase_Preamble'"/>
@@ -60,7 +60,7 @@
         </testcase>
 
         <!--- Root Change Password - Too Short-->
-        <testcase name="'Security: Pwd Validator: Root User Bypass Valid: No Bypass'">
+        <testcase name="getTestCaseName('Root User Bypass Valid: No Bypass')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -101,7 +101,7 @@
         </testcase>
 
        <!--- Enable Bypass Validator-->
-        <testcase name="'Security: Pwd Validator: Root User Bypass Valid: Bypass Enabled 1'">
+        <testcase name="getTestCaseName('Root User Bypass Valid: Bypass Enabled 1')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -154,7 +154,7 @@
         </testcase>
 
         <!--- Admin Change Minimum Pwd Length -->
-        <testcase name="'Security: Pwd Validator: Root User Bypass Valid: Bypass Enabled 2'">
+        <testcase name="getTestCaseName('Root User Bypass Valid: Bypass Enabled 2')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -210,7 +210,7 @@
         </testcase>
 
         <!--- Check Self-Change Pwd -->
-        <testcase name="'Security: Pwd Validator: Root User Bypass Valid: Self-Change Pwd'">
+        <testcase name="getTestCaseName('Root User Bypass Valid: Self-Change Pwd')">
           <sequence>
           
             <call function="'testCase_Preamble'"/>
@@ -254,7 +254,7 @@
         </testcase>
 
         <!--- Test Case : Admin Reset Minimum Pwd Length -->
-        <testcase name="'Security: Pwd Validator: Root User Bypass Valid: Postamble Teardown'">
+        <testcase name="getTestCaseName('Root User Bypass Valid: Postamble Teardown')">
           <sequence>
           
             <call function="'testCase_Preamble'"/>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_validator/security_teardown_pwd_validator.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_validator/security_teardown_pwd_validator.xml
index 8c14e5e..b13328c 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_validator/security_teardown_pwd_validator.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_validator/security_teardown_pwd_validator.xml
@@ -35,7 +35,7 @@
 
         <!--- Test Case : Password Policy Teardown -->
         <!--- Delete Branch -->
-        <testcase name="'Security: Pwd Validator: Postamble Reset'">
+        <testcase name="getTestCaseName('Postamble Reset')">
           <sequence>
           
             <call function="'testCase_Preamble'"/>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_validator/security_unique_chars.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_validator/security_unique_chars.xml
index 0e53ef1..9311869 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_validator/security_unique_chars.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_validator/security_unique_chars.xml
@@ -33,7 +33,7 @@
 
       <sequence>
 
-        <testcase name="'Security: Pwd Validator: Unique Chars: Preamble'">
+        <testcase name="getTestCaseName('Unique Chars: Preamble')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             
@@ -56,7 +56,7 @@
           </sequence>
         </testcase>
 
-        <testcase name="'Security: Pwd Validator: Unique Chars: password with 3 unique chars'">
+        <testcase name="getTestCaseName('Unique Chars: password with 3 unique chars')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             
@@ -96,7 +96,7 @@
           </sequence>
         </testcase>
         
-        <testcase name="'Security: Pwd Validator: Unique Chars: password with 4 unique chars'">
+        <testcase name="getTestCaseName('Unique Chars: password with 4 unique chars')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             
@@ -136,7 +136,7 @@
           </sequence>
         </testcase>
         
-        <testcase name="'Security: Pwd Validator: Unique Chars: password with 5 unique chars'">
+        <testcase name="getTestCaseName('Unique Chars: password with 5 unique chars')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             
@@ -174,7 +174,7 @@
           </sequence>
         </testcase>
         
-        <testcase name="'Security: Pwd Validator: Unique Chars: cahnge unique chars'">
+        <testcase name="getTestCaseName('Unique Chars: cahnge unique chars')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -197,7 +197,7 @@
           </sequence>
         </testcase>
        
-        <testcase name="'Security: Pwd Validator: Unique Chars: password with 3 unique chars 2'">
+        <testcase name="getTestCaseName('Unique Chars: password with 3 unique chars 2')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             
@@ -235,7 +235,7 @@
           </sequence>
         </testcase>
         
-        <testcase name="'Security: Pwd Validator: Unique Chars: reset unique chars'">
+        <testcase name="getTestCaseName('Unique Chars: reset unique chars')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -258,7 +258,7 @@
           </sequence>
         </testcase>
        
-        <testcase name="'Security: Pwd Validator: Unique Chars: enable case sensitive chars'">
+        <testcase name="getTestCaseName('Unique Chars: enable case sensitive chars')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -281,7 +281,7 @@
           </sequence>
         </testcase>
        
-        <testcase name="'Security: Pwd Validator: Unique Chars: password with 3 unique chars 3'">
+        <testcase name="getTestCaseName('Unique Chars: password with 3 unique chars 3')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             
@@ -321,7 +321,7 @@
           </sequence>
         </testcase>
         
-        <testcase name="'Security: Pwd Validator: Unique Chars: password with 3 unique case sensitive chars'">
+        <testcase name="getTestCaseName('Unique Chars: password with 3 unique case sensitive chars')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             
@@ -359,7 +359,7 @@
           </sequence>
         </testcase>
         
-        <testcase name="'Security: Pwd Validator: Unique Chars: Postamble'">
+        <testcase name="getTestCaseName('Unique Chars: Postamble')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/sasl/security_sasl_anon.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/sasl/security_sasl_anon.xml
index 58c0645..3a56fb3 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/sasl/security_sasl_anon.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/sasl/security_sasl_anon.xml
@@ -52,7 +52,7 @@
             #@TestPostamble             none
             #@TestResult                Success if OpenDS returns 0.
           -->
-        <testcase name="'Security: SASL ANON: Preamble'">
+        <testcase name="getTestCaseName('Preamble')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -96,7 +96,7 @@
             #@TestPostamble             none
             #@TestResult                Success if OpenDS returns 0.
           -->
-        <testcase name="'Security: SASL ANON: Anonymous Bind With ANON SASL Mech'">
+        <testcase name="getTestCaseName('Anonymous Bind With ANON SASL Mech')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -131,7 +131,7 @@
             #@TestResult                Success if OpenDS returns 0
                                         for step 1 and returns 7 for step 2.
           -->
-        <testcase name="'Security: SASL ANON: Postamble'">
+        <testcase name="getTestCaseName('Postamble')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/sasl/security_sasl_cram-md5.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/sasl/security_sasl_cram-md5.xml
index 43803ab..f20f135 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/sasl/security_sasl_cram-md5.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/sasl/security_sasl_cram-md5.xml
@@ -54,7 +54,7 @@
             #@TestResult                Success if OpenDS returns 0 
                                         for all ldap operations.
           -->
-          <testcase name="'Security: SASL CRAM-MD5: Preamble'">
+          <testcase name="getTestCaseName('Preamble')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -126,7 +126,7 @@
             #@TestPostamble             none
             #@TestResult                Success if OpenDS returns 0.
           -->
-          <testcase name="'Security: SASL CRAM-MD5: User (u:) Binding With CRAM-MD5 SASL Mech'">
+          <testcase name="getTestCaseName('User (u:) Binding With CRAM-MD5 SASL Mech')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -159,7 +159,7 @@
             #@TestPostamble             none
             #@TestResult                Success if OpenDS returns 0.
           -->
-        <testcase name="'Security: SASL CRAM-MD5: User (dn:) Binding With CRAM-MD5 SASL Mech'">
+        <testcase name="getTestCaseName('User (dn:) Binding With CRAM-MD5 SASL Mech')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -192,7 +192,7 @@
             #@TestPostamble             none
             #@TestResult                Success if OpenDS returns 49.
         -->
-          <testcase name="'Security: SASL CRAM-MD5: User With Duplicate uid (u:) Binding'">
+          <testcase name="getTestCaseName('User With Duplicate uid (u:) Binding')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -226,7 +226,7 @@
             #@TestPostamble             none
             #@TestResult                Success if OpenDS returns 0.
         -->
-        <testcase name="'Security: SASL CRAM-MD5: User With Duplicate uid (dn:) Binding'">
+        <testcase name="getTestCaseName('User With Duplicate uid (dn:) Binding')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -261,7 +261,7 @@
             #@TestResult                Success if OpenDS returns 0
                                         for all ldap operations.
         -->
-        <testcase name="'Security: SASL CRAM-MD5: User With Duplicate uid (u:) Binding 2'">
+        <testcase name="getTestCaseName('User With Duplicate uid (u:) Binding 2')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -311,7 +311,7 @@
                                         In step 3, the ldap operation should return 49
                                         because the password is no longer stored as CLEAR.
           -->
-        <testcase name="'Security: SASL CRAM-MD5: Postamble'">
+        <testcase name="getTestCaseName('Postamble')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/sasl/security_sasl_digest-md5.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/sasl/security_sasl_digest-md5.xml
index 7f904b5..f788409 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/sasl/security_sasl_digest-md5.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/sasl/security_sasl_digest-md5.xml
@@ -54,7 +54,7 @@
             #@TestResult                Success if OpenDS returns 0 
                                         for all ldap operations.
         -->
-        <testcase name="'Security: SASL DIGEST-MD5: Preamble'">
+        <testcase name="getTestCaseName('Preamble')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -126,7 +126,7 @@
             #@TestPostamble             none
             #@TestResult                Success if OpenDS returns 49.
         -->
-        <testcase name="'Security: SASL DIGEST-MD5: Dupe uid (u:) Bind'">
+        <testcase name="getTestCaseName('Dupe uid (u:) Bind')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -160,7 +160,7 @@
             #@TestPostamble             none
             #@TestResult                Success if OpenDS returns 0.
         -->
-        <testcase name="'Security: SASL DIGEST-MD5: User (u:) Bind'">
+        <testcase name="getTestCaseName('User (u:) Bind')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -193,7 +193,7 @@
             #@TestPostamble             none
             #@TestResult                Success if OpenDS returns 0.
         -->
-        <testcase name="'Security: SASL DIGEST-MD5: User (u:) Bind authzid'">
+        <testcase name="getTestCaseName('User (u:) Bind authzid')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -226,7 +226,7 @@
             #@TestPostamble             none
             #@TestResult                Success if OpenDS returns 49.
         -->
-        <testcase name="'Security: SASL DIGEST-MD5: User (u:) Bind another authzid'">
+        <testcase name="getTestCaseName('User (u:) Bind another authzid')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -260,7 +260,7 @@
             #@TestPostamble             none
             #@TestResult                Success if OpenDS returns 89.
         -->
-        <testcase name="'Security: SASL DIGEST-MD5: User (u:) Bind with authzid without authid'">
+        <testcase name="getTestCaseName('User (u:) Bind with authzid without authid')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -294,7 +294,7 @@
             #@TestPostamble             none
             #@TestResult                Success if OpenDS returns 0.
         -->
-        <testcase name="'Security: SASL DIGEST-MD5: Admin Change authzid Attr'">
+        <testcase name="getTestCaseName('Admin Change authzid Attr')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -329,7 +329,7 @@
             #@TestPostamble             none
             #@TestResult                Success if OpenDS returns 49.
         -->
-        <testcase name="'Security: SASL DIGEST-MD5: User (u:) Bind authzid After Attr Change'">
+        <testcase name="getTestCaseName('User (u:) Bind authzid After Attr Change')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -363,7 +363,7 @@
             #@TestPostamble             none
             #@TestResult                Success if OpenDS returns 0.
         -->
-        <testcase name="'Security: SASL DIGEST-MD5: User (u:) Bind authzid After Attr Change 2'">
+        <testcase name="getTestCaseName('User (u:) Bind authzid After Attr Change 2')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -396,7 +396,7 @@
             #@TestPostamble             none
             #@TestResult                Success if OpenDS returns 0.
         -->
-        <testcase name="'Security: SASL DIGEST-MD5: Admin Reset authzid Attr'">
+        <testcase name="getTestCaseName('Admin Reset authzid Attr')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -431,7 +431,7 @@
             #@TestPostamble             none
             #@TestResult                Success if OpenDS returns 0.
         -->
-        <testcase name="'Security: SASL DIGEST-MD5: User (u:) Bind authzid After Attr Reset'">
+        <testcase name="getTestCaseName('User (u:) Bind authzid After Attr Reset')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -464,7 +464,7 @@
             #@TestPostamble             none
             #@TestResult                Success if OpenDS returns 0.
         -->
-        <testcase name="'Security: SASL DIGEST-MD5: Dupe uid (dn:) Bind'">
+        <testcase name="getTestCaseName('Dupe uid (dn:) Bind')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -497,7 +497,7 @@
             #@TestPostamble             none
             #@TestResult                Success if OpenDS returns 49.
         -->
-        <testcase name="'Security: SASL DIGEST-MD5: Dupe uid (dn:) Bind authzid'">
+        <testcase name="getTestCaseName('Dupe uid (dn:) Bind authzid')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -531,7 +531,7 @@
             #@TestPostamble             none
             #@TestResult                Success if OpenDS returns 0.
         -->
-        <testcase name="'Security: SASL DIGEST-MD5: User (dn:) Bind'">
+        <testcase name="getTestCaseName('User (dn:) Bind')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -564,7 +564,7 @@
             #@TestPostamble             none
             #@TestResult                Success if OpenDS returns 0.
         -->
-        <testcase name="'Security: SASL DIGEST-MD5: Create Realm'">
+        <testcase name="getTestCaseName('Create Realm')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -600,7 +600,7 @@
             #@TestPostamble             none
             #@TestResult                Success if OpenDS returns 49.
         -->
-        <testcase name="'Security: SASL DIGEST-MD5: Dupe uid (u:) Bind With Realm'">
+        <testcase name="getTestCaseName('Dupe uid (u:) Bind With Realm')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -635,7 +635,7 @@
             #@TestPostamble             none
             #@TestResult                Success if OpenDS returns 0.
         -->
-        <testcase name="'Security: SASL DIGEST-MD5: User (u:) Bind With Realm'">
+        <testcase name="getTestCaseName('User (u:) Bind With Realm')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -669,7 +669,7 @@
             #@TestPostamble             none
             #@TestResult                Success if OpenDS returns 0.
         -->
-        <testcase name="'Security: SASL DIGEST-MD5: Dupe uid (dn:) Bind With Realm'">
+        <testcase name="getTestCaseName('Dupe uid (dn:) Bind With Realm')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -703,7 +703,7 @@
             #@TestPostamble             none
             #@TestResult                Success if OpenDS returns 0.
         -->
-        <testcase name="'Security: SASL DIGEST-MD5: User (dn:) Bind With Realm'">
+        <testcase name="getTestCaseName('User (dn:) Bind With Realm')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -738,7 +738,7 @@
             #@TestResult                Success if OpenDS returns 0.
         -->
       <!--
-        <testcase name="'Security: SASL DIGEST-MD5: User (dn:) Bind With Realm and digest-uri'">
+        <testcase name="getTestCaseName('User (dn:) Bind With Realm and digest-uri')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -773,7 +773,7 @@
             #@TestPostamble             none
             #@TestResult                Success if OpenDS returns 49.
         -->
-        <testcase name="'Security: SASL DIGEST-MD5: Dupe uid (u:) Bind With Undefined Realm'">
+        <testcase name="getTestCaseName('Dupe uid (u:) Bind With Undefined Realm')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -808,7 +808,7 @@
             #@TestPostamble             none
             #@TestResult                Success if OpenDS returns 49.
         -->
-        <testcase name="'Security: SASL DIGEST-MD5: User (u:) Bind With Undefined Realm'">
+        <testcase name="getTestCaseName('User (u:) Bind With Undefined Realm')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -843,7 +843,7 @@
             #@TestPostamble             none
             #@TestResult                Success if OpenDS returns 49.
         -->
-        <testcase name="'Security: SASL DIGEST-MD5: Dupe uid (dn:) Bind With Undefined Realm'">
+        <testcase name="getTestCaseName('Dupe uid (dn:) Bind With Undefined Realm')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -878,7 +878,7 @@
             #@TestPostamble             none
             #@TestResult                Success if OpenDS returns 49.
         -->
-        <testcase name="'Security: SASL DIGEST-MD5: User (dn:) Bind With Undefined Realm'">
+        <testcase name="getTestCaseName('User (dn:) Bind With Undefined Realm')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -921,7 +921,7 @@
             #@TestResult                Success if OpenDS returns 0 for all ldap operations.
                                         Entries returned for steps 1, 2, and 7.
         -->
-        <testcase name="'Security: SASL DIGEST-MD5: User (dn:) Bind with ACI with authmethod equal sasl'">
+        <testcase name="getTestCaseName('User (dn:) Bind with ACI with authmethod equal sasl')">
           <sequence>
             <call function="'testCase_Preamble'"/>
 
@@ -1169,7 +1169,7 @@
             #@TestResult                Success if OpenDS returns 0 for all ldap operations.
                                         Entries returned for steps 1, 2, and 8.
         -->
-        <testcase name="'Security: SASL DIGEST-MD5: User (dn:) Bind with ACI with authmethod equal simple'">
+        <testcase name="getTestCaseName('User (dn:) Bind with ACI with authmethod equal simple')">
           <sequence>
             <call function="'testCase_Preamble'"/>
 
@@ -1417,7 +1417,7 @@
             #@TestResult                Success if OpenDS returns 0 for all ldap operations.
                                         Entries returned for steps 1, 2, and 7.
         -->
-        <testcase name="'Security: SASL DIGEST-MD5: User (dn:) Bind with ACI with authmethod  not equals simple'">
+        <testcase name="getTestCaseName('User (dn:) Bind with ACI with authmethod  not equals simple')">
           <sequence>
             <call function="'testCase_Preamble'"/>
 
@@ -1665,7 +1665,7 @@
             #@TestResult                Success if OpenDS returns 0 for all ldap operations.
                                         Entries returned for steps 1, 2, and 7.
         -->
-        <testcase name="'Security: SASL DIGEST-MD5: User (dn:) Bind with ACI with authmethod equals none'">
+        <testcase name="getTestCaseName('User (dn:) Bind with ACI with authmethod equals none')">
           <sequence>
             <call function="'testCase_Preamble'"/>
 
@@ -1914,7 +1914,7 @@
                                         In step 5, the ldap operation should return 49
                                         because the password is no longer stored as CLEAR.
         -->
-        <testcase name="'Security: SASL DIGEST-MD5: Postamble'">
+        <testcase name="getTestCaseName('Postamble')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/sasl/security_sasl_plain.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/sasl/security_sasl_plain.xml
index 2a60a21..72abefe 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/sasl/security_sasl_plain.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/sasl/security_sasl_plain.xml
@@ -53,7 +53,7 @@
             #@TestResult                Success if OpenDS returns 0 
                                         for all ldap operations.
         -->
-        <testcase name="'Security: SASL PLAIN: Preamble'">
+        <testcase name="getTestCaseName('Preamble')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -100,7 +100,7 @@
             #@TestPostamble             none
             #@TestResult                Success if OpenDS returns 0.
         -->
-        <testcase name="'Security: SASL PLAIN: User (u:) Binding'">
+        <testcase name="getTestCaseName('User (u:) Binding')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -134,7 +134,7 @@
             #@TestPostamble             none
             #@TestResult                Success if OpenDS returns 0.
         -->
-        <testcase name="'Security: SASL PLAIN: User Binding'">
+        <testcase name="getTestCaseName('User Binding')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -167,7 +167,7 @@
             #@TestPostamble             none
             #@TestResult                Success if OpenDS returns 0.
         -->
-        <testcase name="'Security: SASL PLAIN: User (dn:) Binding'">
+        <testcase name="getTestCaseName('User (dn:) Binding')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -200,7 +200,7 @@
             #@TestPostamble             none
             #@TestResult                Success if OpenDS returns 49.
         -->
-        <testcase name="'Security: SASL PLAIN: User With Duplicate uid (u:) Binding'">
+        <testcase name="getTestCaseName('User With Duplicate uid (u:) Binding')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -234,7 +234,7 @@
             #@TestPostamble             none
             #@TestResult                Success if OpenDS returns 0.
         -->
-        <testcase name="'Security: SASL PLAIN: User With Duplicate uid (dn:) Binding'">
+        <testcase name="getTestCaseName('User With Duplicate uid (dn:) Binding')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -267,7 +267,7 @@
             #@TestPostamble             none
             #@TestResult                Success if OpenDS returns 49.
         -->
-        <testcase name="'Security: SASL PLAIN: User With Duplicate uid Binding'">
+        <testcase name="getTestCaseName('User With Duplicate uid Binding')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -301,7 +301,7 @@
             #@TestPostamble             none
             #@TestResult                Success if OpenDS returns 1.
         -->
-        <testcase name="'Security: SASL PLAIN: Create Realm'">
+        <testcase name="getTestCaseName('Create Realm')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -346,7 +346,7 @@
             #@TestPostamble             none
             #@TestResult                Success if OpenDS returns 0.
         -->
-        <testcase name="'Security: SASL PLAIN: User (u:) Binding With Realm'">
+        <testcase name="getTestCaseName('User (u:) Binding With Realm')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -384,7 +384,7 @@
             #@TestResult                Success if OpenDS returns 0 
                                         for all ldap operations.
         -->
-        <testcase name="'Security: SASL PLAIN: Postamble'">
+        <testcase name="getTestCaseName('Postamble')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/sasl/security_setup_sasl.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/sasl/security_setup_sasl.xml
index 305f53a..a3313fb 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/sasl/security_setup_sasl.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/sasl/security_setup_sasl.xml
@@ -58,7 +58,7 @@
             #@TestPostamble             none
             #@TestResult                Success if OpenDS returns 0 for all operations
         -->
-        <testcase name="'Security: SASL: Add Initial Entries'">
+        <testcase name="getTestCaseName('Add Initial Entries')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/sasl/security_teardown_sasl.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/sasl/security_teardown_sasl.xml
index 224a3c0..cbaeba9 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/sasl/security_teardown_sasl.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/sasl/security_teardown_sasl.xml
@@ -54,7 +54,7 @@
             #@TestPostamble             none
             #@TestResult                Success if OpenDS returns 0 for all operations
          -->
-        <testcase name="'Security: SASL: Postamble Reset'">
+        <testcase name="getTestCaseName('Postamble Reset')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/startTLS/security_bob_startTLS.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/startTLS/security_bob_startTLS.xml
index d953a19..92cdcf6 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/startTLS/security_bob_startTLS.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/startTLS/security_bob_startTLS.xml
@@ -34,7 +34,7 @@
       <sequence>
 
        <!--- Test Case : Add Entries through StartTLS port -->
-        <testcase name="'Security: TLS: Add Entries'">
+        <testcase name="getTestCaseName('Add Entries')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -56,7 +56,7 @@
         </testcase>
 
         <!--- Test Case : Add Attribute to Entry through StartTLS port -->
-        <testcase name="'Security: TLS: Add Attr To Entry'">
+        <testcase name="getTestCaseName('Add Attr To Entry')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -78,7 +78,7 @@
         </testcase>
 
         <!--- Test Case : Modify Attribute in Entry through StartTLS port -->
-        <testcase name="'Security: TLS: Modify Attr In Entry'">
+        <testcase name="getTestCaseName('Modify Attr In Entry')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -100,7 +100,7 @@
         </testcase>
 
         <!--- Test Case : Delete Entry through StartTLS port -->
-        <testcase name="'Security: TLS: Delete Entry'">
+        <testcase name="getTestCaseName('Delete Entry')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/startTLS/security_force_pwd_change_startTLS.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/startTLS/security_force_pwd_change_startTLS.xml
index 8f3765d..573e6de 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/startTLS/security_force_pwd_change_startTLS.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/startTLS/security_force_pwd_change_startTLS.xml
@@ -33,7 +33,7 @@
 
       <sequence>
 
-        <testcase name="'Security: TLS: Preamble - Force Pwd Change On Add'">
+        <testcase name="getTestCaseName('Preamble - Force Pwd Change On Add')">
           <sequence>
           
             <call function="'testCase_Preamble'"/>
@@ -70,7 +70,7 @@
         </testcase>
 
         <!--- Test Case : Add Single New User -->
-        <testcase name="'Security: TLS: Add Single New User'">
+        <testcase name="getTestCaseName('Add Single New User')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -107,7 +107,7 @@
         </testcase>
 
         <!--- Test Case : User Change Password -->
-        <testcase name="'Security: TLS: Added User Change Password'">
+        <testcase name="getTestCaseName('Added User Change Password')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -143,7 +143,7 @@
         </testcase>
 
         <!--- Test Case : Admin Disable Force Password On Add -->
-        <testcase name="'Security: TLS: Postamble - Disable Force Pwd On Add'">
+        <testcase name="getTestCaseName('Postamble - Disable Force Pwd On Add')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -191,7 +191,7 @@
           </sequence>
         </testcase>
 
-        <testcase name="'Security: TLS: Preamble - Force Pwd Change On Reset'">
+        <testcase name="getTestCaseName('Preamble - Force Pwd Change On Reset')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -227,7 +227,7 @@
         </testcase>
 
         <!--- Test Case : Admin Change User Pwd -->
-        <testcase name="'Security: TLS: Admin Reset User Pwd'">
+        <testcase name="getTestCaseName('Admin Reset User Pwd')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -250,7 +250,7 @@
 
 
         <!--- Test Case : User Search With Old Pwd -->
-        <testcase name="'Security: TLS: Old Pwd - Search'">
+        <testcase name="getTestCaseName('Old Pwd - Search')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -274,7 +274,7 @@
         </testcase>
 
         <!--- Test Case : User Add With Old Pwd -->
-        <testcase name="'Security: TLS: Old Pwd - Add'">
+        <testcase name="getTestCaseName('Old Pwd - Add')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -311,7 +311,7 @@
         </testcase>
 
      <!--- Test Case : User Delete With Old Pwd -->
-        <testcase name="'Security: TLS: Old Pwd - Delete'">
+        <testcase name="getTestCaseName('Old Pwd - Delete')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -348,7 +348,7 @@
         </testcase>
 
      <!--- Test Case : User Delete With Old Pwd -->
-        <testcase name="'Security: TLS: Old Pwd - Compare'">
+        <testcase name="getTestCaseName('Old Pwd - Compare')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -372,7 +372,7 @@
         </testcase>
 
         <!--- Test Case : User Search With Assigned Pwd -->
-        <testcase name="'Security: TLS: Search With Assigned Pwd'">
+        <testcase name="getTestCaseName('Search With Assigned Pwd')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -396,7 +396,7 @@
         </testcase>
 
         <!--- Test Case : User Change Password -->
-        <testcase name="'Security: TLS: User Change Password After Reset'">
+        <testcase name="getTestCaseName('User Change Password After Reset')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -448,7 +448,7 @@
         </testcase>
 
         <!--- Test Case : Admin Enable Maximum Reset Age -->
-        <testcase name="'Security: TLS: Admin Enable Max Reset Age Long'">
+        <testcase name="getTestCaseName('Admin Enable Max Reset Age Long')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -470,7 +470,7 @@
         </testcase>
 
         <!--- Test Case : Admin Change User Pwd -->
-        <testcase name="'Security: TLS: Admin Reset User Pwd - Long Reset Time'">
+        <testcase name="getTestCaseName('Admin Reset User Pwd - Long Reset Time')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -492,7 +492,7 @@
         </testcase>
 
         <!--- Test Case : User Change Password -->
-        <testcase name="'Security: TLS: User Change Password - Long Reset Time'">
+        <testcase name="getTestCaseName('User Change Password - Long Reset Time')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -528,7 +528,7 @@
         </testcase>
 
         <!--- Test Case : Admin Enable Maxmimum Reset Age -->
-        <testcase name="'Security: TLS: Admin Enable Max Reset Age Short'">
+        <testcase name="getTestCaseName('Admin Enable Max Reset Age Short')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -550,7 +550,7 @@
         </testcase>
 
         <!--- Test Case : Admin Change User Pwd -->
-        <testcase name="'Security: TLS: Admin Reset User Pwd - Short Reset Time'">
+        <testcase name="getTestCaseName('Admin Reset User Pwd - Short Reset Time')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -572,7 +572,7 @@
         </testcase>
 
         <!--- Test Case : User Change Password -->
-        <testcase name="'Security: TLS: User Change Password - Short Reset Time'">
+        <testcase name="getTestCaseName('User Change Password - Short Reset Time')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
@@ -618,7 +618,7 @@
         </testcase>
 
         <!--- Test Case : Admin Disable Force Password On Reset -->
-        <testcase name="'Security: TLS: Postamble - Disable Force Pwd On Reset'">
+        <testcase name="getTestCaseName('Postamble - Disable Force Pwd On Reset')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/startTLS/security_setup_startTLS.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/startTLS/security_setup_startTLS.xml
index 51f9d2a..e7b1d7b 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/startTLS/security_setup_startTLS.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/startTLS/security_setup_startTLS.xml
@@ -35,7 +35,7 @@
 
         <!--- Test Case : startTLS Setup -->
         <!--- Generate Server Cert -->
-        <testcase name="'Security: TLS: Preamble Setup'">
+        <testcase name="getTestCaseName('Preamble Setup')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/startTLS/security_teardown_startTLS.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/startTLS/security_teardown_startTLS.xml
index 99fe77b..abbd45a 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/startTLS/security_teardown_startTLS.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/startTLS/security_teardown_startTLS.xml
@@ -35,7 +35,7 @@
 
         <!--- Test Case : startTLS Teardown -->
         <!--- Delete Branch through StartTLS port -->
-        <testcase name="'Security: TLS: Postamble Reset'">
+        <testcase name="getTestCaseName('Postamble Reset')">
           <sequence>
             <call function="'testCase_Preamble'"/>
             <message>

--
Gitblit v1.10.0