diff --git a/README b/README
index 543c2bb..173dfd2 100644
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
 While primarily being developed for the OsmoSDR hardware, this block as well supports:
 
  * FunCube Dongle through libgnuradio-fcd
- * OSMOCOM OsmoSDR Devices through libosmosdr
+ * sysmocom OsmoSDR Devices through libosmosdr
  * Great Scott Gadgets HackRF through libhackrf
  * Ettus USRP Devices through Ettus UHD library
  * RTL2832U based DVB-T dongles through librtlsdr
@@ -32,4 +32,4 @@ make
 sudo make install
 sudo ldconfig
 
-NOTE: The OSMOCOM source block will appear under 'Sources' category in GRC menu.
+NOTE: The osmocom source block will appear under 'Sources' category in GRC menu.
diff --git a/apps/osmocom_fft b/apps/osmocom_fft
index 85406b1..decde8f 100755
--- a/apps/osmocom_fft
+++ b/apps/osmocom_fft
@@ -485,7 +485,7 @@ class app_top_block(stdgui2.std_top_block, pubsub):
             self.set_freq(target_freq)
 
 def main ():
-    app = stdgui2.stdapp(app_top_block, "OSMOCOM Spectrum Browser", nstatus=1)
+    app = stdgui2.stdapp(app_top_block, "osmocom Spectrum Browser", nstatus=1)
     app.MainLoop()
 
 if __name__ == '__main__':
diff --git a/apps/osmocom_siggen b/apps/osmocom_siggen
index 3724c5b..445fe3a 100755
--- a/apps/osmocom_siggen
+++ b/apps/osmocom_siggen
@@ -347,7 +347,7 @@ def main():
                       gui=app_gui,                      # User interface class
                       options=options,                  # Command line options
                       args=args,                        # Command line args
-                      title="OSMOCOM Signal Generator", # Top window title
+                      title="osmocom Signal Generator", # Top window title
                       nstatus=1,                        # Number of status lines
                       start=True,                       # Whether to start flowgraph
                       realtime=True)                    # Whether to set realtime priority
diff --git a/grc/gen_osmosdr_blocks.py b/grc/gen_osmosdr_blocks.py
index bb21f5f..64375fb 100644
--- a/grc/gen_osmosdr_blocks.py
+++ b/grc/gen_osmosdr_blocks.py
@@ -104,12 +104,12 @@ self.\$(id).set_bandwidth(\$bw$(n), $n)
     <nports>\$nchan</nports>
   </$sourk>
   <doc>
-The OSMOCOM block:
+The osmocom block:
 
 While primarily being developed for the OsmoSDR hardware, this block as well supports:
 
  * FunCube Dongle through libgnuradio-fcd
- * OSMOCOM OsmoSDR Devices through libosmosdr
+ * sysmocom OsmoSDR Devices through libosmosdr
  * Great Scott Gadgets HackRF through libhackrf
  * Ettus USRP Devices through Ettus UHD library
  * RTL2832U based DVB-T dongles through librtlsdr
@@ -318,7 +318,7 @@ if __name__ == '__main__':
       title = 'RTL-SDR'
       prefix = 'rtlsdr'
     elif tail.startswith('osmosdr'):
-      title = 'OSMOCOM'
+      title = 'osmocom'
       prefix = 'osmosdr'
     else: raise Exception, 'file %s has wrong syntax!'%tail