diff --git a/CMakeLists.txt b/CMakeLists.txt
index b4e18274..13fd9eb1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -225,8 +225,8 @@ if(BUILD_TOXAV)
     toxav/audio.h
     toxav/bwcontroller.c
     toxav/bwcontroller.h
-    toxav/group.c
-    toxav/group.h
+    toxav/groupav.c
+    toxav/groupav.h
     toxav/msi.c
     toxav/msi.h
     toxav/ring_buffer.c
diff --git a/toxav/Makefile.inc b/toxav/Makefile.inc
index c22d0903..b7669677 100644
--- a/toxav/Makefile.inc
+++ b/toxav/Makefile.inc
@@ -8,8 +8,8 @@ libtoxav_la_SOURCES = ../toxav/rtp.h \
                     ../toxav/rtp.c \
                     ../toxav/msi.h \
                     ../toxav/msi.c \
-                    ../toxav/group.h \
-                    ../toxav/group.c \
+                    ../toxav/groupav.h \
+                    ../toxav/groupav.c \
                     ../toxav/audio.h \
                     ../toxav/audio.c \
                     ../toxav/video.h \
diff --git a/toxav/group.c b/toxav/groupav.c
similarity index 99%
rename from toxav/group.c
rename to toxav/groupav.c
index ddefbcc4..88844536 100644
--- a/toxav/group.c
+++ b/toxav/groupav.c
@@ -22,7 +22,7 @@
 #include "config.h"
 #endif /* HAVE_CONFIG_H */
 
-#include "group.h"
+#include "groupav.h"
 
 #include "../toxcore/logger.h"
 #include "../toxcore/util.h"
diff --git a/toxav/group.h b/toxav/groupav.h
similarity index 100%
rename from toxav/group.h
rename to toxav/groupav.h
diff --git a/toxav/toxav_old.c b/toxav/toxav_old.c
index 767fac9c..63f81f96 100644
--- a/toxav/toxav_old.c
+++ b/toxav/toxav_old.c
@@ -24,7 +24,7 @@
 
 #include "toxav.h"
 
-#include "group.h"
+#include "groupav.h"
 
 /* Create a new toxav group.
  *