diff --git a/indra/llcharacter/tests/lljoint_test.cpp b/indra/llcharacter/tests/lljoint_test.cpp
index 1c861b390a2b9a6ed11fd2b21ae5760dff9e99f5..e92aa832d66f820c46524920d3b1db27b6919432 100644
--- a/indra/llcharacter/tests/lljoint_test.cpp
+++ b/indra/llcharacter/tests/lljoint_test.cpp
@@ -42,7 +42,7 @@ namespace tut
 	};
 	typedef test_group<lljoint_data> lljoint_test;
 	typedef lljoint_test::object lljoint_object;
-	tut::lljoint_test lljoint_testcase("lljoint");
+	tut::lljoint_test lljoint_testcase("LLJoint");
 
 	template<> template<>
 	void lljoint_object::test<1>()
diff --git a/indra/llcommon/tests/bitpack_test.cpp b/indra/llcommon/tests/bitpack_test.cpp
index a74b5ebc3a70b3e3203b06900079142356bc68e0..05289881d00f610ddd252c6ab9648284a7d00c6c 100644
--- a/indra/llcommon/tests/bitpack_test.cpp
+++ b/indra/llcommon/tests/bitpack_test.cpp
@@ -40,7 +40,7 @@ namespace tut
 	};
 	typedef test_group<bit_pack> bit_pack_t;
 	typedef bit_pack_t::object bit_pack_object_t;
-	tut::bit_pack_t tut_bit_pack("bitpack");
+	tut::bit_pack_t tut_bit_pack("LLBitPack");
 
 	// pack -> unpack
 	template<> template<>
diff --git a/indra/llcommon/tests/commonmisc_test.cpp b/indra/llcommon/tests/commonmisc_test.cpp
index 390e3719cfc28be8151825978b59dd30024d6ac4..b115c153c1713643358905a7652a955a29bbf87f 100644
--- a/indra/llcommon/tests/commonmisc_test.cpp
+++ b/indra/llcommon/tests/commonmisc_test.cpp
@@ -59,7 +59,7 @@ namespace tut
 	};
 	typedef test_group<sd_data> sd_test;
 	typedef sd_test::object sd_object;
-	tut::sd_test sd("llsd");
+	tut::sd_test sd("LLSD");
 
 	template<> template<>
 	void sd_object::test<1>()
@@ -450,7 +450,7 @@ namespace tut
 	};
 	typedef test_group<mem_data> mem_test;
 	typedef mem_test::object mem_object;
-	tut::mem_test mem_stream("memory_stream");
+	tut::mem_test mem_stream("LLMemoryStream");
 
 	template<> template<>
 	void mem_object::test<1>()
@@ -643,7 +643,7 @@ namespace tut
 	};
 	typedef test_group<hash_data> hash_test;
 	typedef hash_test::object hash_object;
-	tut::hash_test hash_tester("hash_test");
+	tut::hash_test hash_tester("LLHash");
 
 	template<> template<>
 	void hash_object::test<1>()
diff --git a/indra/llcommon/tests/llbase64_test.cpp b/indra/llcommon/tests/llbase64_test.cpp
index 70036dc186f7fd003a22443667caa2960f3801cb..d0394150fa2ae63b2d82d8f266dfa55f3a281090 100644
--- a/indra/llcommon/tests/llbase64_test.cpp
+++ b/indra/llcommon/tests/llbase64_test.cpp
@@ -41,7 +41,7 @@ namespace tut
 	};
 	typedef test_group<base64_data> base64_test;
 	typedef base64_test::object base64_object;
-	tut::base64_test base64("base64");
+	tut::base64_test base64("LLBase64");
 
 	template<> template<>
 	void base64_object::test<1>()
diff --git a/indra/llcommon/tests/lldate_test.cpp b/indra/llcommon/tests/lldate_test.cpp
index a8bfda54240986c8c96a21708dc7e7f4fd34a950..7c95ccb91fe4ab21fe70c3bf44c32d842cbb59eb 100644
--- a/indra/llcommon/tests/lldate_test.cpp
+++ b/indra/llcommon/tests/lldate_test.cpp
@@ -71,7 +71,7 @@ namespace tut
 	};
 	typedef test_group<date_test> date_test_t;
 	typedef date_test_t::object date_test_object_t;
-	tut::date_test_t tut_date_test("date_test");
+	tut::date_test_t tut_date_test("LLDate");
 
 	/* format validation */
 	template<> template<>
diff --git a/indra/llcommon/tests/lldependencies_test.cpp b/indra/llcommon/tests/lldependencies_test.cpp
index e4e30a33ec3b28b4196e876877b0f884480689df..e40743ccf75d7babba03d80b10174b227987e2d7 100644
--- a/indra/llcommon/tests/lldependencies_test.cpp
+++ b/indra/llcommon/tests/lldependencies_test.cpp
@@ -145,7 +145,7 @@ namespace tut
     };
     typedef test_group<deps_data> deps_group;
     typedef deps_group::object deps_object;
