diff --git a/core/imageboard.pack.php b/core/imageboard.pack.php
index b8127e06..2a4b6a23 100644
--- a/core/imageboard.pack.php
+++ b/core/imageboard.pack.php
@@ -462,7 +462,7 @@ class Image {
 
 		assert(is_array($tags));
 
-		$tags = Tag::resolve_list($tags);
+		$tags = Tag::resolve_aliases($tags);
 
 		assert(is_array($tags));
 		assert(count($tags) > 0);
@@ -1054,7 +1054,7 @@ class Tag {
 	 * @param $tags Array of tags
 	 * @return Array of tags
 	 */
-	public static function resolve_list($tags) {
+	public static function resolve_aliases($tags) {
 		assert(is_array($tags));
 
 		$new = array();
diff --git a/ext/index/main.php b/ext/index/main.php
index 0b7ae1d0..39493921 100644
--- a/ext/index/main.php
+++ b/ext/index/main.php
@@ -147,7 +147,7 @@ class Index extends Extension {
 		global $config, $database, $page, $user;
 		if($event->page_matches("post/list")) {
 			if(isset($_GET['search'])) {
-				$search = url_escape(Tag::implode(Tag::resolve_list(Tag::explode($_GET['search'], false))));
+				$search = url_escape(Tag::implode(Tag::resolve_aliases(Tag::explode($_GET['search'], false))));
 				if(empty($search)) {
 					$page->set_mode("redirect");
 					$page->set_redirect(make_link("post/list/1"));