diff --git a/src/Makefile.am b/src/Makefile.am
index 6f972125..c626a64a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,6 +1,6 @@
 bin_PROGRAMS = ncmpcpp
-ncmpcpp_SOURCES = browser.cpp charset.cpp clock.cpp display.cpp help.cpp \
-	helpers.cpp info.cpp libmpdclient.c lyrics.cpp media_library.cpp menu.cpp misc.cpp \
+ncmpcpp_SOURCES = browser.cpp charset.cpp clock.cpp conv.cpp display.cpp help.cpp \
+	helpers.cpp info.cpp libmpdclient.c lyrics.cpp media_library.cpp menu.cpp \
 	mpdpp.cpp ncmpcpp.cpp outputs.cpp playlist.cpp playlist_editor.cpp scrollpad.cpp \
 	search_engine.cpp settings.cpp song.cpp status.cpp str_pool.c tag_editor.cpp \
 	visualizer.cpp window.cpp
@@ -10,7 +10,7 @@ INCLUDES= $(all_includes)
 
 # the library search path.
 ncmpcpp_LDFLAGS = $(all_libraries)
-noinst_HEADERS = browser.h charset.h clock.h display.h global.h help.h \
+noinst_HEADERS = browser.h charset.h clock.h conv.h display.h global.h help.h \
 	helpers.h home.h info.h lyrics.h media_library.h menu.h mpdpp.h outputs.h \
 	playlist_editor.h screen.h scrollpad.h search_engine.h settings.h song.h tag_editor.h \
 	visualizer.h window.h
diff --git a/src/misc.cpp b/src/conv.cpp
similarity index 99%
rename from src/misc.cpp
rename to src/conv.cpp
index f91e6493..3a406c11 100644
--- a/src/misc.cpp
+++ b/src/conv.cpp
@@ -21,7 +21,7 @@
 #include <algorithm>
 #include <sstream>
 
-#include "misc.h"
+#include "conv.h"
 
 void ToLower(std::string &s)
 {
diff --git a/src/misc.h b/src/conv.h
similarity index 100%
rename from src/misc.h
rename to src/conv.h
diff --git a/src/helpers.h b/src/helpers.h
index 4f43d28b..9f388e9f 100644
--- a/src/helpers.h
+++ b/src/helpers.h
@@ -21,7 +21,7 @@
 #ifndef _HELPERS_H
 #define _HELPERS_H
 
-#include "misc.h"
+#include "conv.h"
 #include "mpdpp.h"
 #include "ncmpcpp.h"
 #include "settings.h"
diff --git a/src/song.cpp b/src/song.cpp
index 98cc27b9..c9bda087 100644
--- a/src/song.cpp
+++ b/src/song.cpp
@@ -28,7 +28,7 @@
 #include <stdexcept>
 
 #include "charset.h"
-#include "misc.h"
+#include "conv.h"
 #include "song.h"
 
 MPD::Song::Song(mpd_Song *s, bool copy_ptr) : 	itsSong(s ? s : mpd_newSong()),