-    tut::deps_group depsgr("lldependencies");
+    tut::deps_group depsgr("LLDependencies");
 
     template<> template<>
     void deps_object::test<1>()
diff --git a/indra/llcommon/tests/llframetimer_test.cpp b/indra/llcommon/tests/llframetimer_test.cpp
index 215dde7e70b54b3e8b3d2caab916e9a9636f2316..8ac1c91a3a0dc9c398302eac8a1e0b3001f744d6 100644
--- a/indra/llcommon/tests/llframetimer_test.cpp
+++ b/indra/llcommon/tests/llframetimer_test.cpp
@@ -43,7 +43,7 @@ namespace tut
 	};
 	typedef test_group<frametimer_test> frametimer_group_t;
 	typedef frametimer_group_t::object frametimer_object_t;
-	tut::frametimer_group_t frametimer_instance("frametimer");
+	tut::frametimer_group_t frametimer_instance("LLFrameTimer");
 
 	template<> template<>
 	void frametimer_object_t::test<1>()
diff --git a/indra/llcommon/tests/llprocessor_test.cpp b/indra/llcommon/tests/llprocessor_test.cpp
index 14adcc7303696fb1ca4904680f821f8eb2f9425d..884e1b5e5b50210455a659faadf5bc165e2620e3 100644
--- a/indra/llcommon/tests/llprocessor_test.cpp
+++ b/indra/llcommon/tests/llprocessor_test.cpp
@@ -38,7 +38,7 @@ namespace tut
 
 	typedef test_group<processor> processor_t;
 	typedef processor_t::object processor_object_t;
-	tut::processor_t tut_processor("processor");
+	tut::processor_t tut_processor("LLProcessor");
 
 	template<> template<>
 	void processor_object_t::test<1>()
diff --git a/indra/llcommon/tests/llrand_test.cpp b/indra/llcommon/tests/llrand_test.cpp
index a21159d47ee860713f44c810d09aab59a592a616..383e6f9e0a926fdd04fa68d3a76848b2aa0a9aa6 100644
--- a/indra/llcommon/tests/llrand_test.cpp
+++ b/indra/llcommon/tests/llrand_test.cpp
@@ -39,7 +39,7 @@ namespace tut
 
 	typedef test_group<random> random_t;
 	typedef random_t::object random_object_t;
-	tut::random_t tut_random("random");
+	tut::random_t tut_random("LLSeedRand");
 
 	template<> template<>
 	void random_object_t::test<1>()
diff --git a/indra/llcommon/tests/llsdserialize_test.cpp b/indra/llcommon/tests/llsdserialize_test.cpp
index 9eaa307141d72045947b9f0ad958dbd7a4ee2403..770443da1dd1c73fa15bb86b8f8f71a3ff08ede3 100644
--- a/indra/llcommon/tests/llsdserialize_test.cpp
+++ b/indra/llcommon/tests/llsdserialize_test.cpp
@@ -74,7 +74,7 @@ namespace tut
 
 	typedef test_group<sd_xml_data> sd_xml_test;
 	typedef sd_xml_test::object sd_xml_object;
-	tut::sd_xml_test sd_xml_stream("sd_xml_serialization");
+	tut::sd_xml_test sd_xml_stream("LLSDXMLFormatter");
 
 	template<> template<>
 	void sd_xml_object::test<1>()
diff --git a/indra/llcommon/tests/llstring_test.cpp b/indra/llcommon/tests/llstring_test.cpp
index aa36aab0dcf41c1fa3d5a1f662d3ee1c2f6a1e8d..304e91ed927ed434c90764869ae3556850c82cfa 100644
--- a/indra/llcommon/tests/llstring_test.cpp
+++ b/indra/llcommon/tests/llstring_test.cpp
@@ -38,7 +38,7 @@ namespace tut
 	};
 	typedef test_group<string_index> string_index_t;
 	typedef string_index_t::object string_index_object_t;
-	tut::string_index_t tut_string_index("string_test");
+	tut::string_index_t tut_string_index("LLString");
 
 	template<> template<>
 	void string_index_object_t::test<1>()
diff --git a/indra/llcommon/tests/lltreeiterators_test.cpp b/indra/llcommon/tests/lltreeiterators_test.cpp
index b0b4c7e0ad5e37ca9ff6d08f1c7c69ec4d2b0c13..1d619867d480c7f120788fe8a141f58b3ab655ab 100644
--- a/indra/llcommon/tests/lltreeiterators_test.cpp
+++ b/indra/llcommon/tests/lltreeiterators_test.cpp
@@ -56,7 +56,7 @@ namespace tut
     };
     typedef test_group<iter_data> iter_group;
     typedef iter_group::object iter_object;
