diff --git a/core/core.cpp b/core/core.cpp
index 5dcee0bf..e57c75dd 100644
--- a/core/core.cpp
+++ b/core/core.cpp
@@ -15,7 +15,7 @@ extern "C" {
 void core :: init()
 {
 	filter_init();
-	tags     :: init();
+	tags_init();
 	collection :: init();
 	playlist :: init();
 	deck     :: init();
diff --git a/core/tags/tags.cpp b/core/tags/tags.cpp
index fa1e24c4..be5e134d 100644
--- a/core/tags/tags.cpp
+++ b/core/tags/tags.cpp
@@ -10,7 +10,7 @@ extern "C" {
 #include <core/tags/tags.h>
 #include <core/tags/track.h>
 
-void tags :: init()
+void tags_init()
 {
 	album_db_init();
 	artist_db_init();
diff --git a/include/core/tags/tags.h b/include/core/tags/tags.h
index ae8e59f0..b4812cdd 100644
--- a/include/core/tags/tags.h
+++ b/include/core/tags/tags.h
@@ -10,10 +10,12 @@
 namespace tags
 {
 
-	/** Called to read all databases from disk. */
-	void init();
 	void deinit();
 
 }
 
+
+/* Called to initialize and read all databases from disk. */
+void tags_init();
+
 #endif /* OCARINA_CORE_TAGS_TAGS_H */
diff --git a/tests/core/audio.cpp b/tests/core/audio.cpp
index 4acfb774..2b1e804c 100644
--- a/tests/core/audio.cpp
+++ b/tests/core/audio.cpp
@@ -86,7 +86,7 @@ void test_init()
 	test_equal(track, TRACK_NULL);
 
 	filter_init();
-	tags :: init();
+	tags_init();
 	collection :: init();
 	audio :: init();
 
diff --git a/tests/core/deck.cpp b/tests/core/deck.cpp
index 342b0558..5b8ce55d 100644
--- a/tests/core/deck.cpp
+++ b/tests/core/deck.cpp
@@ -22,7 +22,7 @@ static void test_init()
 
 	test_cp_data_dir();
 	filter_init();
-	tags :: init();
+	tags_init();
 	collection :: init();
 	deck :: init();
 
diff --git a/tests/core/library.cpp b/tests/core/library.cpp
index e51e2709..72ffc06f 100644
--- a/tests/core/library.cpp
+++ b/tests/core/library.cpp
@@ -22,7 +22,7 @@ static void test_init()
 
 	test_cp_data_dir();
 	filter_init();
-	tags :: init();
+	tags_init();
 	collection :: init();
 
 	test_equal(q->size(), (unsigned)24);
diff --git a/tests/core/playlist.cpp b/tests/core/playlist.cpp
index 50546145..15befbea 100644
--- a/tests/core/playlist.cpp
+++ b/tests/core/playlist.cpp
@@ -27,7 +27,7 @@ static void test_init()
 
 	test_cp_data_dir();
 	filter_init();
-	tags :: init();
+	tags_init();
 	collection :: init();
 	playlist :: init();
 
diff --git a/tests/core/queue.cpp b/tests/core/queue.cpp
index 5f1cc819..59726cf6 100644
--- a/tests/core/queue.cpp
+++ b/tests/core/queue.cpp
@@ -92,7 +92,7 @@ void test_add_remove()
 
 	test_cp_data_dir();
 	filter_init();
-	tags :: init();
+	tags_init();
 
 	test_equal(q.length(), expected);
 	test_equal(q.size(), (unsigned)0);
diff --git a/tests/core/tags/track.cpp b/tests/core/tags/track.cpp
index e4bb5db7..8aaa441e 100644
--- a/tests/core/tags/track.cpp
+++ b/tests/core/tags/track.cpp
@@ -97,7 +97,7 @@ static void test_track()
 
 	std::setlocale(LC_TIME, "C");
 	filter_init();
-	tags :: init();
+	tags_init();
 	file_init(&f, "track_tag", 0);
 	date    = string_tm2str(now);
 	library = library_find("tests/Music");