diff --git a/test/LevelMutex/MultiThreadTests.cpp b/test/LevelMutex/MultiThreadTests.cpp
index dda2fe2..06713c0 100644
--- a/test/LevelMutex/MultiThreadTests.cpp
+++ b/test/LevelMutex/MultiThreadTests.cpp
@@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
 // Part of LevelMutex test program for The Loki Library
-// Copyright (c) 2008 Richard Sposato
+// Copyright (c) 2008, 2009 Richard Sposato
 // The copyright on this file is protected under the terms of the MIT license.
 //
 // Permission to use, copy, modify, distribute and sell this software for any 
@@ -855,7 +855,7 @@ void * SafeHierarchyTest( void * p )
             {
                 thing = LevelThing::GetFromPool( ii );
                 assert( nullptr != thing );
-                LevelThing::Unlocker unlocker( thing->LockHierarchy() );
+                LevelThing::MyUnlocker unlocker( thing->LockHierarchy() );
                 (void)unlocker;
                 thing->SetValue( value );
                 ::GoToSleep( 3 );
@@ -867,7 +867,7 @@ void * SafeHierarchyTest( void * p )
                 const unsigned int randomIndex = ( ::rand() % thingCount );
                 thing = LevelThing::GetFromPool( randomIndex );
                 assert( nullptr != thing );
-                LevelThing::Unlocker unlocker( thing->LockHierarchy() );
+                LevelThing::MyUnlocker unlocker( thing->LockHierarchy() );
                 (void)unlocker;
                 thing->SetValue( value );
                 ::GoToSleep( 3 );
diff --git a/test/LevelMutex/Thing.hpp b/test/LevelMutex/Thing.hpp
index 7d1a54d..8c134cd 100644
--- a/test/LevelMutex/Thing.hpp
+++ b/test/LevelMutex/Thing.hpp
@@ -1,12 +1,12 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
 // Part of LevelMutex test program for The Loki Library
-// Copyright (c) 2008 Richard Sposato
+// Copyright (c) 2008, 2009 Richard Sposato
 // The copyright on this file is protected under the terms of the MIT license.
 //
-// Permission to use, copy, modify, distribute and sell this software for any 
-// purpose is hereby granted without fee, provided that the above copyright 
-// notice appear in all copies and that both that copyright notice and this 
+// Permission to use, copy, modify, distribute and sell this software for any
+// purpose is hereby granted without fee, provided that the above copyright
+// notice appear in all copies and that both that copyright notice and this
 // permission notice appear in supporting documentation.
 //
 // The author makes no representations about the suitability of this software
@@ -207,7 +207,7 @@ class LevelThing
 {
 public:
 
-    typedef Unlocker< LevelThing > Unlocker;
+    typedef Unlocker< LevelThing > MyUnlocker;
 
     static volatile LevelThing * GetFromPool( unsigned int index );
 
@@ -215,7 +215,7 @@ public:
 
     static void DestroyPool( void );
 
-    Unlocker LockHierarchy( void ) volatile;
+    MyUnlocker LockHierarchy( void ) volatile;
 
     void UnlockHierarchy( void ) volatile;