-    tut::iter_group ig("lltreeiterators");
+    tut::iter_group ig("LLTreeIterators");
 } // namespace tut
 
 /*****************************************************************************
diff --git a/indra/llcommon/tests/stringize_test.cpp b/indra/llcommon/tests/stringize_test.cpp
index 757aa85ed7de5d0edd4c8c5ffc15d6f916f52474..3d34f23998d5b61748e05bf7f465e0403fbe2385 100644
--- a/indra/llcommon/tests/stringize_test.cpp
+++ b/indra/llcommon/tests/stringize_test.cpp
@@ -80,7 +80,7 @@ namespace tut
     };
     typedef test_group<stringize_data> stringize_group;
     typedef stringize_group::object stringize_object;
-    tut::stringize_group strzgrp("stringize");
+    tut::stringize_group strzgrp("stringize_h");
 
     template<> template<>
     void stringize_object::test<1>()
diff --git a/indra/llimage/tests/llimageworker_test.cpp b/indra/llimage/tests/llimageworker_test.cpp
index 98694aa7ee284180583c784d7ebb3d9c58802db9..a1092767092e86d1f46b81969dc59c80474af6f0 100644
--- a/indra/llimage/tests/llimageworker_test.cpp
+++ b/indra/llimage/tests/llimageworker_test.cpp
@@ -144,11 +144,11 @@ namespace tut
 	// Tut templating thingamagic: test group, object and test instance
 	typedef test_group<imagedecodethread_test> imagedecodethread_t;
 	typedef imagedecodethread_t::object imagedecodethread_object_t;
-	tut::imagedecodethread_t tut_imagedecodethread("imagedecodethread");
+	tut::imagedecodethread_t tut_imagedecodethread("LLImageDecodeThread");
 
 	typedef test_group<imagerequest_test> imagerequest_t;
 	typedef imagerequest_t::object imagerequest_object_t;
-	tut::imagerequest_t tut_imagerequest("imagerequest");
+	tut::imagerequest_t tut_imagerequest("LLImageRequest");
 
 	// ---------------------------------------------------------------------------------------
 	// Test functions
diff --git a/indra/llinventory/tests/inventorymisc_test.cpp b/indra/llinventory/tests/inventorymisc_test.cpp
index 9773a3fed48246eccc3f2eb667399ad6112744ad..c9af7c4eac74527461a5e90a5ec003e46d7f4fc5 100644
--- a/indra/llinventory/tests/inventorymisc_test.cpp
+++ b/indra/llinventory/tests/inventorymisc_test.cpp
@@ -100,7 +100,7 @@ namespace tut
 	};
 	typedef test_group<inventory_data> inventory_test;
 	typedef inventory_test::object inventory_object;
-	tut::inventory_test inv("llinventory");
+	tut::inventory_test inv("LLInventory");
 
 //***class LLInventoryType***//
 
diff --git a/indra/llinventory/tests/llparcel_test.cpp b/indra/llinventory/tests/llparcel_test.cpp
index 80d0bdae5ab9806875e55fd344b08c75d3a93504..f2e4b03ff76ed5d40c41f0d5a6f6048c242c6f73 100644
--- a/indra/llinventory/tests/llparcel_test.cpp
+++ b/indra/llinventory/tests/llparcel_test.cpp
@@ -40,7 +40,7 @@ namespace tut
 	};
 	typedef test_group<llinventoryparcel_data> llinventoryparcel_test;
 	typedef llinventoryparcel_test::object llinventoryparcel_object;
-	tut::llinventoryparcel_test llinventoryparcel("llinventoryparcel");
+	tut::llinventoryparcel_test llinventoryparcel("LLInventoryParcel");
 
 	template<> template<>
 	void llinventoryparcel_object::test<1>()
diff --git a/indra/llmath/tests/llmodularmath_test.cpp b/indra/llmath/tests/llmodularmath_test.cpp
index e6525542f1197cdbf260bb0c563d4a19a0d0fef2..063d3ef79f004e8a165d2c9962862556d941eafa 100644
--- a/indra/llmath/tests/llmodularmath_test.cpp
+++ b/indra/llmath/tests/llmodularmath_test.cpp
@@ -39,7 +39,7 @@ namespace tut
 	};
 	typedef test_group<modularmath_data> modularmath_test;
 	typedef modularmath_test::object modularmath_object;
-	tut::modularmath_test modularmath_testcase("modularmath");
+	tut::modularmath_test modularmath_testcase("LLModularMath");
 
 	template<> template<>
 	void modularmath_object::test<1>()
diff --git a/indra/llmath/tests/llquaternion_test.cpp b/indra/llmath/tests/llquaternion_test.cpp
index 29e7793d49b7e97ad67a13276ddd357b84ab6972..9e79b299ff07f21f61e743c7c03f16d72a29d04c 100644
--- a/indra/llmath/tests/llquaternion_test.cpp
+++ b/indra/llmath/tests/llquaternion_test.cpp
@@ -43,7 +43,7 @@ namespace tut
 	};
 	typedef test_group<llquat_test> llquat_test_t;
 	typedef llquat_test_t::object llquat_test_object_t;
-	tut::llquat_test_t tut_llquat_test("llquat");
+	tut::llquat_test_t tut_llquat_test("LLQuaternion");
 
 	//test case for LLQuaternion::LLQuaternion(void) fn.
 	template<> template<>
