diff --git a/toxmsi/Makefile.inc b/toxmsi/Makefile.inc
index af8c7eef..7d620e70 100644
--- a/toxmsi/Makefile.inc
+++ b/toxmsi/Makefile.inc
@@ -4,7 +4,7 @@ lib_LTLIBRARIES += libtoxmsi.la
 
 libtoxmsi_la_include_HEADERS = \
                         ../toxmsi/toxmsi.h \
-                        ../toxmsi/AV_codec.h
+                        ../toxmsi/toxmedia.h
 
 libtoxmsi_la_includedir = $(includedir)/tox
 
@@ -36,8 +36,7 @@ libtoxmsi_la_LIBS    = $(NACL_LIBS)
 noinst_PROGRAMS += phone
 
 phone_SOURCES = ../toxmsi/phone.c \
-                ../toxmsi/AV_codec.h \
-                ../toxmsi/AV_codec.c
+                ../toxmsi/toxmedia.c
 
 phone_CFLAGS =  -I../toxcore \
                 -I../toxrtp \
diff --git a/toxmsi/phone.c b/toxmsi/phone.c
index f14d0323..432be94c 100644
--- a/toxmsi/phone.c
+++ b/toxmsi/phone.c
@@ -16,7 +16,7 @@
 #include <stdlib.h>
 /* #include <termios.h> Can this be removed? */
 #include <pthread.h>
-#include "AV_codec.h"
+#include "toxmedia.h"
 
 
 
diff --git a/toxmsi/phone.h b/toxmsi/phone.h
index d661dcfd..f96aac73 100644
--- a/toxmsi/phone.h
+++ b/toxmsi/phone.h
@@ -8,7 +8,7 @@
 #include "../toxrtp/tests/test_helper.h"
 #include <assert.h>
 #include <pthread.h>
-#include "AV_codec.h"
+#include "toxmedia.h"
 
 /* Define client version */
 #define _USERAGENT "tox_phone-v.0.2.1"
diff --git a/toxmsi/AV_codec.c b/toxmsi/toxmedia.c
similarity index 99%
rename from toxmsi/AV_codec.c
rename to toxmsi/toxmedia.c
index 8a50c894..4c9f5261 100644
--- a/toxmsi/AV_codec.c
+++ b/toxmsi/toxmedia.c
@@ -46,7 +46,7 @@
 #include "../toxrtp/toxrtp_message.h"
 #include "../toxrtp/tests/test_helper.h"
 #include "phone.h"
-#include "AV_codec.h"
+#include "toxmedia.h"
 
 SDL_Surface *screen;
 
diff --git a/toxmsi/AV_codec.h b/toxmsi/toxmedia.h
similarity index 100%
rename from toxmsi/AV_codec.h
rename to toxmsi/toxmedia.h