diff --git a/app/Library/getid3/getid3/extension.cache.dbm.php b/app/Library/getid3/getid3/extension.cache.dbm.php
index ada8d5bc..a9332b92 100644
--- a/app/Library/getid3/getid3/extension.cache.dbm.php
+++ b/app/Library/getid3/getid3/extension.cache.dbm.php
@@ -74,7 +74,7 @@ class getID3_cached_dbm extends getID3
 {
 
 	// public: constructor - see top of this file for cache type and cache_options
-	public function getID3_cached_dbm($cache_type, $dbm_filename, $lock_filename) {
+	public function __construct($cache_type, $dbm_filename, $lock_filename) {
 
 		// Check for dba extension
 		if (!extension_loaded('dba')) {
diff --git a/app/Library/getid3/getid3/extension.cache.mysql.php b/app/Library/getid3/getid3/extension.cache.mysql.php
index a94eb9d9..f4358211 100644
--- a/app/Library/getid3/getid3/extension.cache.mysql.php
+++ b/app/Library/getid3/getid3/extension.cache.mysql.php
@@ -80,7 +80,7 @@ class getID3_cached_mysql extends getID3
 
 
 	// public: constructor - see top of this file for cache type and cache_options
-	public function getID3_cached_mysql($host, $database, $username, $password, $table='getid3_cache') {
+	public function __construct($host, $database, $username, $password, $table='getid3_cache') {
 
 		// Check for mysql support
 		if (!function_exists('mysql_pconnect')) {
diff --git a/app/Library/getid3/getid3/module.tag.xmp.php b/app/Library/getid3/getid3/module.tag.xmp.php
index ea769876..40dd8bd8 100644
--- a/app/Library/getid3/getid3/module.tag.xmp.php
+++ b/app/Library/getid3/getid3/module.tag.xmp.php
@@ -399,7 +399,7 @@ class Image_XMP
 	*
 	* @param string - Name of the image file to access and extract XMP information from.
 	*/
-	public function Image_XMP($sFilename)
+	public function __construct($sFilename)
 	{
 		$this->_sFilename = $sFilename;
 
diff --git a/app/Library/getid3/getid3/write.apetag.php b/app/Library/getid3/getid3/write.apetag.php
index f1f82bc4..d6044b29 100644
--- a/app/Library/getid3/getid3/write.apetag.php
+++ b/app/Library/getid3/getid3/write.apetag.php
@@ -26,7 +26,7 @@ class getid3_write_apetag
 	public $warnings                   = array(); // any non-critical errors will be stored here
 	public $errors                     = array(); // any critical errors will be stored here
 
-	public function getid3_write_apetag() {
+	public function __construct() {
 		return true;
 	}
 
diff --git a/app/Library/getid3/getid3/write.id3v1.php b/app/Library/getid3/getid3/write.id3v1.php
index 878f9902..4fa6a6c3 100644
--- a/app/Library/getid3/getid3/write.id3v1.php
+++ b/app/Library/getid3/getid3/write.id3v1.php
@@ -24,7 +24,7 @@ class getid3_write_id3v1
 	public $warnings = array(); // any non-critical errors will be stored here
 	public $errors   = array(); // any critical errors will be stored here
 
-	public function getid3_write_id3v1() {
+	public function __construct() {
 		return true;
 	}
 
diff --git a/app/Library/getid3/getid3/write.id3v2.php b/app/Library/getid3/getid3/write.id3v2.php
index 236e2ff4..d3fa84c4 100644
--- a/app/Library/getid3/getid3/write.id3v2.php
+++ b/app/Library/getid3/getid3/write.id3v2.php
@@ -30,7 +30,7 @@ class getid3_write_id3v2
 	public $warnings                    = array();  // any non-critical errors will be stored here
 	public $errors                      = array();  // any critical errors will be stored here
 
-	public function getid3_write_id3v2() {
+	public function __construct() {
 		return true;
 	}
 
diff --git a/app/Library/getid3/getid3/write.lyrics3.php b/app/Library/getid3/getid3/write.lyrics3.php
index 6546c3eb..12275f49 100644
--- a/app/Library/getid3/getid3/write.lyrics3.php
+++ b/app/Library/getid3/getid3/write.lyrics3.php
@@ -23,7 +23,7 @@ class getid3_write_lyrics3
 	public $warnings        = array(); // any non-critical errors will be stored here
 	public $errors          = array(); // any critical errors will be stored here
 
-	public function getid3_write_lyrics3() {
+	public function __construct() {
 		return true;
 	}
 
diff --git a/app/Library/getid3/getid3/write.metaflac.php b/app/Library/getid3/getid3/write.metaflac.php
index d7bee70a..186e2c17 100644
--- a/app/Library/getid3/getid3/write.metaflac.php
+++ b/app/Library/getid3/getid3/write.metaflac.php
@@ -23,7 +23,7 @@ class getid3_write_metaflac
 	public $warnings = array(); // any non-critical errors will be stored here
 	public $errors   = array(); // any critical errors will be stored here
 
-	public function getid3_write_metaflac() {
+	public function __construct() {
 		return true;
 	}
 
diff --git a/app/Library/getid3/getid3/write.php b/app/Library/getid3/getid3/write.php
index 9a7ec519..ea136934 100644
--- a/app/Library/getid3/getid3/write.php
+++ b/app/Library/getid3/getid3/write.php
@@ -64,7 +64,7 @@ class getid3_writetags
 	// private
 	private $ThisFileInfo; // analysis of file before writing
 
-	public function getid3_writetags() {
+	public function __construct() {
 		return true;
 	}
 
diff --git a/app/Library/getid3/getid3/write.real.php b/app/Library/getid3/getid3/write.real.php
index 04210e04..fd67c859 100644
--- a/app/Library/getid3/getid3/write.real.php
+++ b/app/Library/getid3/getid3/write.real.php
@@ -23,7 +23,7 @@ class getid3_write_real
 	public $errors            = array(); // any critical errors will be stored here
 	public $paddedlength      = 512;     // minimum length of CONT tag in bytes
 
-	public function getid3_write_real() {
+	public function __construct() {
 		return true;
 	}
 
diff --git a/app/Library/getid3/getid3/write.vorbiscomment.php b/app/Library/getid3/getid3/write.vorbiscomment.php
index 65f34b39..971f91fe 100644
--- a/app/Library/getid3/getid3/write.vorbiscomment.php
+++ b/app/Library/getid3/getid3/write.vorbiscomment.php
@@ -23,7 +23,7 @@ class getid3_write_vorbiscomment
 	public $warnings = array(); // any non-critical errors will be stored here
 	public $errors   = array(); // any critical errors will be stored here
 
-	public function getid3_write_vorbiscomment() {
+	public function __construct() {
 		return true;
 	}