diff --git a/indra/llmath/tests/m3math_test.cpp b/indra/llmath/tests/m3math_test.cpp
index 3b424f79c6c858bf8c305114f1dc30065ab65fa1..8abf61b740d21ca7bf927c7cd9f106a584e4ce5f 100644
--- a/indra/llmath/tests/m3math_test.cpp
+++ b/indra/llmath/tests/m3math_test.cpp
@@ -44,7 +44,7 @@ namespace tut
 	};
 	typedef test_group<m3math_test> m3math_test_t;
 	typedef m3math_test_t::object m3math_test_object_t;
-	tut::m3math_test_t tut_m3math_test("m3math_test");
+	tut::m3math_test_t tut_m3math_test("m3math_h");
 
 	//test case for setIdentity() fn.
 	template<> template<>
diff --git a/indra/llmath/tests/mathmisc_test.cpp b/indra/llmath/tests/mathmisc_test.cpp
index 58b78cd4915d8e624859597abfb55b75e18aa603..91a2e6c0091dde03bfc4ddedda47d48842692e0f 100644
--- a/indra/llmath/tests/mathmisc_test.cpp
+++ b/indra/llmath/tests/mathmisc_test.cpp
@@ -45,7 +45,7 @@ namespace tut
 	};
 	typedef test_group<math_data> math_test;
 	typedef math_test::object math_object;
-	tut::math_test tm("basic_linden_math");
+	tut::math_test tm("BasicLindenMath");
 
 	template<> template<>
 	void math_object::test<1>()
@@ -178,7 +178,7 @@ namespace tut
 	};
 	typedef test_group<uuid_data> uuid_test;
 	typedef uuid_test::object uuid_object;
-	tut::uuid_test tu("uuid");
+	tut::uuid_test tu("LLUUID");
 
 	template<> template<>
 	void uuid_object::test<1>()
@@ -233,7 +233,7 @@ namespace tut
 	};
 	typedef test_group<crc_data> crc_test;
 	typedef crc_test::object crc_object;
-	tut::crc_test tc("crc");
+	tut::crc_test tc("LLCrc");
 
 	template<> template<>
 	void crc_object::test<1>()
diff --git a/indra/llmath/tests/v2math_test.cpp b/indra/llmath/tests/v2math_test.cpp
index e112892c496a7c681d0187498fcfa66bcc355aae..9747996b2561fc11fa03473302a764f38f1f496c 100644
--- a/indra/llmath/tests/v2math_test.cpp
+++ b/indra/llmath/tests/v2math_test.cpp
@@ -39,7 +39,7 @@ namespace tut
 	};
 	typedef test_group<v2math_data> v2math_test;
 	typedef v2math_test::object v2math_object;
-	tut::v2math_test v2math_testcase("v2math");
+	tut::v2math_test v2math_testcase("v2math_h");
 
 	template<> template<>
 	void v2math_object::test<1>()
diff --git a/indra/llmath/tests/v3color_test.cpp b/indra/llmath/tests/v3color_test.cpp
index 4a05a8412325632f8b6ca9470c5e9506010636f2..2c00f00ab3517de30d390fc8a7af806c259d89af 100644
--- a/indra/llmath/tests/v3color_test.cpp
+++ b/indra/llmath/tests/v3color_test.cpp
@@ -39,7 +39,7 @@ namespace tut
 	};
 	typedef test_group<v3color_data> v3color_test;
 	typedef v3color_test::object v3color_object;
-	tut::v3color_test v3color_testcase("v3color");
+	tut::v3color_test v3color_testcase("v3color_h");
 
 	template<> template<>
 	void v3color_object::test<1>()
diff --git a/indra/llmath/tests/v3dmath_test.cpp b/indra/llmath/tests/v3dmath_test.cpp
index 68bcbd124f4aeae8e0ad6188963c0d3c05564742..b67346f4e5e6c6cdccd73609385f33dc1c1574b4 100644
--- a/indra/llmath/tests/v3dmath_test.cpp
+++ b/indra/llmath/tests/v3dmath_test.cpp
@@ -43,7 +43,7 @@ namespace tut
 	};
 	typedef test_group<v3dmath_data> v3dmath_test;
 	typedef v3dmath_test::object v3dmath_object;
-	tut::v3dmath_test v3dmath_testcase("v3dmath");
+	tut::v3dmath_test v3dmath_testcase("v3dmath_h");
 
 	template<> template<>
 	void v3dmath_object::test<1>()
diff --git a/indra/llmath/tests/v3math_test.cpp b/indra/llmath/tests/v3math_test.cpp
index e6ef5d501229c1a404da9b94bfce2d01a73cd031..e4732bf8615d5369f8053e46a8af7d47a5641df5 100644
--- a/indra/llmath/tests/v3math_test.cpp
+++ b/indra/llmath/tests/v3math_test.cpp
@@ -45,7 +45,7 @@ namespace tut
 	};
 	typedef test_group<v3math_data> v3math_test;
 	typedef v3math_test::object v3math_object;
-	tut::v3math_test v3math_testcase("v3math");
+	tut::v3math_test v3math_testcase("v3math_h");
 
 	template<> template<>
 	void v3math_object::test<1>()
