diff --git a/HTML_Generator.php b/Generator.php
similarity index 94%
rename from HTML_Generator.php
rename to Generator.php
index 4e41376c..0bd0f602 100644
--- a/HTML_Generator.php
+++ b/Generator.php
@@ -1,6 +1,6 @@
 <?php
 
-class HTML_Generator
+class HTMLPurifier_Generator
 {
     
     function generateFromTokens($tokens) {
diff --git a/HTML_Purifier.php b/HTML_Purifier.php
index cdf7ef57..f55cf3cd 100644
--- a/HTML_Purifier.php
+++ b/HTML_Purifier.php
@@ -10,7 +10,7 @@ class HTML_Purifier
     function HTML_Purifier() {
         $this->lexer = new HTMLPurifier_Lexer();
         $this->definition = new PureHTMLDefinition();
-        $this->generator = new HTML_Generator();
+        $this->generator = new HTMLPurifier_Generator();
     }
     
     function purify($html) {
diff --git a/PureHTMLDefinition.php b/PureHTMLDefinition.php
index cb51bfe6..85fd5637 100644
--- a/PureHTMLDefinition.php
+++ b/PureHTMLDefinition.php
@@ -29,7 +29,7 @@ class PureHTMLDefinition
         );
     
     function PureHTMLDefinition() {
-        $this->generator = new HTML_Generator();
+        $this->generator = new HTMLPurifier_Generator();
     }
     
     function loadData() {
@@ -506,7 +506,7 @@ class HTMLDTD_ChildDef_Simple extends HTMLDTD_ChildDef
         $elements = array_flip($elements);
         foreach ($elements as $i => $x) $elements[$i] = true;
         $this->elements = $elements;
-        $this->gen = new HTML_Generator();
+        $this->gen = new HTMLPurifier_Generator();
     }
     function validateChildren() {
         trigger_error('Cannot call abstract function!', E_USER_ERROR);
diff --git a/tester.php b/tester.php
index 5f172223..48b5c933 100644
--- a/tester.php
+++ b/tester.php
@@ -8,7 +8,7 @@ require_once 'HTML_Purifier.php';
 require_once 'Lexer.php';
 require_once 'Token.php';
 require_once 'PureHTMLDefinition.php';
-require_once 'HTML_Generator.php';
+require_once 'Generator.php';
 
 $test = new GroupTest('HTML_Purifier');
 
@@ -17,7 +17,7 @@ $test->addTestFile('HTML_Purifier.php');
 $test->addTestFile('Lexer.php');
 //$test->addTestFile('Token.php');
 $test->addTestFile('PureHTMLDefinition.php');
-$test->addTestFile('HTML_Generator.php');
+$test->addTestFile('Generator.php');
 chdir('../');
 
 $test->run( new HtmlReporter() );
diff --git a/tests/HTML_Generator.php b/tests/Generator.php
similarity index 91%
rename from tests/HTML_Generator.php
rename to tests/Generator.php
index d7e3da55..ce0a2d14 100644
--- a/tests/HTML_Generator.php
+++ b/tests/Generator.php
@@ -1,13 +1,13 @@
 <?php
 
-class Test_HTML_Generator extends UnitTestCase
+class Test_HTMLPurifier_Generator extends UnitTestCase
 {
     
     var $gen;
     
-    function Test_HTML_Generator() {
+    function Test_HTMLPurifier_Generator() {
         $this->UnitTestCase();
-        $this->gen = new HTML_Generator();
+        $this->gen = new HTMLPurifier_Generator();
     }
     
     function test_generateFromToken() {
diff --git a/tests/PureHTMLDefinition.php b/tests/PureHTMLDefinition.php
index 843100c8..332e08e9 100644
--- a/tests/PureHTMLDefinition.php
+++ b/tests/PureHTMLDefinition.php
@@ -8,7 +8,7 @@ class Test_HTMLDTD_ChildDef extends UnitTestCase
     
     function Test_HTMLDTD_ChildDef() {
         $this->lex = new HTMLPurifier_Lexer();
-        $this->gen = new HTML_Generator();
+        $this->gen = new HTMLPurifier_Generator();
         parent::UnitTestCase();
     }