diff --git a/core/core.cpp b/core/core.cpp
index a3d6ab00..1c73e5a9 100644
--- a/core/core.cpp
+++ b/core/core.cpp
@@ -24,7 +24,7 @@ void core_init(int *argc, char ***argv, struct core_init_data *init)
 	audio_init(argc, argv, init->audio_ops);
 }
 
-void core :: deinit()
+void core_deinit()
 {
 	audio_deinit();
 	tempq_deinit();
diff --git a/gui/ocarina.cpp b/gui/ocarina.cpp
index 5192a2a9..d961412a 100644
--- a/gui/ocarina.cpp
+++ b/gui/ocarina.cpp
@@ -74,7 +74,7 @@ int main(int argc, char **argv)
 
 	ocarina_app->signal_window_removed().connect(sigc::ptr_fun(on_window_removed));
 	ocarina_app->run(*window, argc, argv);
-	core :: deinit();
+	core_deinit();
 	cleanup_tabs();
 
 	return 0;
diff --git a/include/core/core.h b/include/core/core.h
index 901e8c49..45580219 100644
--- a/include/core/core.h
+++ b/include/core/core.h
@@ -15,17 +15,11 @@ struct core_init_data {
 	struct audio_ops *audio_ops;
 };
 
-/**
- * Namespace for basic core library functions.
- */
-namespace core
-{
-
-	void deinit();
-
-}
 
 /* Called to initialize all core Ocarina components. */
 void core_init(int *, char ***, struct core_init_data *);
 
+/* Called to deinitialize all core Ocarina componentns. */
+void core_deinit();
+
 #endif /* OCARINA_CORE_CORE_H */
diff --git a/tests/core/audio.cpp b/tests/core/audio.cpp
index 9bbb792c..002ecd4f 100644
--- a/tests/core/audio.cpp
+++ b/tests/core/audio.cpp
@@ -236,8 +236,7 @@ void test_autopause()
 
 static void test_deinit()
 {
-	core :: deinit();
-
+	core_deinit();
 	test_equal(audio_cur_track(), NULL);
 	test_equal(audio_get_player(), NULL);
 }