diff --git a/src/test-apps/happy/test-templates/WeaveWdmNextOptions.py b/src/test-apps/happy/test-templates/WeaveWdmNextOptions.py
index 68daf75acd..bbfbd7b74e 100644
--- a/src/test-apps/happy/test-templates/WeaveWdmNextOptions.py
+++ b/src/test-apps/happy/test-templates/WeaveWdmNextOptions.py
@@ -2,6 +2,7 @@
 
 """
 Defines all test parameter options for WeaveWdmNext automation.
+Client and Server options map to MockWdmNode CLI options.
 """
 
 # Test Options
diff --git a/src/test-apps/happy/tests/service/wdmNext/weave_wdm_next_test_service_base.py b/src/test-apps/happy/tests/service/wdmNext/weave_wdm_next_test_service_base.py
index 4622bd7307..b9459ce4cc 100755
--- a/src/test-apps/happy/tests/service/wdmNext/weave_wdm_next_test_service_base.py
+++ b/src/test-apps/happy/tests/service/wdmNext/weave_wdm_next_test_service_base.py
@@ -357,7 +357,7 @@ def __process_result(self, nodeA, nodeB, success, all_data):
             }
 
             output_file_name = self.weave_wdm.process_log_prefix + data['client'] + \
-                self.options[wwno.TEST][wwno.TEST_TAG][20:].upper() + TESTRAIL_SUFFIX
+                self.options[wwno.TEST][wwno.TEST_TAG][1:].upper() + TESTRAIL_SUFFIX
 
             self.__output_test_result(output_file_name, output_data)