diff --git a/indra/llmath/tests/v4color_test.cpp b/indra/llmath/tests/v4color_test.cpp
index dde5f9069b0736fca26bca232e2a35cac77d2717..fbd43625d18c67ee86719f9d9dd372231f0d8a3c 100644
--- a/indra/llmath/tests/v4color_test.cpp
+++ b/indra/llmath/tests/v4color_test.cpp
@@ -43,7 +43,7 @@ namespace tut
 	};
 	typedef test_group<v4color_data> v4color_test;
 	typedef v4color_test::object v4color_object;
-	tut::v4color_test v4color_testcase("v4color");
+	tut::v4color_test v4color_testcase("v4color_h");
 
 	template<> template<>
 	void v4color_object::test<1>()
diff --git a/indra/llmath/tests/v4coloru_test.cpp b/indra/llmath/tests/v4coloru_test.cpp
index 1408d05b817dedae32ae693272857cdb8ecd14bb..6d84ba41ef060b5706440678e2fba1b6d07b271e 100644
--- a/indra/llmath/tests/v4coloru_test.cpp
+++ b/indra/llmath/tests/v4coloru_test.cpp
@@ -42,7 +42,7 @@ namespace tut
 	};
 	typedef test_group<v4coloru_data> v4coloru_test;
 	typedef v4coloru_test::object v4coloru_object;
-	tut::v4coloru_test v4coloru_testcase("v4coloru");
+	tut::v4coloru_test v4coloru_testcase("v4coloru_h");
 
 	template<> template<>
 	void v4coloru_object::test<1>()
diff --git a/indra/llmath/tests/v4math_test.cpp b/indra/llmath/tests/v4math_test.cpp
index 24c1af5e614f6d90f44952c436470cadb9480068..b1f934e555288f0fd4c478ad7cdee26dc804ecd8 100644
--- a/indra/llmath/tests/v4math_test.cpp
+++ b/indra/llmath/tests/v4math_test.cpp
@@ -41,7 +41,7 @@ namespace tut
 	};
 	typedef test_group<v4math_data> v4math_test;
 	typedef v4math_test::object v4math_object;
-	tut::v4math_test v4math_testcase("v4math");
+	tut::v4math_test v4math_testcase("v4math_h");
 
 	template<> template<>
 	void v4math_object::test<1>()
diff --git a/indra/llmath/tests/xform_test.cpp b/indra/llmath/tests/xform_test.cpp
index 1337daa50a815de89643bc7751c48e02ae05628e..49870eef3c6766faeb4e784933731f430a178262 100644
--- a/indra/llmath/tests/xform_test.cpp
+++ b/indra/llmath/tests/xform_test.cpp
@@ -38,7 +38,7 @@ namespace tut
 	};
 	typedef test_group<xform_test> xform_test_t;
 	typedef xform_test_t::object xform_test_object_t;
-	tut::xform_test_t tut_xform_test("xform_test");
+	tut::xform_test_t tut_xform_test("LLXForm");
 
 	//test case for init(), getParent(), getRotation(), getPositionW(), getWorldRotation() fns.
 	template<> template<>
diff --git a/indra/llmessage/tests/llhost_test.cpp b/indra/llmessage/tests/llhost_test.cpp
index 36f819ad33e9e5302e20778d4f7fcf362fb1846d..b20bceae1de5ec431ba2e4df9aae40be3727f0ea 100644
--- a/indra/llmessage/tests/llhost_test.cpp
+++ b/indra/llmessage/tests/llhost_test.cpp
@@ -39,7 +39,7 @@ namespace tut
 	};
 	typedef test_group<host_data> host_test;
 	typedef host_test::object host_object;
-	tut::host_test host_testcase("llhost");
+	tut::host_test host_testcase("LLHost");
 
 
 	template<> template<>
diff --git a/indra/llmessage/tests/llmime_test.cpp b/indra/llmessage/tests/llmime_test.cpp
index 0616c070c402716c8bc6d315ab97569af06db77b..aed5c4589cba1d567635351c7ed0ff77008924df 100644
--- a/indra/llmessage/tests/llmime_test.cpp
+++ b/indra/llmessage/tests/llmime_test.cpp
@@ -41,7 +41,7 @@ namespace tut
 	};
 	typedef test_group<mime_index> mime_index_t;
 	typedef mime_index_t::object mime_index_object_t;
-	tut::mime_index_t tut_mime_index("mime_index");
+	tut::mime_index_t tut_mime_index("LLMime");
 
 	template<> template<>
 	void mime_index_object_t::test<1>()
@@ -228,7 +228,7 @@ namespace tut
 	};
 	typedef test_group<mime_parse> mime_parse_t;
 	typedef mime_parse_t::object mime_parse_object_t;
-	tut::mime_parse_t tut_mime_parse("mime_parse");
+	tut::mime_parse_t tut_mime_parse("LLMimeParse");
 
 	template<> template<>
 	void mime_parse_object_t::test<1>()
