diff --git a/main.go b/main.go
index f0ac2488..0b84eb46 100644
--- a/main.go
+++ b/main.go
@@ -47,9 +47,9 @@ type program struct {
 	rtcpPort   int
 	publishKey string
 	mutex      sync.RWMutex
-	rtspl      *rtspTcpListener
-	rtpl       *rtspUdpListener
-	rtcpl      *rtspUdpListener
+	rtspl      *serverTcpListener
+	rtpl       *serverUdpListener
+	rtcpl      *serverUdpListener
 	clients    map[*client]struct{}
 	publishers map[string]*client
 }
@@ -92,17 +92,17 @@ func newProgram(protocolsStr string, rtspPort int, rtpPort int, rtcpPort int, pu
 
 	var err error
 
-	p.rtpl, err = newRtspUdpListener(p, rtpPort, _TRACK_FLOW_RTP)
+	p.rtpl, err = newServerUdpListener(p, rtpPort, _TRACK_FLOW_RTP)
 	if err != nil {
 		return nil, err
 	}
 
-	p.rtcpl, err = newRtspUdpListener(p, rtcpPort, _TRACK_FLOW_RTCP)
+	p.rtcpl, err = newServerUdpListener(p, rtcpPort, _TRACK_FLOW_RTCP)
 	if err != nil {
 		return nil, err
 	}
 
-	p.rtspl, err = newRtspTcpListener(p)
+	p.rtspl, err = newServerTcpListener(p)
 	if err != nil {
 		return nil, err
 	}
diff --git a/rtsp_tcpl.go b/server_tcpl.go
similarity index 59%
rename from rtsp_tcpl.go
rename to server_tcpl.go
index b1999629..4aeedd13 100644
--- a/rtsp_tcpl.go
+++ b/server_tcpl.go
@@ -5,12 +5,12 @@ import (
 	"net"
 )
 
-type rtspTcpListener struct {
+type serverTcpListener struct {
 	p    *program
 	netl *net.TCPListener
 }
 
-func newRtspTcpListener(p *program) (*rtspTcpListener, error) {
+func newServerTcpListener(p *program) (*serverTcpListener, error) {
 	netl, err := net.ListenTCP("tcp", &net.TCPAddr{
 		Port: p.rtspPort,
 	})
@@ -18,7 +18,7 @@ func newRtspTcpListener(p *program) (*rtspTcpListener, error) {
 		return nil, err
 	}
 
-	s := &rtspTcpListener{
+	s := &serverTcpListener{
 		p:    p,
 		netl: netl,
 	}
@@ -27,11 +27,11 @@ func newRtspTcpListener(p *program) (*rtspTcpListener, error) {
 	return s, nil
 }
 
-func (l *rtspTcpListener) log(format string, args ...interface{}) {
-	log.Printf("[RTSP TCP listener] "+format, args...)
+func (l *serverTcpListener) log(format string, args ...interface{}) {
+	log.Printf("[TCP listener] "+format, args...)
 }
 
-func (l *rtspTcpListener) run() {
+func (l *serverTcpListener) run() {
 	for {
 		nconn, err := l.netl.AcceptTCP()
 		if err != nil {
diff --git a/rtsp_udpl.go b/server_udpl.go
similarity index 78%
rename from rtsp_udpl.go
rename to server_udpl.go
index 01e8f425..bd7748b3 100644
--- a/rtsp_udpl.go
+++ b/server_udpl.go
@@ -5,13 +5,13 @@ import (
 	"net"
 )
 
-type rtspUdpListener struct {
+type serverUdpListener struct {
 	p     *program
 	nconn *net.UDPConn
 	flow  trackFlow
 }
 
-func newRtspUdpListener(p *program, port int, flow trackFlow) (*rtspUdpListener, error) {
+func newServerUdpListener(p *program, port int, flow trackFlow) (*serverUdpListener, error) {
 	nconn, err := net.ListenUDP("udp", &net.UDPAddr{
 		Port: port,
 	})
@@ -19,7 +19,7 @@ func newRtspUdpListener(p *program, port int, flow trackFlow) (*rtspUdpListener,
 		return nil, err
 	}
 
-	l := &rtspUdpListener{
+	l := &serverUdpListener{
 		p:     p,
 		nconn: nconn,
 		flow:  flow,
@@ -29,17 +29,17 @@ func newRtspUdpListener(p *program, port int, flow trackFlow) (*rtspUdpListener,
 	return l, nil
 }
 
-func (l *rtspUdpListener) log(format string, args ...interface{}) {
+func (l *serverUdpListener) log(format string, args ...interface{}) {
 	var label string
 	if l.flow == _TRACK_FLOW_RTP {
 		label = "RTP"
 	} else {
 		label = "RTCP"
 	}
-	log.Printf("[RTSP UDP/"+label+" listener] "+format, args...)
+	log.Printf("[UDP/"+label+" listener] "+format, args...)
 }
 
-func (l *rtspUdpListener) run() {
+func (l *serverUdpListener) run() {
 	buf := make([]byte, 2048) // UDP MTU is 1400
 
 	for {