diff --git a/core/tags/album.cpp b/core/tags/album.cpp
index 5c47a2b9..63261041 100644
--- a/core/tags/album.cpp
+++ b/core/tags/album.cpp
@@ -74,7 +74,7 @@ struct album *tags :: get_album(const std::string &name, unsigned int year)
 	return db_find(&album_db, make_key(name, year).c_str());
 }
 
-struct album *tags ::get_album(const unsigned int index)
+struct album *album_get(const unsigned int index)
 {
 	return db_at(&album_db, index);
 }
diff --git a/core/tags/track.cpp b/core/tags/track.cpp
index a3e1be14..727c7dd0 100644
--- a/core/tags/track.cpp
+++ b/core/tags/track.cpp
@@ -122,7 +122,7 @@ void Track :: read(file &file)
 
 	_library = tags :: get_library(library_id);
 	_artist  = tags :: get_artist(artist_id);
-	_album   = tags :: get_album(album_id);
+	_album   = album_get(album_id);
 	_genre   = tags :: get_genre(genre_id);
 
 	filter :: add(name(), index());
diff --git a/include/core/tags/album.h b/include/core/tags/album.h
index 9c86e766..20daaf85 100644
--- a/include/core/tags/album.h
+++ b/include/core/tags/album.h
@@ -79,14 +79,10 @@ namespace tags
 	 */
 	struct album *get_album(const std::string &, unsigned int);
 
-	/**
-	 * Called to look up an Album tag by tag index.
-	 *
-	 * @param  index  The index of the Album tag.
-	 * @return A matching Album tag or NULL.
-	 */
-	struct album *get_album(const unsigned int);
-
 } /* Namespace: tags */
 
+
+/* Called to get an album tag with a specific index. */
+struct album *album_get(const unsigned int);
+
 #endif /* OCARINA_CORE_TAGS_ALBUM_H */
diff --git a/tests/core/tags/album.cpp b/tests/core/tags/album.cpp
index cfa85b45..175db94f 100644
--- a/tests/core/tags/album.cpp
+++ b/tests/core/tags/album.cpp
@@ -71,8 +71,8 @@ static void test_album_db()
 	test_verify_hyrule(album);
 
 	test_equal(tags :: get_album("Hyrule Symphony", 1998), album);
-	test_equal(tags :: get_album(0), album);
-	test_equal(tags :: get_album(1), (struct album *)NULL);
+	test_equal(album_get(0), album);
+	test_equal(album_get(1), (struct album *)NULL);
 
 	db_init(&album_db, "album.db", false);
 	db_load(&album_db);