diff --git a/indra/llmessage/tests/llnamevalue_test.cpp b/indra/llmessage/tests/llnamevalue_test.cpp
index da22ec80ef5fd01efdfee637b74ba2939a4a25e3..8902fdd2e8f5f38f311d85fcc5d4e8620758ea4f 100644
--- a/indra/llmessage/tests/llnamevalue_test.cpp
+++ b/indra/llmessage/tests/llnamevalue_test.cpp
@@ -49,7 +49,7 @@ namespace tut
  	};
 	typedef test_group<namevalue_test> namevalue_t;
 	typedef namevalue_t::object namevalue_object_t;
-	tut::namevalue_t tut_namevalue("namevalue_test");
+	tut::namevalue_t tut_namevalue("LLNameValue");
 
 	
 	template<> template<>
diff --git a/indra/llmessage/tests/llpartdata_test.cpp b/indra/llmessage/tests/llpartdata_test.cpp
index b26e7a58496ded375f5847866e0efe713af7aac8..9123bd06c7117f866f97fea5ad3d6e09b210094e 100644
--- a/indra/llmessage/tests/llpartdata_test.cpp
+++ b/indra/llmessage/tests/llpartdata_test.cpp
@@ -44,7 +44,7 @@ namespace tut
 	};
 	typedef test_group<partdata_test> partdata_test_t;
 	typedef partdata_test_t::object partdata_test_object_t;
-	tut::partdata_test_t tut_partdata_test("partdata_test");
+	tut::partdata_test_t tut_partdata_test("LLPartData");
 
 	template<> template<>
 	void partdata_test_object_t::test<1>()
diff --git a/indra/llmessage/tests/llxfer_file_test.cpp b/indra/llmessage/tests/llxfer_file_test.cpp
index 081f898417ff7189eed5faefec9acfc30c5a0792..a8c1adf9b4db69b14bb0c8b8ce432362f72d93ff 100644
--- a/indra/llmessage/tests/llxfer_file_test.cpp
+++ b/indra/llmessage/tests/llxfer_file_test.cpp
@@ -38,7 +38,7 @@ namespace tut
 	};
 	typedef test_group<llxfer_data> llxfer_test;
 	typedef llxfer_test::object llxfer_object;
-	tut::llxfer_test llxfer("llxfer");
+	tut::llxfer_test llxfer("LLXferFile");
 
 	template<> template<>
 	void llxfer_object::test<1>()
diff --git a/indra/llprimitive/tests/llprimitive_test.cpp b/indra/llprimitive/tests/llprimitive_test.cpp
index e181a59dd635799d7d41eb30205be49221f7fa32..0d60c7cd15e70941f2bfaaa53b5cb4680206700d 100644
--- a/indra/llprimitive/tests/llprimitive_test.cpp
+++ b/indra/llprimitive/tests/llprimitive_test.cpp
@@ -96,7 +96,7 @@ namespace tut
     
 	typedef test_group<llprimitive> llprimitive_t;
 	typedef llprimitive_t::object llprimitive_object_t;
-	tut::llprimitive_t tut_llprimitive("llprimitive");
+	tut::llprimitive_t tut_llprimitive("LLPrimitive");
 
 	template<> template<>
 	void llprimitive_object_t::test<1>()
diff --git a/indra/newview/tests/llagentaccess_test.cpp b/indra/newview/tests/llagentaccess_test.cpp
index a0a9659475082398b17a90d90f7e859597667eea..c970d7997566dadc78bf2aa1091ea3fbb6ea77de 100644
--- a/indra/newview/tests/llagentaccess_test.cpp
+++ b/indra/newview/tests/llagentaccess_test.cpp
@@ -74,7 +74,7 @@ namespace tut
     
 	typedef test_group<agentaccess> agentaccess_t;
 	typedef agentaccess_t::object agentaccess_object_t;
-	tut::agentaccess_t tut_agentaccess("agentaccess");
+	tut::agentaccess_t tut_agentaccess("LLAgentAccess");
 
 	template<> template<>
 	void agentaccess_object_t::test<1>()
diff --git a/indra/newview/tests/lldateutil_test.cpp b/indra/newview/tests/lldateutil_test.cpp
index 530171b87ebeb717bbe4d3017034c08391a9d502..99b346cff88d0d480fc2d8c532ebd5ec36eec1e3 100644
--- a/indra/newview/tests/lldateutil_test.cpp
+++ b/indra/newview/tests/lldateutil_test.cpp
@@ -103,7 +103,7 @@ namespace tut
     
 	typedef test_group<dateutil> dateutil_t;
 	typedef dateutil_t::object dateutil_object_t;
-	tut::dateutil_t tut_dateutil("dateutil");
+	tut::dateutil_t tut_dateutil("LLDateUtil");
 
 	template<> template<>
 	void dateutil_object_t::test<1>()
