diff --git a/src/rtpconn.cc b/src/conn.cc
similarity index 98%
rename from src/rtpconn.cc
rename to src/conn.cc
index 2b94e89..c4c52cb 100644
--- a/src/rtpconn.cc
+++ b/src/conn.cc
@@ -4,8 +4,8 @@
 #include <cstring>
 #include <iostream>
 
-#include "rtpconn.hh"
-#include "rtputil.hh"
+#include "conn.hh"
+#include "util.hh"
 #include "rtp_hevc.hh"
 #include "rtp_opus.hh"
 
diff --git a/src/rtpconn.hh b/src/conn.hh
similarity index 98%
rename from src/rtpconn.hh
rename to src/conn.hh
index 2e5bc16..c70758e 100644
--- a/src/rtpconn.hh
+++ b/src/conn.hh
@@ -11,7 +11,7 @@
 #include <thread>
 #include <mutex>
 
-#include "rtputil.hh"
+#include "util.hh"
 #include "rtp_generic.hh"
 
 class RTPPayload {
diff --git a/src/rtplib.cc b/src/lib.cc
similarity index 96%
rename from src/rtplib.cc
rename to src/lib.cc
index 7d20211..8be857d 100644
--- a/src/rtplib.cc
+++ b/src/lib.cc
@@ -1,7 +1,7 @@
 #include <iostream>
 
-#include "rtplib.hh"
-#include "rtpconn.hh"
+#include "lib.hh"
+#include "conn.hh"
 
 RTPContext::RTPContext()
 {
diff --git a/src/rtplib.hh b/src/lib.hh
similarity index 92%
rename from src/rtplib.hh
rename to src/lib.hh
index 37fcb33..1188550 100644
--- a/src/rtplib.hh
+++ b/src/lib.hh
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <map>
-#include "rtpconn.hh"
+#include "conn.hh"
 
 class RTPContext {
 
diff --git a/src/rtp_generic.cc b/src/rtp_generic.cc
index 160dd7f..4ad6b7f 100644
--- a/src/rtp_generic.cc
+++ b/src/rtp_generic.cc
@@ -9,8 +9,7 @@
 #include <iostream>
 
 #include "rtp_generic.hh"
-#include "rtputil.hh"
-#include "rtpconn.hh"
+#include "conn.hh"
 
 RTPGeneric::GenericFrame *RTPGeneric::createGenericFrame()
 {
diff --git a/src/rtp_generic.hh b/src/rtp_generic.hh
index 33ba1b4..7c24108 100644
--- a/src/rtp_generic.hh
+++ b/src/rtp_generic.hh
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "rtputil.hh"
+#include "util.hh"
 
 class RTPConnection;
 
diff --git a/src/rtp_hevc.cc b/src/rtp_hevc.cc
index 5677b13..783b988 100644
--- a/src/rtp_hevc.cc
+++ b/src/rtp_hevc.cc
@@ -3,7 +3,7 @@
 #include <cstring>
 
 #include "rtp_hevc.hh"
-#include "rtpconn.hh"
+#include "conn.hh"
 
 using RTPGeneric::GenericFrame;
 
diff --git a/src/rtpframe.hh b/src/rtpframe.hh
deleted file mode 100644
index e69de29..0000000
diff --git a/src/rtputil.cc b/src/util.cc
similarity index 97%
rename from src/rtputil.cc
rename to src/util.cc
index d88fba5..6c37b10 100644
--- a/src/rtputil.cc
+++ b/src/util.cc
@@ -5,8 +5,8 @@
 #include <iostream>
 #include <cstring>
 
-#include "rtputil.hh"
-#include "rtpconn.hh"
+#include "util.hh"
+#include "conn.hh"
 #include "rtp_generic.hh"
 
 uint64_t rtpGetUniqueId()
diff --git a/src/rtputil.hh b/src/util.hh
similarity index 100%
rename from src/rtputil.hh
rename to src/util.hh