diff --git a/README b/README
index 4cf8f2d..1da1d4f 100644
--- a/README
+++ b/README
@@ -6,7 +6,7 @@ development and low-volume web sites using PEAR2 packages.
 To use:
 
 <?php
-require '/path/to/pear2/Autoload.php';
+require '/path/to/PEAR2/Autoload.php';
 // now use class names from installed PEAR2
 // packages at will
 ?>
\ No newline at end of file
diff --git a/package.xml b/package.xml
index 1118446..2fe6f26 100644
--- a/package.xml
+++ b/package.xml
@@ -11,7 +11,7 @@ development and low-volume web sites using PEAR2 packages.
 To use:
 
 &lt;?php
-require '/path/to/pear2/Autoload.php';
+require '/path/to/PEAR2/Autoload.php';
 // now use class names from installed PEAR2
 // packages at will
 ?&gt;</description>
@@ -27,8 +27,8 @@ require '/path/to/pear2/Autoload.php';
   <email>saltybeagle@php.net</email>
   <active>yes</active>
  </lead>
- <date>2010-03-16</date>
- <time>14:27:37</time>
+ <date>2010-05-11</date>
+ <time>21:31:21</time>
  <version>
   <release>0.1.1</release>
   <api>0.1.0</api>
@@ -43,7 +43,7 @@ This will help during the transition from pear2 to PEAR2.
 </notes>
  <contents>
   <dir name="/">
-   <dir name="src" baseinstalldir="pear2">
+   <dir name="src" baseinstalldir="PEAR2">
     <file role="php" name="Autoload.php"/>
    </dir>
   </dir>
diff --git a/package_compatible.xml b/package_compatible.xml
index d36a9b1..629c268 100644
--- a/package_compatible.xml
+++ b/package_compatible.xml
@@ -11,7 +11,7 @@ development and low-volume web sites using PEAR2 packages.
 To use:
 
 &lt;?php
-require '/path/to/pear2/Autoload.php';
+require '/path/to/PEAR2/Autoload.php';
 // now use class names from installed PEAR2
 // packages at will
 ?&gt;</description>
@@ -27,8 +27,8 @@ require '/path/to/pear2/Autoload.php';
   <email>saltybeagle@php.net</email>
   <active>yes</active>
  </lead>
- <date>2010-03-16</date>
- <time>14:27:37</time>
+ <date>2010-05-11</date>
+ <time>21:31:21</time>
  <version>
   <release>0.1.1</release>
   <api>0.1.0</api>
@@ -43,7 +43,7 @@ This will help during the transition from pear2 to PEAR2.
 </notes>
  <contents>
   <dir name="/">
-   <file role="php" name="php/pear2/Autoload.php"/>
+   <file role="php" name="php/PEAR2/Autoload.php"/>
   </dir>
  </contents>
  <dependencies>
@@ -58,7 +58,7 @@ This will help during the transition from pear2 to PEAR2.
  </dependencies>
  <phprelease>
   <filelist>
-   <install name="php/pear2/Autoload.php" as="pear2/Autoload.php"/>
+   <install name="php/PEAR2/Autoload.php" as="PEAR2/Autoload.php"/>
   </filelist>
  </phprelease>
 </package>
diff --git a/src/Autoload.php b/src/Autoload.php
index 42608a2..e6026db 100644
--- a/src/Autoload.php
+++ b/src/Autoload.php
@@ -1,6 +1,6 @@
 <?php
-namespace pear2;
-if (!class_exists('\pear2\Autoload', false)) {
+namespace PEAR2;
+if (!class_exists('\PEAR2\Autoload', false)) {
     class Autoload
     {
         /**
@@ -40,7 +40,7 @@ protected static function register()
             if (!self::$registered) {
                 // set up __autoload
                 $autoload = spl_autoload_functions();
-                spl_autoload_register('pear2\Autoload::load');
+                spl_autoload_register('PEAR2\Autoload::load');
                 if (function_exists('__autoload') && ($autoload === false)) {
                     // __autoload() was being used, but now would be ignored, add
                     // it to the autoload stack
@@ -77,7 +77,7 @@ protected static function addPath($path)
          */
         static function load($class)
         {
-            if (strtolower(substr($class, 0, 6)) !== 'pear2\\') {
+            if (strtolower(substr($class, 0, 6)) !== 'PEAR2\\') {
                 return false;
             }
             $file = str_replace(array('_', '\\'), DIRECTORY_SEPARATOR, $class) . '.php';