--- a/sbsv2/raptor/test/smoke_suite/annofile2log.py	Thu Apr 01 11:57:33 2010 +0100
+++ b/sbsv2/raptor/test/smoke_suite/annofile2log.py	Thu Apr 01 15:50:33 2010 +0100
@@ -19,7 +19,7 @@
 def run():
 	t = SmokeTest()
 	t.id = "43563"
-	t.name = "annofile2log_canned"
+	t.name = "annofile2log"
 	t.description = "test workaround for log corruption from a make engine whose name begins with 'e'"
 	
 	t.usebash = True

--- a/sbsv2/raptor/test/smoke_suite/apply_usecases.py	Thu Apr 01 11:57:33 2010 +0100
+++ b/sbsv2/raptor/test/smoke_suite/apply_usecases.py	Thu Apr 01 15:50:33 2010 +0100
@@ -23,7 +23,7 @@
 
 	# Introduce LINKER_OPTIONS for tools2 linker
 	t.id = "0108"
-	t.name = "apply_linker_options"
+	t.name = "apply_usecases"
 	t.command = "sbs -b smoke_suite/test_resources/apply_usecases/linker_options/bld.inf -c tools2 -f -"
 	t.targets = [
 		"$(EPOCROOT)/epoc32/release/tools2/rel/test_apply_linkeroptions.exe"

--- a/sbsv2/raptor/test/smoke_suite/clean_readonly.py	Thu Apr 01 11:57:33 2010 +0100
+++ b/sbsv2/raptor/test/smoke_suite/clean_readonly.py	Thu Apr 01 15:50:33 2010 +0100
@@ -24,7 +24,7 @@
 	
 	t = AntiTargetSmokeTest()
 	t.id = "10a"
-	t.name = "cleanreadonly" 
+	t.name = "clean_readonly" 
 	t.command = "sbs -b smoke_suite/test_resources/simple_dll/bld.inf -c armv5"
 	t.targets = [
 		"$(EPOCROOT)/epoc32/release/armv5/udeb/createstaticdll.dll.sym",

--- a/sbsv2/raptor/test/smoke_suite/output_control.py	Thu Apr 01 11:57:33 2010 +0100
+++ b/sbsv2/raptor/test/smoke_suite/output_control.py	Thu Apr 01 15:50:33 2010 +0100
@@ -32,7 +32,7 @@
 	
 	t = SmokeTest()
 	t.id = "82"
-	t.name = "output_control_sbs_build_dir"
+	t.name = "output_control"
 	t.description = "Test building intermediate files into a location other than $EPOCROOT/epoc32/build. Use SBS_BUILD_DIR. environment variable."
 	t.sbs_build_dir = environ['EPOCROOT'].replace("\\","/").rstrip("/") + '/anotherbuilddir'
 	t.environ['SBS_BUILD_DIR'] = t.sbs_build_dir

--- a/sbsv2/raptor/test/smoke_suite/parallel_parsing.py	Thu Apr 01 11:57:33 2010 +0100
+++ b/sbsv2/raptor/test/smoke_suite/parallel_parsing.py	Thu Apr 01 15:50:33 2010 +0100
@@ -54,7 +54,7 @@
 	warnings = 0
 		
 	t.id = "104"
-	t.name = "parallelparsing"
+	t.name = "parallel_parsing"
 	t.description = description
 	t.command = command 
 	t.targets = targets

--- a/sbsv2/raptor/test/smoke_suite/whatcomp.py	Thu Apr 01 11:57:33 2010 +0100
+++ b/sbsv2/raptor/test/smoke_suite/whatcomp.py	Thu Apr 01 15:50:33 2010 +0100
@@ -67,7 +67,7 @@
 	t.warnings = warnings
 	t.run()
 
-	t.id = "0106a"
+	t.id = "0106b"
 	t.name = "whatcomp_component_repeated"
 	t.description = """
 			It is possible for what information about a component to not be grouped
@@ -89,5 +89,6 @@
 	t.run()
 
 	t.id = "0106"
+	t.name = "whatcomp"
 	t.print_result()
 	return t