diff --git a/grc/CMakeLists.txt b/grc/CMakeLists.txt
index 91398c7..5ba10ad 100644
--- a/grc/CMakeLists.txt
+++ b/grc/CMakeLists.txt
@@ -36,6 +36,6 @@ install(FILES
     satnogs_upsat_fsk_frame_encoder.xml
     satnogs_whitening.xml
     satnogs_udp_msg_sink.xml
-    satnogs_transmitter.xml
+    satnogs_upsat_transmitter.xml
     satnogs_coarse_doppler_correction_cc.xml DESTINATION share/gnuradio/grc/blocks
 )
diff --git a/grc/satnogs_transmitter.xml b/grc/satnogs_upsat_transmitter.xml
similarity index 95%
rename from grc/satnogs_transmitter.xml
rename to grc/satnogs_upsat_transmitter.xml
index b10ae16..30fed3e 100644
--- a/grc/satnogs_transmitter.xml
+++ b/grc/satnogs_upsat_transmitter.xml
@@ -1,10 +1,10 @@
 <block>
-   <name>Satnogs Transmitter</name>
-   <key>satnogs_transmitter</key>
+   <name>Satnogs UPSat Transmitter</name>
+   <key>satnogs_upsat_transmitter</key>
    <category>satnogs</category>
    <import>import satnogs</import>
    
-   <make>satnogs.satnogs_transmitter(frame_preamble=$frame_preamble,
+   <make>satnogs.satnogs_upsat_transmitter(frame_preamble=$frame_preamble,
                                       sync_word=$sync_word,
                                       append_crc=$append_crc,
                                       whitening=$whitening,
diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt
index c42ba84..b73ea94 100644
--- a/python/CMakeLists.txt
+++ b/python/CMakeLists.txt
@@ -31,7 +31,7 @@ endif()
 GR_PYTHON_INSTALL(
     FILES
     __init__.py
-    satnogs_transmitter.py
+    satnogs_upsat_transmitter.py
     DESTINATION ${GR_PYTHON_DIR}/satnogs
 )
 
diff --git a/python/__init__.py b/python/__init__.py
index 5638907..5d19e65 100644
--- a/python/__init__.py
+++ b/python/__init__.py
@@ -27,7 +27,7 @@ description here (python/__init__.py).
 try:
 	# this might fail if the module is python-only
 	from satnogs_swig import *
-	from satnogs_transmitter import *
+	from satnogs_upsat_transmitter import *
 except ImportError:
 	pass
 
diff --git a/python/satnogs_transmitter.py b/python/satnogs_upsat_transmitter.py
similarity index 97%
rename from python/satnogs_transmitter.py
rename to python/satnogs_upsat_transmitter.py
index 4e0dcad..a94f5fd 100644
--- a/python/satnogs_transmitter.py
+++ b/python/satnogs_upsat_transmitter.py
@@ -11,7 +11,7 @@ from gnuradio.filter import firdes
 from gnuradio.gr.runtime_swig import sizeof_gr_complex
 
 
-class satnogs_transmitter(gr.hier_block2):
+class satnogs_upsat_transmitter(gr.hier_block2):
     
     def __init__(self,
                  frame_preamble,
@@ -32,7 +32,7 @@ class satnogs_transmitter(gr.hier_block2):
                  lo_offset,
                  deviation,
                  baud_rate):
-        gr.hier_block2.__init__(self, "satnogs_transmitter",
+        gr.hier_block2.__init__(self, "satnogs_upsat_transmitter",
                                 gr.io_signature(0 , 0 , 0),
                                 # Output 0: The complex TX signal for the SDR device
                                 # Output 1: The constellation output for the vector analyzer