diff --git a/library/HTMLPurifier/Language/messages/en-x-test.php b/library/HTMLPurifier/Language/messages/en-x-test.php
index 115662bd..dadd6461 100644
--- a/library/HTMLPurifier/Language/messages/en-x-test.php
+++ b/library/HTMLPurifier/Language/messages/en-x-test.php
@@ -5,7 +5,7 @@
 $fallback = 'en';
 
 $messages = array(
-    'htmlpurifier' => 'HTML Purifier X'
+    'HTMLPurifier' => 'HTML Purifier X'
 );
 
 ?>
\ No newline at end of file
diff --git a/library/HTMLPurifier/Language/messages/en.php b/library/HTMLPurifier/Language/messages/en.php
index 11c1d842..72613975 100644
--- a/library/HTMLPurifier/Language/messages/en.php
+++ b/library/HTMLPurifier/Language/messages/en.php
@@ -4,8 +4,8 @@ $fallback = false;
 
 $messages = array(
 
-'htmlpurifier' => 'HTML Purifier',
-'pizza' => 'Pizza', // for unit testing purposes
+'HTMLPurifier' => 'HTML Purifier',
+'LanguageFactoryTest: Pizza' => 'Pizza', // for unit testing purposes
 
 'ErrorCollector: No errors' => 'No errors',
 'ErrorCollector: At line' => ' at line $line',
diff --git a/tests/HTMLPurifier/LanguageFactoryTest.php b/tests/HTMLPurifier/LanguageFactoryTest.php
index 1355b5d9..fd81d4c5 100644
--- a/tests/HTMLPurifier/LanguageFactoryTest.php
+++ b/tests/HTMLPurifier/LanguageFactoryTest.php
@@ -35,10 +35,10 @@ class HTMLPurifier_LanguageFactoryTest extends UnitTestCase
         $language->load();
         
         // test overloaded message
-        $this->assertIdentical($language->getMessage('htmlpurifier'), 'HTML Purifier X');
+        $this->assertIdentical($language->getMessage('HTMLPurifier'), 'HTML Purifier X');
         
         // test inherited message
-        $this->assertIdentical($language->getMessage('pizza'), 'Pizza');
+        $this->assertIdentical($language->getMessage('LanguageFactoryTest: Pizza'), 'Pizza');
         
     }
     
diff --git a/tests/HTMLPurifier/LanguageTest.php b/tests/HTMLPurifier/LanguageTest.php
index 63f37fbd..b6fcede4 100644
--- a/tests/HTMLPurifier/LanguageTest.php
+++ b/tests/HTMLPurifier/LanguageTest.php
@@ -10,16 +10,16 @@ class HTMLPurifier_LanguageTest extends UnitTestCase
     function test_getMessage() {
         $lang = new HTMLPurifier_Language();
         $lang->_loaded = true;
-        $lang->messages['htmlpurifier'] = 'HTML Purifier';
-        $this->assertIdentical($lang->getMessage('htmlpurifier'), 'HTML Purifier');
-        $this->assertIdentical($lang->getMessage('totally-non-existent-key'), '[totally-non-existent-key]');
+        $lang->messages['HTMLPurifier'] = 'HTML Purifier';
+        $this->assertIdentical($lang->getMessage('HTMLPurifier'), 'HTML Purifier');
+        $this->assertIdentical($lang->getMessage('LanguageTest: Totally non-existent key'), '[LanguageTest: Totally non-existent key]');
     }
     
     function test_formatMessage() {
         $lang = new HTMLPurifier_Language();
         $lang->_loaded = true;
-        $lang->messages['error'] = 'Error is $1 on line $2';
-        $this->assertIdentical($lang->formatMessage('error', array(1=>'fatal', 32)), 'Error is fatal on line 32');
+        $lang->messages['LanguageTest: Error'] = 'Error is $1 on line $2';
+        $this->assertIdentical($lang->formatMessage('LanguageTest: Error', array(1=>'fatal', 32)), 'Error is fatal on line 32');
     }
     
 }