diff --git a/PEAR/PackageFileManager/ComplexGenerator.php b/PEAR/PackageFileManager/ComplexGenerator.php
index 749d56f..d46a201 100644
--- a/PEAR/PackageFileManager/ComplexGenerator.php
+++ b/PEAR/PackageFileManager/ComplexGenerator.php
@@ -36,7 +36,7 @@ class PEAR_PackageFileManager_ComplexGenerator extends PEAR_PackageFile_Generato
     /**
      * remove a warning about missing parameters - don't delete this
      */
-    function PEAR_PackageFileManager_ComplexGenerator()
+    function __construct()
     {
     }
 
diff --git a/PEAR/PackageFileManager/Cvs.php b/PEAR/PackageFileManager/Cvs.php
index c38429e..c577418 100644
--- a/PEAR/PackageFileManager/Cvs.php
+++ b/PEAR/PackageFileManager/Cvs.php
@@ -42,9 +42,9 @@ class PEAR_PackageFileManager_CVS extends PEAR_PackageFileManager_File
      */
     var $_cvsIgnore = array('.cvsignore');
 
-    function PEAR_PackageFileManager_CVS($options)
+    function __construct($options)
     {
-        parent::PEAR_PackageFileManager_File($options);
+        parent::__construct($options);
     }
 
     /**
@@ -198,4 +198,4 @@ function _isCVSFile($cvsentry)
         // but not committed yet
         return $cvsentry{0} == '/' && !strpos($cvsentry, 'dummy timestamp');
     }
-}
\ No newline at end of file
+}
diff --git a/PEAR/PackageFileManager/File.php b/PEAR/PackageFileManager/File.php
index 076c0fb..f78bc88 100644
--- a/PEAR/PackageFileManager/File.php
+++ b/PEAR/PackageFileManager/File.php
@@ -60,7 +60,7 @@ class PEAR_PackageFileManager_File extends PEAR_PackageFileManager_Plugins
      *
      * @return void
      */
-    function PEAR_PackageFileManager_File($options)
+    function __construct($options)
     {
         $this->windows = strtoupper(substr(PHP_OS, 0, 3)) == 'WIN';
         $this->setOptions($options);
@@ -489,4 +489,4 @@ function mystrucsort($a, $b)
         return strnatcasecmp($a, $b);
     }
     /**#@-*/
-}
\ No newline at end of file
+}
diff --git a/PEAR/PackageFileManager/SimpleGenerator.php b/PEAR/PackageFileManager/SimpleGenerator.php
index 3c93ca2..c442d03 100644
--- a/PEAR/PackageFileManager/SimpleGenerator.php
+++ b/PEAR/PackageFileManager/SimpleGenerator.php
@@ -35,7 +35,7 @@ class PEAR_PackageFileManager_SimpleGenerator extends PEAR_PackageFile_Generator
     /**
      * remove a warning about missing parameters - don't delete this
      */
-    function PEAR_PackageFileManager_SimpleGenerator()
+    function __construct()
     {
     }
 
diff --git a/PEAR/PackageFileManager/Svn.php b/PEAR/PackageFileManager/Svn.php
index d285937..783450e 100644
--- a/PEAR/PackageFileManager/Svn.php
+++ b/PEAR/PackageFileManager/Svn.php
@@ -39,9 +39,9 @@
  */
 class PEAR_PackageFileManager_Svn extends PEAR_PackageFileManager_File
 {
-    function PEAR_PackageFileManager_Svn($options)
+    function __construct($options)
     {
-        parent::PEAR_PackageFileManager_File($options);
+        parent::__construct($options);
     }
 
     /**