diff --git a/contrib/danbooru_api/main.php b/contrib/danbooru_api/main.php
index 1f1fc5cb..6cf011f0 100644
--- a/contrib/danbooru_api/main.php
+++ b/contrib/danbooru_api/main.php
@@ -192,7 +192,7 @@ class DanbooruApi implements Extension
 				}
 
 				// Get tags out of url
-				$posttags = tag_explode(isset($_REQUEST['tags']) ? $_REQUEST['tags'] : $_REQUEST['post']['tags']);
+				$posttags = Tag::explode(isset($_REQUEST['tags']) ? $_REQUEST['tags'] : $_REQUEST['post']['tags']);
 				$hash = md5_file($file);
 				// Was an md5 supplied? Does it match the file hash?
 				if(isset($_REQUEST['md5']))
@@ -282,7 +282,7 @@ class DanbooruApi implements Extension
 			{
 				$limit = isset($_GET['limit']) ? int_escape($_GET['limit']) : 100;
 				$start = isset($_GET['offset']) ? int_escape($_GET['offset']) : 0;
-				$tags = isset($_GET['tags']) ? tag_explode($_GET['tags']) : array();
+				$tags = isset($_GET['tags']) ? Tag::explode($_GET['tags']) : array();
 				$results = Image::find_images($config,$database,$start,$limit,$tags);
 			}
 
@@ -340,7 +340,7 @@ class DanbooruApi implements Extension
 			elseif(isset($_GET['tags']))
 			{
 				$start = isset($_GET['after_id']) ? int_escape($_GET['offset']) : 0;
-				$tags = tag_explode($_GET['tags']);
+				$tags = Tag::explode($_GET['tags']);
 
 			}
 			*/
diff --git a/contrib/handle_flash/main.php b/contrib/handle_flash/main.php
index ec1fe485..408b3578 100644
--- a/contrib/handle_flash/main.php
+++ b/contrib/handle_flash/main.php
@@ -51,7 +51,7 @@ class FlashFileHandler implements Extension {
 		$image->hash      = $metadata['hash'];
 		$image->filename  = $metadata['filename'];
 		$image->ext       = $metadata['extension'];
-		$image->tag_array = tag_explode($metadata['tags']);
+		$image->tag_array = Tag::explode($metadata['tags']);
 		$image->source    = $metadata['source'];
 
 		// redundant, since getimagesize() works on SWF o_O
diff --git a/contrib/handle_ico/main.php b/contrib/handle_ico/main.php
index 182f8d43..532b23b3 100644
--- a/contrib/handle_ico/main.php
+++ b/contrib/handle_ico/main.php
@@ -69,7 +69,7 @@ class IcoFileHandler implements Extension {
 		$image->hash      = $metadata['hash'];
 		$image->filename  = $metadata['filename'];
 		$image->ext       = $metadata['extension'];
-		$image->tag_array = tag_explode($metadata['tags']);
+		$image->tag_array = Tag::explode($metadata['tags']);
 		$image->source    = $metadata['source'];
 
 		return $image;
diff --git a/contrib/handle_mp3/main.php b/contrib/handle_mp3/main.php
index a0e1fcb3..7d0715f4 100644
--- a/contrib/handle_mp3/main.php
+++ b/contrib/handle_mp3/main.php
@@ -53,7 +53,7 @@ class MP3FileHandler implements Extension {
 		$image->hash      = $metadata['hash'];
 		$image->filename  = $metadata['filename'];
 		$image->ext       = $metadata['extension'];
-		$image->tag_array = tag_explode($metadata['tags']);
+		$image->tag_array = Tag::explode($metadata['tags']);
 		$image->source    = $metadata['source'];
 
 		return $image;
diff --git a/contrib/handle_svg/main.php b/contrib/handle_svg/main.php
index 4859f93b..d9548a0a 100644
--- a/contrib/handle_svg/main.php
+++ b/contrib/handle_svg/main.php
@@ -79,7 +79,7 @@ class SVGFileHandler implements Extension {
 		$image->hash      = $metadata['hash'];
 		$image->filename  = $metadata['filename'];
 		$image->ext       = $metadata['extension'];
-		$image->tag_array = tag_explode($metadata['tags']);
+		$image->tag_array = Tag::explode($metadata['tags']);
 		$image->source    = $metadata['source'];
 
 		return $image;
diff --git a/ext/handle_pixel/main.php b/ext/handle_pixel/main.php
index 16912456..489d0d4e 100644
--- a/ext/handle_pixel/main.php
+++ b/ext/handle_pixel/main.php
@@ -54,7 +54,7 @@ class PixelFileHandler implements Extension {
 		$image->hash      = $metadata['hash'];
 		$image->filename  = $metadata['filename'];
 		$image->ext       = $metadata['extension'];
-		$image->tag_array = tag_explode($metadata['tags']);
+		$image->tag_array = Tag::explode($metadata['tags']);
 		$image->source    = $metadata['source'];
 
 		return $image;
diff --git a/ext/upload/main.php b/ext/upload/main.php
index 44c8fca1..ad5c704b 100644
--- a/ext/upload/main.php
+++ b/ext/upload/main.php
@@ -55,7 +55,7 @@ class Upload implements Extension {
 
 		if(($event instanceof PageRequestEvent) && $event->page_matches("upload")) {
 			if(count($_FILES) + count($_POST) > 0) {
-				$tags = tag_explode($_POST['tags']);
+				$tags = Tag::explode($_POST['tags']);
 				$source = isset($_POST['source']) ? $_POST['source'] : null;
 				global $user;
 				if($this->can_upload($user)) {
@@ -81,7 +81,7 @@ class Upload implements Extension {
 					$url = $_GET['url'];
 					$tags = array('tagme');
 					if(!empty($_GET['tags']) && $_GET['tags'] != "null") {
-						$tags = tag_explode($_GET['tags']);
+						$tags = Tag::explode($_GET['tags']);
 					}
 					$ok = $this->try_transload($url, $tags, $url);
 					$this->theme->display_upload_status($event->page, $ok);