diff --git a/indra/llcommon/tests/lleventfilter_test.cpp b/indra/llcommon/tests/lleventfilter_test.cpp
index ca05ef62a9f3dfeb72de349fd7603e43ee92a42a..2cdfb52f2fe50ef667befce7e566284dbb35ed9c 100755
--- a/indra/llcommon/tests/lleventfilter_test.cpp
+++ b/indra/llcommon/tests/lleventfilter_test.cpp
@@ -244,7 +244,7 @@ namespace tut
     void filter_object::test<4>()
     {
         set_test_name("LLEventTimeout::errorAfter()");
-        WrapLL_ERRS capture;
+        WrapLLErrs capture;
         LLEventPump& driver(pumps.obtain("driver"));
         TestEventTimeout filter(driver);
         listener0.reset(0);
@@ -274,7 +274,7 @@ namespace tut
         {
             mainloop.post(17);
         }
-        catch (const WrapLL_ERRS::FatalException& e)
+        catch (const WrapLLErrs::FatalException& e)
         {
             threw = e.what();
         }
diff --git a/indra/llmessage/tests/llareslistener_test.cpp b/indra/llmessage/tests/llareslistener_test.cpp
index 60c91e12cfc931e7ac609ede0f5891203b9fc9f7..c04696c86b721f5734214fc9ad369c3a9b44847c 100755
--- a/indra/llmessage/tests/llareslistener_test.cpp
+++ b/indra/llmessage/tests/llareslistener_test.cpp
@@ -135,7 +135,7 @@ namespace tut
     void object::test<2>()
     {
         set_test_name("bad op");
-        WrapLL_ERRS capture;
+        WrapLLErrs capture;
         LLSD request;
         request["op"] = "foo";
         std::string threw;
@@ -143,7 +143,7 @@ namespace tut
         {
             LLEventPumps::instance().obtain("LLAres").post(request);
         }
-        catch (const WrapLL_ERRS::FatalException& e)
+        catch (const WrapLLErrs::FatalException& e)
         {
             threw = e.what();
         }
@@ -154,7 +154,7 @@ namespace tut
     void object::test<3>()
     {
         set_test_name("bad rewriteURI request");
-        WrapLL_ERRS capture;
+        WrapLLErrs capture;
         LLSD request;
         request["op"] = "rewriteURI";
         std::string threw;
@@ -162,7 +162,7 @@ namespace tut
         {
             LLEventPumps::instance().obtain("LLAres").post(request);
         }
-        catch (const WrapLL_ERRS::FatalException& e)
+        catch (const WrapLLErrs::FatalException& e)
         {
             threw = e.what();
         }
@@ -175,7 +175,7 @@ namespace tut
     void object::test<4>()
     {
         set_test_name("bad rewriteURI request");
-        WrapLL_ERRS capture;
+        WrapLLErrs capture;
         LLSD request;
         request["op"] = "rewriteURI";
         request["reply"] = "nonexistent";
@@ -184,7 +184,7 @@ namespace tut
         {
             LLEventPumps::instance().obtain("LLAres").post(request);
         }
-        catch (const WrapLL_ERRS::FatalException& e)
+        catch (const WrapLLErrs::FatalException& e)
         {
             threw = e.what();
         }
@@ -197,7 +197,7 @@ namespace tut
     void object::test<5>()
     {
         set_test_name("bad rewriteURI request");
-        WrapLL_ERRS capture;
+        WrapLLErrs capture;
         LLSD request;
         request["op"] = "rewriteURI";
         request["uri"] = "foo.bar.com";
@@ -206,7 +206,7 @@ namespace tut
         {
             LLEventPumps::instance().obtain("LLAres").post(request);
         }
-        catch (const WrapLL_ERRS::FatalException& e)
+        catch (const WrapLLErrs::FatalException& e)
         {
             threw = e.what();
         }
diff --git a/indra/newview/tests/llcapabilitylistener_test.cpp b/indra/newview/tests/llcapabilitylistener_test.cpp
index e1cbd28f92b1c35ab3fa05775420adc160db850b..bde991a01e873531f0d6588c4a602b7a72247a54 100755
--- a/indra/newview/tests/llcapabilitylistener_test.cpp
+++ b/indra/newview/tests/llcapabilitylistener_test.cpp
@@ -134,10 +134,10 @@ namespace tut
         std::string threw;
         try
         {
-            WrapLL_ERRS capture;
+            WrapLLErrs capture;
             regionPump.post(request);
         }
-        catch (const WrapLL_ERRS::FatalException& e)
+        catch (const WrapLLErrs::FatalException& e)
         {
             threw = e.what();
         }
@@ -181,10 +181,10 @@ namespace tut
         std::string threw;
         try
         {
-            WrapLL_ERRS capture;
+            WrapLLErrs capture;
             regionPump.post(request);
         }
-        catch (const WrapLL_ERRS::FatalException& e)
+        catch (const WrapLLErrs::FatalException& e)
         {
             threw = e.what();
         }
@@ -243,10 +243,10 @@ namespace tut
         std::string threw;
         try
         {
-            WrapLL_ERRS capture;
+            WrapLLErrs capture;
             regionPump.post(request);
         }
-        catch (const WrapLL_ERRS::FatalException& e)
+        catch (const WrapLLErrs::FatalException& e)
         {
             threw = e.what();
         }
diff --git a/indra/newview/tests/llxmlrpclistener_test.cpp b/indra/newview/tests/llxmlrpclistener_test.cpp
index 20f913b67083be6aeef3635428f8dbb9b2a35d90..6e9756e7d5305f9b8fd3e0a4b9242ac8d4420ee6 100755
--- a/indra/newview/tests/llxmlrpclistener_test.cpp
+++ b/indra/newview/tests/llxmlrpclistener_test.cpp
@@ -85,7 +85,7 @@ namespace tut
     void object::test<1>()
     {
         set_test_name("request validation");
-        WrapLL_ERRS capture;
+        WrapLLErrs capture;
         LLSD request;
         request["uri"] = uri;
         std::string threw;
@@ -93,7 +93,7 @@ namespace tut
         {
             pumps.obtain("LLXMLRPCTransaction").post(request);
         }
-        catch (const WrapLL_ERRS::FatalException& e)
+        catch (const WrapLLErrs::FatalException& e)
         {
             threw = e.what();
         }
@@ -106,7 +106,7 @@ namespace tut
     void object::test<2>()
     {
         set_test_name("param types validation");
-        WrapLL_ERRS capture;
+        WrapLLErrs capture;
         LLSD request;
         request["uri"] = uri;
         request["method"] = "hello";
@@ -118,7 +118,7 @@ namespace tut
         {
             pumps.obtain("LLXMLRPCTransaction").post(request);
         }
-        catch (const WrapLL_ERRS::FatalException& e)
+        catch (const WrapLLErrs::FatalException& e)
         {
             threw = e.what();
         }