diff --git a/nmea/GGA.py b/nmea/GGA.py
index aac8549..380827e 100644
--- a/nmea/GGA.py
+++ b/nmea/GGA.py
@@ -1,8 +1,8 @@
 from msg_container import MsgContainer
-from receiver.nmea_receiver import NmeaReceiver
+from receiver.nmea_receiver import NmeaListener
 
 
-class Gga(NmeaReceiver):
+class Gga(NmeaListener):
 	class Msg:
 		def __init__(self):
 			self.utc_time = None
@@ -24,7 +24,7 @@ class Gga(NmeaReceiver):
 			return f"{self.__dict__}"
 
 	def __init__(self, name: str, tid: str):
-		NmeaReceiver.__init__(self, name, tid=tid, msg_type="GGA")
+		NmeaListener.__init__(self, name, tid=tid, msg_type="GGA")
 		self.msg = None
 		self.data = Gga.Msg()
 
diff --git a/nmea/GLL.py b/nmea/GLL.py
index 29a12da..7b1125f 100644
--- a/nmea/GLL.py
+++ b/nmea/GLL.py
@@ -1,8 +1,8 @@
 from msg_container import MsgContainer
-from receiver.nmea_receiver import NmeaReceiver
+from receiver.nmea_receiver import NmeaListener
 
 
-class Gll(NmeaReceiver):
+class Gll(NmeaListener):
 	class Msg:
 		def __init__(self):
 			self.latitude = None
@@ -18,7 +18,7 @@ class Gll(NmeaReceiver):
 			return f"{self.__dict__}"
 
 	def __init__(self, name: str, tid: str):
-		NmeaReceiver.__init__(self, name, tid=tid, msg_type="GLL")
+		NmeaListener.__init__(self, name, tid=tid, msg_type="GLL")
 		self.msg = None
 		self.data = Gll.Msg()
 
diff --git a/nmea/GSA.py b/nmea/GSA.py
index 783601d..5fc0be4 100644
--- a/nmea/GSA.py
+++ b/nmea/GSA.py
@@ -1,8 +1,8 @@
 from msg_container import MsgContainer
-from receiver.nmea_receiver import NmeaReceiver
+from receiver.nmea_receiver import NmeaListener
 
 
-class Gsa(NmeaReceiver):
+class Gsa(NmeaListener):
 	class Msg:
 		def __init__(self):
 			self.mode = None
@@ -18,7 +18,7 @@ class Gsa(NmeaReceiver):
 			return f"{self.__dict__}"
 
 	def __init__(self, name: str, tid: str):
-		NmeaReceiver.__init__(self, name, tid=tid, msg_type="GSA")
+		NmeaListener.__init__(self, name, tid=tid, msg_type="GSA")
 		self.msg = None
 		self.data = Gsa.Msg()
 
diff --git a/nmea/GSV.py b/nmea/GSV.py
index 6b5e30f..48ed6dd 100644
--- a/nmea/GSV.py
+++ b/nmea/GSV.py
@@ -1,8 +1,8 @@
 from msg_container import MsgContainer
-from receiver.nmea_receiver import NmeaReceiver
+from receiver.nmea_receiver import NmeaListener
 
 
-class Gsv(NmeaReceiver):
+class Gsv(NmeaListener):
 	class Msg:
 		def __init__(self):
 			self.number_of_msg = None
@@ -19,7 +19,7 @@ class Gsv(NmeaReceiver):
 			return f"{self.__dict__}"
 
 	def __init__(self, name: str, tid: str):
-		NmeaReceiver.__init__(self, name, tid=tid, msg_type="GSV")
+		NmeaListener.__init__(self, name, tid=tid, msg_type="GSV")
 		self.msg = None
 		self.data = Gsv.Msg()
 
diff --git a/nmea/RMC.py b/nmea/RMC.py
index dcf09b8..26c423e 100644
--- a/nmea/RMC.py
+++ b/nmea/RMC.py
@@ -1,8 +1,8 @@
 from msg_container import MsgContainer
-from receiver.nmea_receiver import NmeaReceiver
+from receiver.nmea_receiver import NmeaListener
 
 
-class Rmc(NmeaReceiver):
+class Rmc(NmeaListener):
 	class Msg:
 		def __init__(self):
 			pass
@@ -11,7 +11,7 @@ class Rmc(NmeaReceiver):
 			return f"{self.__dict__}"
 
 	def __init__(self, name: str, tid: str):
-		NmeaReceiver.__init__(self, name, tid=tid, msg_type="RMC")
+		NmeaListener.__init__(self, name, tid=tid, msg_type="RMC")
 		self.msg = None
 		self.data = Rmc.Msg()
 
diff --git a/receiver/nmea_receiver.py b/receiver/nmea_receiver.py
index c92d006..11a00f3 100644
--- a/receiver/nmea_receiver.py
+++ b/receiver/nmea_receiver.py
@@ -2,7 +2,7 @@ from msg_container import MsgContainer
 from msg_listener import MsgListener
 import re
 
-class AsciiReceiver(MsgListener):
+class AsciiListener(MsgListener):
 	def __init__(self, name: str, filter: str):
 		super().__init__()
 		self.name = name
@@ -20,9 +20,9 @@ class AsciiReceiver(MsgListener):
 		print(f"{self.name}: {msg}")
 
 
-class NmeaReceiver(AsciiReceiver):
+class NmeaListener(AsciiListener):
 	def __init__(self, name: str, tid: str, msg_type: str):
 		if tid == "--":
-			AsciiReceiver.__init__(self, name, filter=f"^\\$..{msg_type}.*")
+			AsciiListener.__init__(self, name, filter=f"^\\$..{msg_type}.*")
 		else:
-			AsciiReceiver.__init__(self, name, filter=f"^\\${tid}{msg_type}.*")
+			AsciiListener.__init__(self, name, filter=f"^\\${tid}{msg_type}.*")