diff --git a/indra/newview/tests/llmediadataclient_test.cpp b/indra/newview/tests/llmediadataclient_test.cpp
index 495073cf670eefa99fe6088aff8aab371741b9da..92e77a7b109759842b36ed0d873872bdbea3cfc2 100644
--- a/indra/newview/tests/llmediadataclient_test.cpp
+++ b/indra/newview/tests/llmediadataclient_test.cpp
@@ -234,7 +234,7 @@ namespace tut
     
 	typedef test_group<mediadataclient> mediadataclient_t;
 	typedef mediadataclient_t::object mediadataclient_object_t;
-	tut::mediadataclient_t tut_mediadataclient("mediadataclient");
+	tut::mediadataclient_t tut_mediadataclient("LLMediaDataClient");
     
     void ensure(const std::string &msg, int value, int expected)
     {
diff --git a/indra/newview/tests/llsecapi_test.cpp b/indra/newview/tests/llsecapi_test.cpp
index d5b6555b6ef9a2df7cc42ed1ed9adac5644fddf0..c319a479156dc5d451766d56075f4cacb0eff675 100644
--- a/indra/newview/tests/llsecapi_test.cpp
+++ b/indra/newview/tests/llsecapi_test.cpp
@@ -147,7 +147,7 @@ namespace tut
 	// Tut templating thingamagic: test group, object and test instance
 	typedef test_group<secapiTest> secapiTestFactory;
 	typedef secapiTestFactory::object secapiTestObject;
-	tut::secapiTestFactory tut_test("llsecapi");
+	tut::secapiTestFactory tut_test("LLSecAPI");
 	
 	// ---------------------------------------------------------------------------------------
 	// Test functions 
diff --git a/indra/newview/tests/llsechandler_basic_test.cpp b/indra/newview/tests/llsechandler_basic_test.cpp
index c48498ebcd83e4839eb989106887cabde955a312..daa10819fc036d8683ed445c7d750a162f6580d1 100644
--- a/indra/newview/tests/llsechandler_basic_test.cpp
+++ b/indra/newview/tests/llsechandler_basic_test.cpp
@@ -311,7 +311,7 @@ namespace tut
 	// Tut templating thingamagic: test group, object and test instance
 	typedef test_group<sechandler_basic_test> sechandler_basic_test_factory;
 	typedef sechandler_basic_test_factory::object sechandler_basic_test_object;
-	tut::sechandler_basic_test_factory tut_test("llsechandler_basic");
+	tut::sechandler_basic_test_factory tut_test("LLSecHandler");
 	
 	// ---------------------------------------------------------------------------------------
 	// Test functions 
diff --git a/indra/newview/tests/llslurl_test.cpp b/indra/newview/tests/llslurl_test.cpp
index 753151bdd8083c19e8aa2c65dd14ba6f6e3824e9..8a293d16254dd241b57f95c8100575fd32bcc8aa 100644
--- a/indra/newview/tests/llslurl_test.cpp
+++ b/indra/newview/tests/llslurl_test.cpp
@@ -96,7 +96,7 @@ namespace tut
 	// Tut templating thingamagic: test group, object and test instance
 	typedef test_group<slurlTest> slurlTestFactory;
 	typedef slurlTestFactory::object slurlTestObject;
-	tut::slurlTestFactory tut_test("llslurl");
+	tut::slurlTestFactory tut_test("LLSlurl");
 	
 	// ---------------------------------------------------------------------------------------
 	// Test functions 
diff --git a/indra/newview/tests/lltextureinfo_test.cpp b/indra/newview/tests/lltextureinfo_test.cpp
index 7fa8602adcc9b17138138c5f247ad2ca785271ea..73ace1de37ed89a4fee48d17ec64c97fb57dc04b 100644
--- a/indra/newview/tests/lltextureinfo_test.cpp
+++ b/indra/newview/tests/lltextureinfo_test.cpp
@@ -68,7 +68,7 @@ namespace tut
 	// Tut templating thingamagic: test group, object and test instance
 	typedef test_group<textureinfo_test> textureinfo_t;
 	typedef textureinfo_t::object textureinfo_object_t;
-	tut::textureinfo_t tut_textureinfo("textureinfo");
+	tut::textureinfo_t tut_textureinfo("LLTectureInfo");
 
 	
 	// ---------------------------------------------------------------------------------------
diff --git a/indra/newview/tests/lltextureinfodetails_test.cpp b/indra/newview/tests/lltextureinfodetails_test.cpp
index 3cd4c10da234ace56d4594b07963b7500eaf7039..31ec5f9d4ee73fc1728f9152f0b2d9570e26ae34 100644
--- a/indra/newview/tests/lltextureinfodetails_test.cpp
+++ b/indra/newview/tests/lltextureinfodetails_test.cpp
@@ -67,7 +67,7 @@ namespace tut
 	// Tut templating thingamagic: test group, object and test instance
 	typedef test_group<textureinfodetails_test> textureinfodetails_t;
 	typedef textureinfodetails_t::object textureinfodetails_object_t;
-	tut::textureinfodetails_t tut_textureinfodetails("textureinfodetails");
+	tut::textureinfodetails_t tut_textureinfodetails("LLTextureInfoDetails");
 
 	
 	// ---------------------------------------------------------------------------------------
diff --git a/indra/newview/tests/lltexturestatsuploader_test.cpp b/indra/newview/tests/lltexturestatsuploader_test.cpp
index caeabd08b3ae08cae7c42db62c7b122c52e05c4f..cfb2c267cc7ee7e26a78969f8bd9e410334a380c 100644
--- a/indra/newview/tests/lltexturestatsuploader_test.cpp
+++ b/indra/newview/tests/lltexturestatsuploader_test.cpp
@@ -90,7 +90,7 @@ namespace tut
 	// Tut templating thingamagic: test group, object and test instance
 	typedef test_group<texturestatsuploader_test> texturestatsuploader_t;
 	typedef texturestatsuploader_t::object texturestatsuploader_object_t;
-	tut::texturestatsuploader_t tut_texturestatsuploader("texturestatsuploader");
+	tut::texturestatsuploader_t tut_texturestatsuploader("LLTextureStatsUploader");
 
 	
 	// ---------------------------------------------------------------------------------------
diff --git a/indra/newview/tests/llviewerhelputil_test.cpp b/indra/newview/tests/llviewerhelputil_test.cpp
index 4c71f15db1d2d072b8eb0ab08c5b90a594ddbeee..a0f1d1c3c34499998e1cc6a0f1abd3679dd6fe67 100644
--- a/indra/newview/tests/llviewerhelputil_test.cpp
+++ b/indra/newview/tests/llviewerhelputil_test.cpp
@@ -109,7 +109,7 @@ namespace tut
     
 	typedef test_group<viewerhelputil> viewerhelputil_t;
 	typedef viewerhelputil_t::object viewerhelputil_object_t;
-	tut::viewerhelputil_t tut_viewerhelputil("viewerhelputil");
+	tut::viewerhelputil_t tut_viewerhelputil("LLViewerHelpUtil");
 
 	template<> template<>
 	void viewerhelputil_object_t::test<1>()
diff --git a/indra/newview/tests/llviewernetwork_test.cpp b/indra/newview/tests/llviewernetwork_test.cpp
index 2320201ee8fe10f0c48c14805cdb64fa63216844..6cd2db487b5f82931b61b04418cfcc8c28483e72 100644
--- a/indra/newview/tests/llviewernetwork_test.cpp
+++ b/indra/newview/tests/llviewernetwork_test.cpp
@@ -122,7 +122,7 @@ namespace tut
 	// Tut templating thingamagic: test group, object and test instance
 	typedef test_group<viewerNetworkTest> viewerNetworkTestFactory;
 	typedef viewerNetworkTestFactory::object viewerNetworkTestObject;
-	tut::viewerNetworkTestFactory tut_test("llviewernetwork");
+	tut::viewerNetworkTestFactory tut_test("LLViewerNetwork");
 	
 	// ---------------------------------------------------------------------------------------
 	// Test functions 
diff --git a/indra/newview/tests/llworldmap_test.cpp b/indra/newview/tests/llworldmap_test.cpp
index 443279c06230c19bbdf514053a5db5bb0fbaef34..b976ac5ea900a9010d06b9da08498e1dd8480a8f 100644
--- a/indra/newview/tests/llworldmap_test.cpp
+++ b/indra/newview/tests/llworldmap_test.cpp
@@ -144,15 +144,15 @@ namespace tut
 	// Tut templating thingamagic: test group, object and test instance
 	typedef test_group<iteminfo_test> iteminfo_t;
 	typedef iteminfo_t::object iteminfo_object_t;
-	tut::iteminfo_t tut_iteminfo("iteminfo");
+	tut::iteminfo_t tut_iteminfo("LLItemInfo");
 
 	typedef test_group<siminfo_test> siminfo_t;
 	typedef siminfo_t::object siminfo_object_t;
-	tut::siminfo_t tut_siminfo("siminfo");
+	tut::siminfo_t tut_siminfo("LLSimInfo");
 
 	typedef test_group<worldmap_test> worldmap_t;
 	typedef worldmap_t::object worldmap_object_t;
-	tut::worldmap_t tut_worldmap("worldmap");
+	tut::worldmap_t tut_worldmap("LLWorldMap");
 
 	// ---------------------------------------------------------------------------------------
 	// Test functions
diff --git a/indra/newview/tests/llworldmipmap_test.cpp b/indra/newview/tests/llworldmipmap_test.cpp
index 272e59061d8f71165ff854a77df6bf0a9149c9fd..54887ae219c1636b10e876025cef00ac2f9b2ac1 100644
--- a/indra/newview/tests/llworldmipmap_test.cpp
+++ b/indra/newview/tests/llworldmipmap_test.cpp
@@ -89,7 +89,7 @@ namespace tut
 	// Tut templating thingamagic: test group, object and test instance
 	typedef test_group<worldmipmap_test> worldmipmap_t;
 	typedef worldmipmap_t::object worldmipmap_object_t;
-	tut::worldmipmap_t tut_worldmipmap("worldmipmap");
+	tut::worldmipmap_t tut_worldmipmap("LLWorldMipmap");
 
 	// ---------------------------------------------------------------------------------------
 	// Test functions