diff --git a/CMakeLists.txt b/CMakeLists.txt
index 70ae09f..e1493ff 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -25,7 +25,7 @@ add_definitions(-std=c++11)
 # Project setup
 ########################################################################
 cmake_minimum_required(VERSION 2.6)
-project(gr-crfa CXX C)
+project(gr-multirds CXX C)
 enable_testing()
 
 #install to PyBOMBS target prefix if defined
@@ -76,7 +76,7 @@ set(Boost_ADDITIONAL_VERSIONS
 find_package(Boost "1.35" COMPONENTS filesystem system)
 
 if(NOT Boost_FOUND)
-    message(FATAL_ERROR "Boost required to compile crfa")
+    message(FATAL_ERROR "Boost required to compile multirds")
 endif()
 
 ########################################################################
@@ -85,7 +85,7 @@ endif()
 include(GrPlatform) #define LIB_SUFFIX
 set(GR_RUNTIME_DIR      bin)
 set(GR_LIBRARY_DIR      lib${LIB_SUFFIX})
-set(GR_INCLUDE_DIR      include/crfa)
+set(GR_INCLUDE_DIR      include/multirds)
 set(GR_DATA_DIR         share)
 set(GR_PKG_DATA_DIR     ${GR_DATA_DIR}/${CMAKE_PROJECT_NAME})
 set(GR_DOC_DIR          ${GR_DATA_DIR}/doc)
@@ -132,7 +132,7 @@ list(INSERT CMAKE_MODULE_PATH 0 ${CMAKE_SOURCE_DIR}/cmake/Modules)
 include(GrVersion)
 
 if(NOT CPPUNIT_FOUND)
-    message(FATAL_ERROR "CppUnit required to compile crfa")
+    message(FATAL_ERROR "CppUnit required to compile multirds")
 endif()
 
 ########################################################################
@@ -182,7 +182,7 @@ add_custom_target(uninstall
 ########################################################################
 # Add subdirectories
 ########################################################################
-add_subdirectory(include/crfa)
+add_subdirectory(include/multirds)
 add_subdirectory(lib)
 add_subdirectory(swig)
 add_subdirectory(python)
@@ -197,6 +197,6 @@ if(NOT CMAKE_MODULES_DIR)
   set(CMAKE_MODULES_DIR lib${LIB_SUFFIX}/cmake)
 endif(NOT CMAKE_MODULES_DIR)
 
-install(FILES cmake/Modules/crfaConfig.cmake
-    DESTINATION ${CMAKE_MODULES_DIR}/crfa
+install(FILES cmake/Modules/multirdsConfig.cmake
+    DESTINATION ${CMAKE_MODULES_DIR}/multirds
 )
diff --git a/MANIFEST.md b/MANIFEST.md
index b49ebe4..ac12f91 100644
--- a/MANIFEST.md
+++ b/MANIFEST.md
@@ -1,5 +1,5 @@
 title: The CRFA OOT Module
-brief: Short description of gr-crfa
+brief: Short description of gr-multirds
 tags: # Tags are arbitrary, but look at CGRAN what other authors are using
   - sdr
 author:
@@ -11,6 +11,6 @@ license:
 #website: <module_website> # If you have a separate project website, put it here
 #icon: <icon_url> # Put a URL to a square image here that will be used as an icon on CGRAN
 ---
-A longer, multi-line description of gr-crfa.
+A longer, multi-line description of gr-multirds.
 You may use some *basic* Markdown here.
 If left empty, it will try to find a README file instead.
diff --git a/apps/fft-multi-decoder_fixed_freqs.grc b/apps/fft-multi-decoder_fixed_freqs.grc
index e2632db..04d9374 100644
--- a/apps/fft-multi-decoder_fixed_freqs.grc
+++ b/apps/fft-multi-decoder_fixed_freqs.grc
@@ -1597,7 +1597,7 @@
     </param>
   </block>
   <block>
-    <key>crfa_decoder_compare</key>
+    <key>multirds_decoder_compare</key>
     <param>
       <key>alias</key>
       <value></value>
@@ -1624,7 +1624,7 @@
     </param>
     <param>
       <key>id</key>
-      <value>crfa_decoder_compare_0</value>
+      <value>multirds_decoder_compare_0</value>
     </param>
     <param>
       <key>nPorts</key>
@@ -1632,7 +1632,7 @@
     </param>
   </block>
   <block>
-    <key>crfa_rds_parser_table_qt</key>
+    <key>multirds_rds_parser_table_qt</key>
     <param>
       <key>alias</key>
       <value></value>
@@ -1667,7 +1667,7 @@
     </param>
     <param>
       <key>id</key>
-      <value>crfa_rds_parser_table_qt_0_0</value>
+      <value>multirds_rds_parser_table_qt_0_0</value>
     </param>
     <param>
       <key>label</key>
@@ -6425,7 +6425,7 @@ class blk(gr.sync_block):  # other base classes are basic_block, decim_block, in
   </connection>
   <connection>
     <source_block_id>epy_block_0</source_block_id>
-    <sink_block_id>crfa_rds_parser_table_qt_0_0</sink_block_id>
+    <sink_block_id>multirds_rds_parser_table_qt_0_0</sink_block_id>
     <source_key>out</source_key>
     <sink_key>freq</sink_key>
   </connection>
@@ -6491,13 +6491,13 @@ class blk(gr.sync_block):  # other base classes are basic_block, decim_block, in
   </connection>
   <connection>
     <source_block_id>hier_ifft_decoder_0</source_block_id>
-    <sink_block_id>crfa_decoder_compare_0</sink_block_id>
+    <sink_block_id>multirds_decoder_compare_0</sink_block_id>
     <source_key>rds</source_key>
     <sink_key>in0</sink_key>
   </connection>
   <connection>
     <source_block_id>hier_ifft_decoder_0</source_block_id>
-    <sink_block_id>crfa_rds_parser_table_qt_0_0</sink_block_id>
+    <sink_block_id>multirds_rds_parser_table_qt_0_0</sink_block_id>
     <source_key>rds</source_key>
     <sink_key>in0</sink_key>
   </connection>
@@ -6527,13 +6527,13 @@ class blk(gr.sync_block):  # other base classes are basic_block, decim_block, in
   </connection>
   <connection>
     <source_block_id>hier_ifft_decoder_0_0</source_block_id>
-    <sink_block_id>crfa_decoder_compare_0</sink_block_id>
+    <sink_block_id>multirds_decoder_compare_0</sink_block_id>
     <source_key>rds</source_key>
     <sink_key>in1</sink_key>
   </connection>
   <connection>
     <source_block_id>hier_ifft_decoder_0_0</source_block_id>
-    <sink_block_id>crfa_rds_parser_table_qt_0_0</sink_block_id>
+    <sink_block_id>multirds_rds_parser_table_qt_0_0</sink_block_id>
     <source_key>rds</source_key>
     <sink_key>in1</sink_key>
   </connection>
@@ -6563,13 +6563,13 @@ class blk(gr.sync_block):  # other base classes are basic_block, decim_block, in
   </connection>
   <connection>
     <source_block_id>hier_ifft_decoder_0_1</source_block_id>
-    <sink_block_id>crfa_decoder_compare_0</sink_block_id>
+    <sink_block_id>multirds_decoder_compare_0</sink_block_id>
     <source_key>rds</source_key>
     <sink_key>in2</sink_key>
   </connection>
   <connection>
     <source_block_id>hier_ifft_decoder_0_1</source_block_id>
-    <sink_block_id>crfa_rds_parser_table_qt_0_0</sink_block_id>
+    <sink_block_id>multirds_rds_parser_table_qt_0_0</sink_block_id>
     <source_key>rds</source_key>
     <sink_key>in2</sink_key>
   </connection>
diff --git a/apps/fft-multi-decoder_fixed_freqs_manlap.grc b/apps/fft-multi-decoder_fixed_freqs_manlap.grc
index c4c4fcc..22249e2 100644
--- a/apps/fft-multi-decoder_fixed_freqs_manlap.grc
+++ b/apps/fft-multi-decoder_fixed_freqs_manlap.grc
@@ -1597,7 +1597,7 @@
     </param>
   </block>
   <block>
-    <key>crfa_decoder_compare</key>
+    <key>multirds_decoder_compare</key>
     <param>
       <key>alias</key>
       <value></value>
@@ -1624,7 +1624,7 @@
     </param>
     <param>
       <key>id</key>
-      <value>crfa_decoder_compare_0</value>
+      <value>multirds_decoder_compare_0</value>
     </param>
     <param>
       <key>nPorts</key>
@@ -1632,7 +1632,7 @@
     </param>
   </block>
   <block>
-    <key>crfa_rds_parser_table_qt</key>
+    <key>multirds_rds_parser_table_qt</key>
     <param>
       <key>alias</key>
       <value></value>
@@ -1667,7 +1667,7 @@
     </param>
     <param>
       <key>id</key>
-      <value>crfa_rds_parser_table_qt_0_0</value>
+      <value>multirds_rds_parser_table_qt_0_0</value>
     </param>
     <param>
       <key>label</key>
@@ -1703,7 +1703,7 @@
     </param>
   </block>
   <block>
-    <key>crfa_tmc_parser</key>
+    <key>multirds_tmc_parser</key>
     <param>
       <key>alias</key>
       <value></value>
@@ -1738,7 +1738,7 @@
     </param>
     <param>
       <key>id</key>
-      <value>crfa_tmc_parser_0</value>
+      <value>multirds_tmc_parser_0</value>
     </param>
     <param>
       <key>label</key>
@@ -6479,14 +6479,14 @@ class blk(gr.sync_block):  # other base classes are basic_block, decim_block, in
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>crfa_rds_parser_table_qt_0_0</source_block_id>
-    <sink_block_id>crfa_tmc_parser_0</sink_block_id>
+    <source_block_id>multirds_rds_parser_table_qt_0_0</source_block_id>
+    <sink_block_id>multirds_tmc_parser_0</sink_block_id>
     <source_key>tmc_raw</source_key>
     <sink_key>in</sink_key>
   </connection>
   <connection>
     <source_block_id>epy_block_0</source_block_id>
-    <sink_block_id>crfa_rds_parser_table_qt_0_0</sink_block_id>
+    <sink_block_id>multirds_rds_parser_table_qt_0_0</sink_block_id>
     <source_key>out</source_key>
     <sink_key>freq</sink_key>
   </connection>
@@ -6552,13 +6552,13 @@ class blk(gr.sync_block):  # other base classes are basic_block, decim_block, in
   </connection>
   <connection>
     <source_block_id>hier_ifft_decoder_0</source_block_id>
-    <sink_block_id>crfa_decoder_compare_0</sink_block_id>
+    <sink_block_id>multirds_decoder_compare_0</sink_block_id>
     <source_key>rds</source_key>
     <sink_key>in0</sink_key>
   </connection>
   <connection>
     <source_block_id>hier_ifft_decoder_0</source_block_id>
-    <sink_block_id>crfa_rds_parser_table_qt_0_0</sink_block_id>
+    <sink_block_id>multirds_rds_parser_table_qt_0_0</sink_block_id>
     <source_key>rds</source_key>
     <sink_key>in0</sink_key>
   </connection>
@@ -6588,13 +6588,13 @@ class blk(gr.sync_block):  # other base classes are basic_block, decim_block, in
   </connection>
   <connection>
     <source_block_id>hier_ifft_decoder_0_0</source_block_id>
-    <sink_block_id>crfa_decoder_compare_0</sink_block_id>
+    <sink_block_id>multirds_decoder_compare_0</sink_block_id>
     <source_key>rds</source_key>
     <sink_key>in1</sink_key>
   </connection>
   <connection>
     <source_block_id>hier_ifft_decoder_0_0</source_block_id>
-    <sink_block_id>crfa_rds_parser_table_qt_0_0</sink_block_id>
+    <sink_block_id>multirds_rds_parser_table_qt_0_0</sink_block_id>
     <source_key>rds</source_key>
     <sink_key>in1</sink_key>
   </connection>
@@ -6624,13 +6624,13 @@ class blk(gr.sync_block):  # other base classes are basic_block, decim_block, in
   </connection>
   <connection>
     <source_block_id>hier_ifft_decoder_0_1</source_block_id>
-    <sink_block_id>crfa_decoder_compare_0</sink_block_id>
+    <sink_block_id>multirds_decoder_compare_0</sink_block_id>
     <source_key>rds</source_key>
     <sink_key>in2</sink_key>
   </connection>
   <connection>
     <source_block_id>hier_ifft_decoder_0_1</source_block_id>
-    <sink_block_id>crfa_rds_parser_table_qt_0_0</sink_block_id>
+    <sink_block_id>multirds_rds_parser_table_qt_0_0</sink_block_id>
     <source_key>rds</source_key>
     <sink_key>in2</sink_key>
   </connection>
diff --git a/apps/ifft-RDS-decoder_hier-block.grc b/apps/ifft-RDS-decoder_hier-block.grc
index 180f5fe..a4be528 100644
--- a/apps/ifft-RDS-decoder_hier-block.grc
+++ b/apps/ifft-RDS-decoder_hier-block.grc
@@ -1378,7 +1378,7 @@
     </param>
   </block>
   <block>
-    <key>crfa_decoder_compare</key>
+    <key>multirds_decoder_compare</key>
     <param>
       <key>alias</key>
       <value></value>
@@ -1405,7 +1405,7 @@
     </param>
     <param>
       <key>id</key>
-      <value>crfa_decoder_compare_0</value>
+      <value>multirds_decoder_compare_0</value>
     </param>
     <param>
       <key>nPorts</key>
@@ -1413,7 +1413,7 @@
     </param>
   </block>
   <block>
-    <key>crfa_diff_add_sync_decim</key>
+    <key>multirds_diff_add_sync_decim</key>
     <param>
       <key>alias</key>
       <value></value>
@@ -1440,7 +1440,7 @@
     </param>
     <param>
       <key>id</key>
-      <value>crfa_diff_add_sync_decim_0</value>
+      <value>multirds_diff_add_sync_decim_0</value>
     </param>
     <param>
       <key>log</key>
@@ -1464,7 +1464,7 @@
     </param>
   </block>
   <block>
-    <key>crfa_rds_decoder</key>
+    <key>multirds_rds_decoder</key>
     <param>
       <key>alias</key>
       <value></value>
@@ -1495,7 +1495,7 @@
     </param>
     <param>
       <key>id</key>
-      <value>crfa_rds_decoder_3</value>
+      <value>multirds_rds_decoder_3</value>
     </param>
     <param>
       <key>log</key>
@@ -1511,7 +1511,7 @@
     </param>
   </block>
   <block>
-    <key>crfa_rds_decoder</key>
+    <key>multirds_rds_decoder</key>
     <param>
       <key>alias</key>
       <value></value>
@@ -1542,7 +1542,7 @@
     </param>
     <param>
       <key>id</key>
-      <value>crfa_rds_decoder_3_1</value>
+      <value>multirds_rds_decoder_3_1</value>
     </param>
     <param>
       <key>log</key>
@@ -1558,7 +1558,7 @@
     </param>
   </block>
   <block>
-    <key>crfa_rds_decoder</key>
+    <key>multirds_rds_decoder</key>
     <param>
       <key>alias</key>
       <value></value>
@@ -1589,7 +1589,7 @@
     </param>
     <param>
       <key>id</key>
-      <value>crfa_rds_decoder_3_1_0</value>
+      <value>multirds_rds_decoder_3_1_0</value>
     </param>
     <param>
       <key>log</key>
@@ -1605,7 +1605,7 @@
     </param>
   </block>
   <block>
-    <key>crfa_sync_decim</key>
+    <key>multirds_sync_decim</key>
     <param>
       <key>alias</key>
       <value></value>
@@ -1632,7 +1632,7 @@
     </param>
     <param>
       <key>id</key>
-      <value>crfa_sync_decim_0</value>
+      <value>multirds_sync_decim_0</value>
     </param>
     <param>
       <key>log</key>
@@ -1656,7 +1656,7 @@
     </param>
   </block>
   <block>
-    <key>crfa_vector_cutter</key>
+    <key>multirds_vector_cutter</key>
     <param>
       <key>alias</key>
       <value></value>
@@ -1683,7 +1683,7 @@
     </param>
     <param>
       <key>id</key>
-      <value>crfa_vector_cutter_0_0</value>
+      <value>multirds_vector_cutter_0_0</value>
     </param>
     <param>
       <key>maxoutbuf</key>
@@ -2891,13 +2891,13 @@
   </connection>
   <connection>
     <source_block_id>blocks_complex_to_real_0</source_block_id>
-    <sink_block_id>crfa_diff_add_sync_decim_0</sink_block_id>
+    <sink_block_id>multirds_diff_add_sync_decim_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
   <connection>
     <source_block_id>blocks_complex_to_real_0</source_block_id>
-    <sink_block_id>crfa_sync_decim_0</sink_block_id>
+    <sink_block_id>multirds_sync_decim_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
@@ -2993,7 +2993,7 @@
   </connection>
   <connection>
     <source_block_id>blocks_null_source_0</source_block_id>
-    <sink_block_id>crfa_rds_decoder_3</sink_block_id>
+    <sink_block_id>multirds_rds_decoder_3</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
@@ -3004,49 +3004,49 @@
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>crfa_diff_add_sync_decim_0</source_block_id>
+    <source_block_id>multirds_diff_add_sync_decim_0</source_block_id>
     <sink_block_id>digital_binary_slicer_fb_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>crfa_rds_decoder_3</source_block_id>
-    <sink_block_id>crfa_decoder_compare_0</sink_block_id>
+    <source_block_id>multirds_rds_decoder_3</source_block_id>
+    <sink_block_id>multirds_decoder_compare_0</sink_block_id>
     <source_key>out</source_key>
     <sink_key>in0</sink_key>
   </connection>
   <connection>
-    <source_block_id>crfa_rds_decoder_3</source_block_id>
-    <sink_block_id>crfa_sync_decim_0</sink_block_id>
+    <source_block_id>multirds_rds_decoder_3</source_block_id>
+    <sink_block_id>multirds_sync_decim_0</sink_block_id>
     <source_key>out</source_key>
     <sink_key>ctrl</sink_key>
   </connection>
   <connection>
-    <source_block_id>crfa_rds_decoder_3</source_block_id>
+    <source_block_id>multirds_rds_decoder_3</source_block_id>
     <sink_block_id>pad_sink_0_0</sink_block_id>
     <source_key>out</source_key>
     <sink_key>in</sink_key>
   </connection>
   <connection>
-    <source_block_id>crfa_rds_decoder_3_1</source_block_id>
-    <sink_block_id>crfa_decoder_compare_0</sink_block_id>
+    <source_block_id>multirds_rds_decoder_3_1</source_block_id>
+    <sink_block_id>multirds_decoder_compare_0</sink_block_id>
     <source_key>out</source_key>
     <sink_key>in1</sink_key>
   </connection>
   <connection>
-    <source_block_id>crfa_rds_decoder_3_1_0</source_block_id>
-    <sink_block_id>crfa_decoder_compare_0</sink_block_id>
+    <source_block_id>multirds_rds_decoder_3_1_0</source_block_id>
+    <sink_block_id>multirds_decoder_compare_0</sink_block_id>
     <source_key>out</source_key>
     <sink_key>in2</sink_key>
   </connection>
   <connection>
-    <source_block_id>crfa_sync_decim_0</source_block_id>
+    <source_block_id>multirds_sync_decim_0</source_block_id>
     <sink_block_id>digital_binary_slicer_fb_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>crfa_vector_cutter_0_0</source_block_id>
+    <source_block_id>multirds_vector_cutter_0_0</source_block_id>
     <sink_block_id>fft_vxx_1_1</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
@@ -3071,19 +3071,19 @@
   </connection>
   <connection>
     <source_block_id>digital_diff_decoder_bb_0</source_block_id>
-    <sink_block_id>crfa_rds_decoder_3</sink_block_id>
+    <sink_block_id>multirds_rds_decoder_3</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
   <connection>
     <source_block_id>digital_diff_decoder_bb_0_1</source_block_id>
-    <sink_block_id>crfa_rds_decoder_3_1</sink_block_id>
+    <sink_block_id>multirds_rds_decoder_3_1</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
   <connection>
     <source_block_id>digital_diff_decoder_bb_0_1_0</source_block_id>
-    <sink_block_id>crfa_rds_decoder_3_1_0</sink_block_id>
+    <sink_block_id>multirds_rds_decoder_3_1_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
@@ -3131,7 +3131,7 @@
   </connection>
   <connection>
     <source_block_id>pad_source_0</source_block_id>
-    <sink_block_id>crfa_vector_cutter_0_0</sink_block_id>
+    <sink_block_id>multirds_vector_cutter_0_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
diff --git a/cmake/Modules/crfaConfig.cmake b/cmake/Modules/crfaConfig.cmake
index 095b449..2d982c1 100644
--- a/cmake/Modules/crfaConfig.cmake
+++ b/cmake/Modules/crfaConfig.cmake
@@ -1,9 +1,9 @@
 INCLUDE(FindPkgConfig)
-PKG_CHECK_MODULES(PC_CRFA crfa)
+PKG_CHECK_MODULES(PC_CRFA multirds)
 
 FIND_PATH(
     CRFA_INCLUDE_DIRS
-    NAMES crfa/api.h
+    NAMES multirds/api.h
     HINTS $ENV{CRFA_DIR}/include
         ${PC_CRFA_INCLUDEDIR}
     PATHS ${CMAKE_INSTALL_PREFIX}/include
@@ -13,7 +13,7 @@ FIND_PATH(
 
 FIND_LIBRARY(
     CRFA_LIBRARIES
-    NAMES gnuradio-crfa
+    NAMES gnuradio-multirds
     HINTS $ENV{CRFA_DIR}/lib
         ${PC_CRFA_LIBDIR}
     PATHS ${CMAKE_INSTALL_PREFIX}/lib
diff --git a/docs/README.crfa b/docs/README.crfa
index 9bf0247..4b0ee6d 100644
--- a/docs/README.crfa
+++ b/docs/README.crfa
@@ -1,11 +1,11 @@
-This is the crfa-write-a-block package meant as a guide to building
-out-of-tree packages. To use the crfa blocks, the Python namespaces
-is in 'crfa', which is imported as:
+This is the multirds-write-a-block package meant as a guide to building
+out-of-tree packages. To use the multirds blocks, the Python namespaces
+is in 'multirds', which is imported as:
 
-    import crfa
+    import multirds
 
 See the Doxygen documentation for details about the blocks available
 in this package. A quick listing of the details can be found in Python
 after importing by using:
 
-    help(crfa)
+    help(multirds)
diff --git a/grc/CMakeLists.txt b/grc/CMakeLists.txt
index bb6cc3a..37344d2 100644
--- a/grc/CMakeLists.txt
+++ b/grc/CMakeLists.txt
@@ -17,20 +17,20 @@
 # the Free Software Foundation, Inc., 51 Franklin Street,
 # Boston, MA 02110-1301, USA.
 install(FILES
-    crfa_multi_rds_printer.xml
-    crfa_qtguitest.xml
-    crfa_rds_table_qt.xml
-    crfa_rds_parser_table_qt.xml
-    crfa_rds_decoder.xml
-    crfa_max_freq.xml
-    crfa_smooth_vectors.xml
-    crfa_stream_selector.xml
-    crfa_vector_cutter.xml
-    crfa_decoder_compare.xml
-    crfa_diff_add_sync_decim.xml
-    crfa_sync_decim.xml
-    crfa_rds_decoder_redsea.xml
-    crfa_qtgui_range.xml
-    crfa_variable_setter.xml
-    crfa_tmc_parser.xml DESTINATION share/gnuradio/grc/blocks
+    multirds_multi_rds_printer.xml
+    multirds_qtguitest.xml
+    multirds_rds_table_qt.xml
+    multirds_rds_parser_table_qt.xml
+    multirds_rds_decoder.xml
+    multirds_max_freq.xml
+    multirds_smooth_vectors.xml
+    multirds_stream_selector.xml
+    multirds_vector_cutter.xml
+    multirds_decoder_compare.xml
+    multirds_diff_add_sync_decim.xml
+    multirds_sync_decim.xml
+    multirds_rds_decoder_redsea.xml
+    multirds_qtgui_range.xml
+    multirds_variable_setter.xml
+    multirds_tmc_parser.xml DESTINATION share/gnuradio/grc/blocks
 )
diff --git a/grc/crfa_decoder_compare.xml b/grc/crfa_decoder_compare.xml
index bdf2eaf..0d89b31 100644
--- a/grc/crfa_decoder_compare.xml
+++ b/grc/crfa_decoder_compare.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0"?>
 <block>
   <name>decoder_compare</name>
-  <key>crfa_decoder_compare</key>
-  <category>[crfa]</category>
-  <import>import crfa</import>
-  <make>crfa.decoder_compare($nPorts)</make>
+  <key>multirds_decoder_compare</key>
+  <category>[multirds]</category>
+  <import>import multirds</import>
+  <make>multirds.decoder_compare($nPorts)</make>
   <!-- Make one 'param' node for every Parameter you want settable from the GUI.
        Sub-nodes:
        * name
diff --git a/grc/crfa_diff_add_sync_decim.xml b/grc/crfa_diff_add_sync_decim.xml
index dc61390..96834bc 100644
--- a/grc/crfa_diff_add_sync_decim.xml
+++ b/grc/crfa_diff_add_sync_decim.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0"?>
 <block>
   <name>diff_add_sync_decim</name>
-  <key>crfa_diff_add_sync_decim</key>
-  <category>[crfa]</category>
-  <import>import crfa</import>
-  <make>crfa.diff_add_sync_decim($threshold,$max_ratio_below_threshold, $log)</make>
+  <key>multirds_diff_add_sync_decim</key>
+  <category>[multirds]</category>
+  <import>import multirds</import>
+  <make>multirds.diff_add_sync_decim($threshold,$max_ratio_below_threshold, $log)</make>
   <!-- Make one 'param' node for every Parameter you want settable from the GUI.
        Sub-nodes:
        * name
diff --git a/grc/crfa_max_freq.xml b/grc/crfa_max_freq.xml
index 378ab4d..b5ba561 100644
--- a/grc/crfa_max_freq.xml
+++ b/grc/crfa_max_freq.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0"?>
 <block>
   <name>max_freq</name>
-  <key>crfa_max_freq</key>
-  <category>[crfa]</category>
-  <import>import crfa</import>
-  <make>crfa.max_freq($fft_len, $num_decoders, $center_freq, $samp_rate,$round_to,$debug)</make>
+  <key>multirds_max_freq</key>
+  <category>[multirds]</category>
+  <import>import multirds</import>
+  <make>multirds.max_freq($fft_len, $num_decoders, $center_freq, $samp_rate,$round_to,$debug)</make>
   <!-- Make one 'param' node for every Parameter you want settable from the GUI.
        Sub-nodes:
        * name
diff --git a/grc/crfa_multi_rds_printer.xml b/grc/crfa_multi_rds_printer.xml
index cde562f..50b017e 100644
--- a/grc/crfa_multi_rds_printer.xml
+++ b/grc/crfa_multi_rds_printer.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0"?>
 <block>
   <name>Multi RDS Printer</name>
-  <key>crfa_multi_rds_printer</key>
-  <category>[crfa]</category>
-  <import>import crfa</import>
-  <make>crfa.multi_rds_printer($print_freq,$nPorts)</make>
+  <key>multirds_multi_rds_printer</key>
+  <category>[multirds]</category>
+  <import>import multirds</import>
+  <make>multirds.multi_rds_printer($print_freq,$nPorts)</make>
   <!-- Make one 'param' node for every Parameter you want settable from the GUI.
        Sub-nodes:
        * name
diff --git a/grc/crfa_qtgui_range.xml b/grc/crfa_qtgui_range.xml
index d9cb2f3..651333f 100644
--- a/grc/crfa_qtgui_range.xml
+++ b/grc/crfa_qtgui_range.xml
@@ -2,10 +2,10 @@
 
 <block>
   <name>qtgui_range (cr)</name>
-  <key>variable_crfa_qtgui_range</key>
-  <category>[crfa]</category>
-  <import>import crfa</import>
-  <import>from crfa.qtgui_range import qtgui_range, RangeWidget</import>
+  <key>variable_multirds_qtgui_range</key>
+  <category>[multirds]</category>
+  <import>import multirds</import>
+  <import>from multirds.qtgui_range import qtgui_range, RangeWidget</import>
   <var_make>self.$(id) = $(id) = $value</var_make>
   <make>#set $win = 'self._%s_win'%$id
                 #set $range = 'self.%s_range'%$id
diff --git a/grc/crfa_qtguitest.xml b/grc/crfa_qtguitest.xml
index 09358da..4802698 100644
--- a/grc/crfa_qtguitest.xml
+++ b/grc/crfa_qtguitest.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0"?>
 <block>
   <name>qtguitest</name>
-  <key>crfa_qtguitest</key>
-  <category>[crfa]</category>
-  <import>import crfa</import>
-  <import>from crfa.qtguitest import qtguitest, CRWidget,Signals</import>
+  <key>multirds_qtguitest</key>
+  <category>[multirds]</category>
+  <import>import multirds</import>
+  <import>from multirds.qtguitest import qtguitest, CRWidget,Signals</import>
   <var_make>self.$(id) = $(id) = $value</var_make>
   <make>#set $win = 'self._%s_win'%$id
 		#set $signals = 'self._%s_signals'%$id
@@ -12,7 +12,7 @@
 	#set $label = '"%s"'%$id
 #end if
 $(signals) = Signals()
-self.$(id) = crfa.qtguitest($(signals),$nPorts)
+self.$(id) = multirds.qtguitest($(signals),$nPorts)
 $(win) = CRWidget($signals, $label)
 $(gui_hint()($win))</make>
 
diff --git a/grc/crfa_rds_decoder.xml b/grc/crfa_rds_decoder.xml
index 315c064..08e355a 100644
--- a/grc/crfa_rds_decoder.xml
+++ b/grc/crfa_rds_decoder.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0"?>
 <block>
   <name>RDS Decoder (cr)</name>
-  <key>crfa_rds_decoder</key>
-  <category>[crfa]</category>
-  <import>import crfa</import>
-  <make>crfa.rds_decoder($log, $debug)</make>
+  <key>multirds_rds_decoder</key>
+  <category>[multirds]</category>
+  <import>import multirds</import>
+  <make>multirds.rds_decoder($log, $debug)</make>
 	<param>
 		<name>Log</name>
 		<key>log</key>
diff --git a/grc/crfa_rds_decoder_redsea.xml b/grc/crfa_rds_decoder_redsea.xml
index c51b2e5..f766b6a 100644
--- a/grc/crfa_rds_decoder_redsea.xml
+++ b/grc/crfa_rds_decoder_redsea.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0"?>
 <block>
   <name>RDS Decoder (redsea)</name>
-  <key>crfa_rds_decoder_redsea</key>
-  <category>[crfa]</category>
-  <import>import crfa</import>
-  <make>crfa.rds_decoder_redsea($log, $debug)</make>
+  <key>multirds_rds_decoder_redsea</key>
+  <category>[multirds]</category>
+  <import>import multirds</import>
+  <make>multirds.rds_decoder_redsea($log, $debug)</make>
         <param>
                 <name>Log</name>
                 <key>log</key>
diff --git a/grc/crfa_rds_parser_table_qt.xml b/grc/crfa_rds_parser_table_qt.xml
index ca6ad74..e41f884 100644
--- a/grc/crfa_rds_parser_table_qt.xml
+++ b/grc/crfa_rds_parser_table_qt.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0"?>
 <block>
   <name>RDS Parser Table (qt)</name>
-  <key>crfa_rds_parser_table_qt</key>
-  <category>[crfa]</category>
-  <import>import crfa</import>
-  <import>from crfa.rds_parser_table_qt import rds_parser_table_qt, rds_parser_table_qt_Widget,rds_parser_table_qt_Signals</import>
+  <key>multirds_rds_parser_table_qt</key>
+  <category>[multirds]</category>
+  <import>import multirds</import>
+  <import>from multirds.rds_parser_table_qt import rds_parser_table_qt, rds_parser_table_qt_Widget,rds_parser_table_qt_Signals</import>
 <!--
   <var_make>self.$(id) = $(id) = $value</var_make>
 -->
@@ -14,7 +14,7 @@
 	#set $label = '"%s"'%$id
 #end if
 $(signals) = rds_parser_table_qt_Signals()
-self.$(id) = crfa.rds_parser_table_qt($(signals),$nPorts,self.set_$(freq_tune),$freq_tune,$log, $debug,$workdir,$writeDB)
+self.$(id) = multirds.rds_parser_table_qt($(signals),$nPorts,self.set_$(freq_tune),$freq_tune,$log, $debug,$workdir,$writeDB)
 $(win) = rds_parser_table_qt_Widget($signals, $label,self.$(id))
 $(gui_hint()($win))</make>
   <callback>set_freq_tune($freq_tune);</callback>
diff --git a/grc/crfa_rds_table_qt.xml b/grc/crfa_rds_table_qt.xml
index bf157df..7cfc1d9 100644
--- a/grc/crfa_rds_table_qt.xml
+++ b/grc/crfa_rds_table_qt.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0"?>
 <block>
   <name>RDS Table (qt)</name>
-  <key>crfa_rds_table_qt</key>
-  <category>[crfa]</category>
-  <import>import crfa</import>
-  <import>from crfa.rds_table_qt import rds_table_qt, rds_table_qt_Widget,rds_table_qt_Signals</import>
+  <key>multirds_rds_table_qt</key>
+  <category>[multirds]</category>
+  <import>import multirds</import>
+  <import>from multirds.rds_table_qt import rds_table_qt, rds_table_qt_Widget,rds_table_qt_Signals</import>
   <var_make>self.$(id) = $(id) = $value</var_make>
   <make>#set $win = 'self._%s_win'%$id
 		#set $signals = 'self._%s_signals'%$id
@@ -12,7 +12,7 @@
 	#set $label = '"%s"'%$id
 #end if
 $(signals) = rds_table_qt_Signals()
-self.$(id) = crfa.rds_table_qt($(signals),$nPorts)
+self.$(id) = multirds.rds_table_qt($(signals),$nPorts)
 $(win) = rds_table_qt_Widget($signals, $label)
 $(gui_hint()($win))</make>
   <param>
diff --git a/grc/crfa_smooth_vectors.xml b/grc/crfa_smooth_vectors.xml
index 2250d34..75ac34e 100644
--- a/grc/crfa_smooth_vectors.xml
+++ b/grc/crfa_smooth_vectors.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0"?>
 <block>
   <name>smooth_vectors</name>
-  <key>crfa_smooth_vectors</key>
-  <category>[crfa]</category>
-  <import>import crfa</import>
-  <make>crfa.smooth_vectors($vec_len, $decim, $moving_avg_len)</make>
+  <key>multirds_smooth_vectors</key>
+  <category>[multirds]</category>
+  <import>import multirds</import>
+  <make>multirds.smooth_vectors($vec_len, $decim, $moving_avg_len)</make>
   <!-- Make one 'param' node for every Parameter you want settable from the GUI.
        Sub-nodes:
        * name
diff --git a/grc/crfa_stream_selector.xml b/grc/crfa_stream_selector.xml
index 24afecd..4427e19 100644
--- a/grc/crfa_stream_selector.xml
+++ b/grc/crfa_stream_selector.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0"?>
 <block>
   <name>stream_selector</name>
-  <key>crfa_stream_selector</key>
-  <category>[crfa]</category>
-  <import>import crfa</import>
-  <make>crfa.stream_selector()</make>
+  <key>multirds_stream_selector</key>
+  <category>[multirds]</category>
+  <import>import multirds</import>
+  <make>multirds.stream_selector()</make>
 
  <!-- <param>
     <name>...</name>
diff --git a/grc/crfa_sync_decim.xml b/grc/crfa_sync_decim.xml
index 2e94b31..fe71ca4 100644
--- a/grc/crfa_sync_decim.xml
+++ b/grc/crfa_sync_decim.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0"?>
 <block>
   <name>sync_decim</name>
-  <key>crfa_sync_decim</key>
-  <category>[crfa]</category>
-  <import>import crfa</import>
-  <make>crfa.sync_decim($threshold, $min_diff, $log)</make>
+  <key>multirds_sync_decim</key>
+  <category>[multirds]</category>
+  <import>import multirds</import>
+  <make>multirds.sync_decim($threshold, $min_diff, $log)</make>
   <!-- Make one 'param' node for every Parameter you want settable from the GUI.
        Sub-nodes:
        * name
diff --git a/grc/crfa_tmc_parser.xml b/grc/crfa_tmc_parser.xml
index 28445f6..69cac09 100644
--- a/grc/crfa_tmc_parser.xml
+++ b/grc/crfa_tmc_parser.xml
@@ -1,20 +1,20 @@
 <?xml version="1.0"?>
 <block>
   <name>tmc_parser</name>
-  <key>crfa_tmc_parser</key>
-  <category>crfa</category>
-  <import>import crfa</import>
+  <key>multirds_tmc_parser</key>
+  <category>multirds</category>
+  <import>import multirds</import>
   <make>#set $win = 'self._%s_win'%$id
         #set $parser = 'self.%s_parser'%$id
 #if not $label()
 	#set $label = '"%s"'%$id
 #end if
-$(parser) = crfa.tmc_parser($workdir, $log, $debug, $writeDB,$maxheight)
+$(parser) = multirds.tmc_parser($workdir, $log, $debug, $writeDB,$maxheight)
 $(win) = $(parser).getqtwidget()
 $(gui_hint()($win))
   </make>
 <!--
-  crfa.tmc_parser($workdir, $log, $debug, $writeDB)
+  multirds.tmc_parser($workdir, $log, $debug, $writeDB)
 -->
   <param>
     <name>maxheight</name>
diff --git a/grc/crfa_variable_setter.xml b/grc/crfa_variable_setter.xml
index 008704a..0c0f548 100644
--- a/grc/crfa_variable_setter.xml
+++ b/grc/crfa_variable_setter.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0"?>
 <block>
   <name>variable_setter</name>
-  <key>crfa_variable_setter</key>
-  <category>[crfa]</category>
-  <import>import crfa</import>
+  <key>multirds_variable_setter</key>
+  <category>[multirds]</category>
+  <import>import multirds</import>
   <make>#set $block = 'self.%s'%$id
     #set $varsetter = 'self.set_%s'%$varname
     #set $guiupdater = 'self._%s_win.update_gui'%$varname
-    crfa.variable_setter("$varname",$varsetter,$guiupdater,$is_pair,$msgkey)</make>
-  <!--$(block) = crfa.variable_setter($varname,$varsetter) -->
+    multirds.variable_setter("$varname",$varsetter,$guiupdater,$is_pair,$msgkey)</make>
+  <!--$(block) = multirds.variable_setter($varname,$varsetter) -->
   <param>
     <name>varname</name>
     <key>varname</key>
diff --git a/grc/crfa_vector_cutter.xml b/grc/crfa_vector_cutter.xml
index a433454..c4ad7d7 100644
--- a/grc/crfa_vector_cutter.xml
+++ b/grc/crfa_vector_cutter.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0"?>
 <block>
   <name>vector_cutter</name>
-  <key>crfa_vector_cutter</key>
-  <category>[crfa]</category>
-  <import>import crfa</import>
-  <make>crfa.vector_cutter($insize, $outsize, $cutpoint,$pad_out,$zero_len)</make>
+  <key>multirds_vector_cutter</key>
+  <category>[multirds]</category>
+  <import>import multirds</import>
+  <make>multirds.vector_cutter($insize, $outsize, $cutpoint,$pad_out,$zero_len)</make>
   <!-- Make one 'param' node for every Parameter you want settable from the GUI.
        Sub-nodes:
        * name
diff --git a/include/crfa/CMakeLists.txt b/include/crfa/CMakeLists.txt
index 505fbbd..076f1ba 100644
--- a/include/crfa/CMakeLists.txt
+++ b/include/crfa/CMakeLists.txt
@@ -25,5 +25,5 @@ install(FILES
     rds_decoder.h
     diff_add_sync_decim.h
     sync_decim.h
-    rds_decoder_redsea.h DESTINATION include/crfa
+    rds_decoder_redsea.h DESTINATION include/multirds
 )
diff --git a/include/crfa/api.h b/include/crfa/api.h
index fd6a891..fc3545f 100644
--- a/include/crfa/api.h
+++ b/include/crfa/api.h
@@ -24,7 +24,7 @@
 
 #include <gnuradio/attributes.h>
 
-#ifdef gnuradio_crfa_EXPORTS
+#ifdef gnuradio_multirds_EXPORTS
 #  define CRFA_API __GR_ATTR_EXPORT
 #else
 #  define CRFA_API __GR_ATTR_IMPORT
diff --git a/include/crfa/diff_add_sync_decim.h b/include/crfa/diff_add_sync_decim.h
index a3bb88b..4deef45 100644
--- a/include/crfa/diff_add_sync_decim.h
+++ b/include/crfa/diff_add_sync_decim.h
@@ -22,15 +22,15 @@
 #ifndef INCLUDED_CRFA_DIFF_ADD_SYNC_DECIM_H
 #define INCLUDED_CRFA_DIFF_ADD_SYNC_DECIM_H
 
-#include <crfa/api.h>
+#include <multirds/api.h>
 #include <gnuradio/sync_decimator.h>
 
 namespace gr {
-  namespace crfa {
+  namespace multirds {
 
     /*!
      * \brief <+description of block+>
-     * \ingroup crfa
+     * \ingroup multirds
      *
      */
     class CRFA_API diff_add_sync_decim : virtual public gr::sync_decimator
@@ -39,17 +39,17 @@ namespace gr {
       typedef boost::shared_ptr<diff_add_sync_decim> sptr;
 
       /*!
-       * \brief Return a shared_ptr to a new instance of crfa::diff_add_sync_decim.
+       * \brief Return a shared_ptr to a new instance of multirds::diff_add_sync_decim.
        *
-       * To avoid accidental use of raw pointers, crfa::diff_add_sync_decim's
+       * To avoid accidental use of raw pointers, multirds::diff_add_sync_decim's
        * constructor is in a private implementation
-       * class. crfa::diff_add_sync_decim::make is the public interface for
+       * class. multirds::diff_add_sync_decim::make is the public interface for
        * creating new instances.
        */
       static sptr make(float threshold,float max_ratio_below_threshold,bool log);
     };
 
-  } // namespace crfa
+  } // namespace multirds
 } // namespace gr
 
 #endif /* INCLUDED_CRFA_DIFF_ADD_SYNC_DECIM_H */
diff --git a/include/crfa/rds_decoder.h b/include/crfa/rds_decoder.h
index 7557e65..efb0b71 100644
--- a/include/crfa/rds_decoder.h
+++ b/include/crfa/rds_decoder.h
@@ -22,15 +22,15 @@
 #ifndef INCLUDED_CRFA_RDS_DECODER_H
 #define INCLUDED_CRFA_RDS_DECODER_H
 
-#include <crfa/api.h>
+#include <multirds/api.h>
 #include <gnuradio/sync_block.h>
 
 namespace gr {
-  namespace crfa {
+  namespace multirds {
 
     /*!
      * \brief <+description of block+>
-     * \ingroup crfa
+     * \ingroup multirds
      *
      */
     class CRFA_API rds_decoder : virtual public gr::sync_block
@@ -39,17 +39,17 @@ namespace gr {
       typedef boost::shared_ptr<rds_decoder> sptr;
 
       /*!
-       * \brief Return a shared_ptr to a new instance of crfa::rds_decoder.
+       * \brief Return a shared_ptr to a new instance of multirds::rds_decoder.
        *
-       * To avoid accidental use of raw pointers, crfa::rds_decoder's
+       * To avoid accidental use of raw pointers, multirds::rds_decoder's
        * constructor is in a private implementation
-       * class. crfa::rds_decoder::make is the public interface for
+       * class. multirds::rds_decoder::make is the public interface for
        * creating new instances.
        */
       static sptr make(bool log, bool debug);
     };
 
-  } // namespace crfa
+  } // namespace multirds
 } // namespace gr
 
 #endif /* INCLUDED_CRFA_RDS_DECODER_H */
diff --git a/include/crfa/rds_decoder_redsea.h b/include/crfa/rds_decoder_redsea.h
index 05b52ab..8f7b726 100644
--- a/include/crfa/rds_decoder_redsea.h
+++ b/include/crfa/rds_decoder_redsea.h
@@ -22,15 +22,15 @@
 #ifndef INCLUDED_CRFA_RDS_DECODER_REDSEA_H
 #define INCLUDED_CRFA_RDS_DECODER_REDSEA_H
 
-#include <crfa/api.h>
+#include <multirds/api.h>
 #include <gnuradio/sync_block.h>
 
 namespace gr {
-  namespace crfa {
+  namespace multirds {
 
     /*!
      * \brief <+description of block+>
-     * \ingroup crfa
+     * \ingroup multirds
      *
      */
     class CRFA_API rds_decoder_redsea : virtual public gr::sync_block
@@ -39,17 +39,17 @@ namespace gr {
       typedef boost::shared_ptr<rds_decoder_redsea> sptr;
 
       /*!
-       * \brief Return a shared_ptr to a new instance of crfa::rds_decoder_redsea.
+       * \brief Return a shared_ptr to a new instance of multirds::rds_decoder_redsea.
        *
-       * To avoid accidental use of raw pointers, crfa::rds_decoder_redsea's
+       * To avoid accidental use of raw pointers, multirds::rds_decoder_redsea's
        * constructor is in a private implementation
-       * class. crfa::rds_decoder_redsea::make is the public interface for
+       * class. multirds::rds_decoder_redsea::make is the public interface for
        * creating new instances.
        */
       static sptr make(bool log,bool debug);
     };
 
-  } // namespace crfa
+  } // namespace multirds
 } // namespace gr
 
 #endif /* INCLUDED_CRFA_RDS_DECODER_REDSEA_H */
diff --git a/include/crfa/sync_decim.h b/include/crfa/sync_decim.h
index 816ff14..a1d9808 100644
--- a/include/crfa/sync_decim.h
+++ b/include/crfa/sync_decim.h
@@ -22,15 +22,15 @@
 #ifndef INCLUDED_CRFA_SYNC_DECIM_H
 #define INCLUDED_CRFA_SYNC_DECIM_H
 
-#include <crfa/api.h>
+#include <multirds/api.h>
 #include <gnuradio/sync_decimator.h>
 
 namespace gr {
-  namespace crfa {
+  namespace multirds {
 
     /*!
      * \brief <+description of block+>
-     * \ingroup crfa
+     * \ingroup multirds
      *
      */
     class CRFA_API sync_decim : virtual public gr::sync_decimator
@@ -39,17 +39,17 @@ namespace gr {
       typedef boost::shared_ptr<sync_decim> sptr;
 
       /*!
-       * \brief Return a shared_ptr to a new instance of crfa::sync_decim.
+       * \brief Return a shared_ptr to a new instance of multirds::sync_decim.
        *
-       * To avoid accidental use of raw pointers, crfa::sync_decim's
+       * To avoid accidental use of raw pointers, multirds::sync_decim's
        * constructor is in a private implementation
-       * class. crfa::sync_decim::make is the public interface for
+       * class. multirds::sync_decim::make is the public interface for
        * creating new instances.
        */
       static sptr make(float threshold,float min_diff,bool log);
     };
 
-  } // namespace crfa
+  } // namespace multirds
 } // namespace gr
 
 #endif /* INCLUDED_CRFA_SYNC_DECIM_H */
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index 022c609..8fce430 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -24,24 +24,24 @@ include(GrPlatform) #define LIB_SUFFIX
 
 include_directories(${Boost_INCLUDE_DIR})
 link_directories(${Boost_LIBRARY_DIRS})
-list(APPEND crfa_sources
+list(APPEND multirds_sources
     rds_decoder_impl.cc
     diff_add_sync_decim_impl.cc
     sync_decim_impl.cc
     rds_decoder_redsea_impl.cc )
 
-set(crfa_sources "${crfa_sources}" PARENT_SCOPE)
-if(NOT crfa_sources)
+set(multirds_sources "${multirds_sources}" PARENT_SCOPE)
+if(NOT multirds_sources)
 	MESSAGE(STATUS "No C++ sources... skipping lib/")
 	return()
-endif(NOT crfa_sources)
+endif(NOT multirds_sources)
 
-add_library(gnuradio-crfa SHARED ${crfa_sources})
-target_link_libraries(gnuradio-crfa ${Boost_LIBRARIES} ${GNURADIO_ALL_LIBRARIES})
-set_target_properties(gnuradio-crfa PROPERTIES DEFINE_SYMBOL "gnuradio_crfa_EXPORTS")
+add_library(gnuradio-multirds SHARED ${multirds_sources})
+target_link_libraries(gnuradio-multirds ${Boost_LIBRARIES} ${GNURADIO_ALL_LIBRARIES})
+set_target_properties(gnuradio-multirds PROPERTIES DEFINE_SYMBOL "gnuradio_multirds_EXPORTS")
 
 if(APPLE)
-    set_target_properties(gnuradio-crfa PROPERTIES
+    set_target_properties(gnuradio-multirds PROPERTIES
         INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib"
     )
 endif(APPLE)
@@ -50,7 +50,7 @@ endif(APPLE)
 # Install built library files
 ########################################################################
 include(GrMiscUtils)
-GR_LIBRARY_FOO(gnuradio-crfa RUNTIME_COMPONENT "crfa_runtime" DEVEL_COMPONENT "crfa_devel")
+GR_LIBRARY_FOO(gnuradio-multirds RUNTIME_COMPONENT "multirds_runtime" DEVEL_COMPONENT "multirds_devel")
 
 ########################################################################
 # Build and register unit test
@@ -59,22 +59,22 @@ include(GrTest)
 
 include_directories(${CPPUNIT_INCLUDE_DIRS})
 
-list(APPEND test_crfa_sources
-    ${CMAKE_CURRENT_SOURCE_DIR}/test_crfa.cc
-    ${CMAKE_CURRENT_SOURCE_DIR}/qa_crfa.cc
+list(APPEND test_multirds_sources
+    ${CMAKE_CURRENT_SOURCE_DIR}/test_multirds.cc
+    ${CMAKE_CURRENT_SOURCE_DIR}/qa_multirds.cc
 )
 
-add_executable(test-crfa ${test_crfa_sources})
+add_executable(test-multirds ${test_multirds_sources})
 
 target_link_libraries(
-  test-crfa
+  test-multirds
   ${GNURADIO_RUNTIME_LIBRARIES}
   ${Boost_LIBRARIES}
   ${CPPUNIT_LIBRARIES}
-  gnuradio-crfa
+  gnuradio-multirds
 )
 
-GR_ADD_TEST(test_crfa test-crfa)
+GR_ADD_TEST(test_multirds test-multirds)
 
 ########################################################################
 # Print summary
diff --git a/lib/diff_add_sync_decim_impl.cc b/lib/diff_add_sync_decim_impl.cc
index fa147af..251b833 100644
--- a/lib/diff_add_sync_decim_impl.cc
+++ b/lib/diff_add_sync_decim_impl.cc
@@ -28,7 +28,7 @@
 #define lout log && std::cout
 
 namespace gr {
-  namespace crfa {
+  namespace multirds {
 
     diff_add_sync_decim::sptr
     diff_add_sync_decim::make(float threshold,float max_ratio_below_threshold,bool log)
@@ -137,6 +137,6 @@ namespace gr {
       return noutput_items;
     }
 
-  } /* namespace crfa */
+  } /* namespace multirds */
 } /* namespace gr */
 
diff --git a/lib/diff_add_sync_decim_impl.h b/lib/diff_add_sync_decim_impl.h
index c55e8e4..ee1af38 100644
--- a/lib/diff_add_sync_decim_impl.h
+++ b/lib/diff_add_sync_decim_impl.h
@@ -21,10 +21,10 @@
 #ifndef INCLUDED_CRFA_DIFF_ADD_SYNC_DECIM_IMPL_H
 #define INCLUDED_CRFA_DIFF_ADD_SYNC_DECIM_IMPL_H
 
-#include <crfa/diff_add_sync_decim.h>
+#include <multirds/diff_add_sync_decim.h>
 
 namespace gr {
-  namespace crfa {
+  namespace multirds {
 
     class diff_add_sync_decim_impl : public diff_add_sync_decim
     {
@@ -47,7 +47,7 @@ namespace gr {
       unsigned int skip;
     };
 
-  } // namespace crfa
+  } // namespace multirds
 } // namespace gr
 
 #endif /* INCLUDED_CRFA_DIFF_ADD_SYNC_DECIM_IMPL_H */
diff --git a/lib/qa_crfa.cc b/lib/qa_crfa.cc
index 91cc163..0387122 100644
--- a/lib/qa_crfa.cc
+++ b/lib/qa_crfa.cc
@@ -25,12 +25,12 @@
  * add them here.
  */
 
-#include "qa_crfa.h"
+#include "qa_multirds.h"
 
 CppUnit::TestSuite *
-qa_crfa::suite()
+qa_multirds::suite()
 {
-  CppUnit::TestSuite *s = new CppUnit::TestSuite("crfa");
+  CppUnit::TestSuite *s = new CppUnit::TestSuite("multirds");
 
   return s;
 }
diff --git a/lib/qa_crfa.h b/lib/qa_crfa.h
index c29da0d..076a7f0 100644
--- a/lib/qa_crfa.h
+++ b/lib/qa_crfa.h
@@ -28,7 +28,7 @@
 
 //! collect all the tests for the gr-filter directory
 
-class __GR_ATTR_EXPORT qa_crfa
+class __GR_ATTR_EXPORT qa_multirds
 {
  public:
   //! return suite of tests for all of gr-filter directory
diff --git a/lib/rds_decoder_impl.cc b/lib/rds_decoder_impl.cc
index aadf6db..d86b60c 100644
--- a/lib/rds_decoder_impl.cc
+++ b/lib/rds_decoder_impl.cc
@@ -32,7 +32,7 @@
 #include <vector>
 
 namespace gr {
-  namespace crfa {
+  namespace multirds {
 
     rds_decoder::sptr
     rds_decoder::make(bool log, bool debug)
@@ -266,6 +266,6 @@ int rds_decoder_impl::work (int noutput_items,
    }/*end of work function*/
    
 
-  } /* namespace crfa */
+  } /* namespace multirds */
 } /* namespace gr */
 
diff --git a/lib/rds_decoder_impl.h b/lib/rds_decoder_impl.h
index 6270b57..1a149d4 100644
--- a/lib/rds_decoder_impl.h
+++ b/lib/rds_decoder_impl.h
@@ -21,10 +21,10 @@
 #ifndef INCLUDED_CRFA_RDS_DECODER_IMPL_H
 #define INCLUDED_CRFA_RDS_DECODER_IMPL_H
 
-#include <crfa/rds_decoder.h>
+#include <multirds/rds_decoder.h>
 
 namespace gr {
-  namespace crfa {
+  namespace multirds {
 
     class rds_decoder_impl : public rds_decoder
     {
@@ -72,7 +72,7 @@ private:
 
     };
 
-  } // namespace crfa
+  } // namespace multirds
 } // namespace gr
 
 #endif /* INCLUDED_CRFA_RDS_DECODER_IMPL_H */
diff --git a/lib/rds_decoder_redsea_impl.cc b/lib/rds_decoder_redsea_impl.cc
index c2889fe..0737103 100644
--- a/lib/rds_decoder_redsea_impl.cc
+++ b/lib/rds_decoder_redsea_impl.cc
@@ -32,7 +32,7 @@
 #include <vector>
 
 namespace gr {
-  namespace crfa {
+  namespace multirds {
 
     rds_decoder_redsea::sptr
     rds_decoder_redsea::make(bool log, bool debug)
@@ -344,6 +344,6 @@ int rds_decoder_redsea_impl::work (int noutput_items,
    }/*end of work function*/
    
 
-  } /* namespace crfa */
+  } /* namespace multirds */
 } /* namespace gr */
 
diff --git a/lib/rds_decoder_redsea_impl.h b/lib/rds_decoder_redsea_impl.h
index b1d982e..8d45c87 100644
--- a/lib/rds_decoder_redsea_impl.h
+++ b/lib/rds_decoder_redsea_impl.h
@@ -21,10 +21,10 @@
 #ifndef INCLUDED_CRFA_RDS_DECODER_IMPL_H
 #define INCLUDED_CRFA_RDS_DECODER_IMPL_H
 
-#include <crfa/rds_decoder_redsea.h>
+#include <multirds/rds_decoder_redsea.h>
 
 namespace gr {
-  namespace crfa {
+  namespace multirds {
 
     class rds_decoder_redsea_impl : public rds_decoder_redsea
     {
@@ -74,7 +74,7 @@ private:
 
     };
 
-  } // namespace crfa
+  } // namespace multirds
 } // namespace gr
 
 #endif /* INCLUDED_CRFA_RDS_DECODER_IMPL_H */
diff --git a/lib/sync_decim_impl.cc b/lib/sync_decim_impl.cc
index 0415529..a753cc4 100644
--- a/lib/sync_decim_impl.cc
+++ b/lib/sync_decim_impl.cc
@@ -29,7 +29,7 @@
 #define SYNC_COUNTER_MAX 5//higher value -> slower sync, less cpu load
 //#include <pmt.h>
 namespace gr {
-  namespace crfa {
+  namespace multirds {
     
     sync_decim::sptr
     sync_decim::make(float threshold,float min_diff,bool log)
@@ -150,6 +150,6 @@ namespace gr {
           // Tell runtime system how many output items we produced.
           return noutput_items;
         }/*end of work*/
-  } /* namespace crfa */
+  } /* namespace multirds */
 } /* namespace gr */
 
diff --git a/lib/sync_decim_impl.h b/lib/sync_decim_impl.h
index 1628cd1..fc28c6c 100644
--- a/lib/sync_decim_impl.h
+++ b/lib/sync_decim_impl.h
@@ -21,10 +21,10 @@
 #ifndef INCLUDED_CRFA_SYNC_DECIM_IMPL_H
 #define INCLUDED_CRFA_SYNC_DECIM_IMPL_H
 
-#include <crfa/sync_decim.h>
+#include <multirds/sync_decim.h>
 
 namespace gr {
-  namespace crfa {
+  namespace multirds {
 
     class sync_decim_impl : public sync_decim
     {
@@ -49,7 +49,7 @@ namespace gr {
       int dosync_counter;
     };
 
-  } // namespace crfa
+  } // namespace multirds
 } // namespace gr
 
 #endif /* INCLUDED_CRFA_SYNC_DECIM_IMPL_H */
diff --git a/lib/test_crfa.cc b/lib/test_crfa.cc
index 311f535..dbfce4a 100644
--- a/lib/test_crfa.cc
+++ b/lib/test_crfa.cc
@@ -28,7 +28,7 @@
 #include <cppunit/XmlOutputter.h>
 
 #include <gnuradio/unittests.h>
-#include "qa_crfa.h"
+#include "qa_multirds.h"
 #include <iostream>
 #include <fstream>
 
@@ -36,10 +36,10 @@ int
 main (int argc, char **argv)
 {
   CppUnit::TextTestRunner runner;
-  std::ofstream xmlfile(get_unittest_path("crfa.xml").c_str());
+  std::ofstream xmlfile(get_unittest_path("multirds.xml").c_str());
   CppUnit::XmlOutputter *xmlout = new CppUnit::XmlOutputter(&runner.result(), xmlfile);
 
-  runner.addTest(qa_crfa::suite());
+  runner.addTest(qa_multirds::suite());
   runner.setOutputter(xmlout);
 
   bool was_successful = runner.run("", false);
diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt
index efb279a..dd33d2e 100644
--- a/python/CMakeLists.txt
+++ b/python/CMakeLists.txt
@@ -44,7 +44,7 @@ GR_PYTHON_INSTALL(
     qtgui_range.py
     variable_setter.py
     tmc_classes.py
-    tmc_parser.py DESTINATION ${GR_PYTHON_DIR}/crfa
+    tmc_parser.py DESTINATION ${GR_PYTHON_DIR}/multirds
 )
 
 ########################################################################
@@ -52,5 +52,5 @@ GR_PYTHON_INSTALL(
 ########################################################################
 include(GrTest)
 
-set(GR_TEST_TARGET_DEPS gnuradio-crfa)
+set(GR_TEST_TARGET_DEPS gnuradio-multirds)
 set(GR_TEST_PYTHON_DIRS ${CMAKE_BINARY_DIR}/swig)
diff --git a/python/__init__.py b/python/__init__.py
index 7517306..e4aabb9 100644
--- a/python/__init__.py
+++ b/python/__init__.py
@@ -23,10 +23,10 @@ This is the GNU Radio CRFA module. Place your Python package
 description here (python/__init__.py).
 '''
 
-# import swig generated symbols into the crfa namespace
+# import swig generated symbols into the multirds namespace
 try:
 	# this might fail if the module is python-only
-	from crfa_swig import *
+	from multirds_swig import *
 except ImportError:
 	pass
 
diff --git a/python/rds_parser_table_qt.py b/python/rds_parser_table_qt.py
index daf937c..da81db1 100644
--- a/python/rds_parser_table_qt.py
+++ b/python/rds_parser_table_qt.py
@@ -25,8 +25,8 @@ import pmt,functools,csv,md5,collections,copy,sqlite3,atexit,time,re,sys
 #old imports: folium
 from datetime import datetime
 from datetime import timedelta
-import crfa.chart as chart
-from crfa.tmc_classes import tmc_dict,tmc_message,language
+import multirds.chart as chart
+from multirds.tmc_classes import tmc_dict,tmc_message,language
 
 from PyQt4 import Qt, QtCore, QtGui
 import pprint,code,pickle#for easier testing
diff --git a/python/rds_parser_table_qt.py.bak b/python/rds_parser_table_qt.py.bak
index 3202f3a..50ce382 100644
--- a/python/rds_parser_table_qt.py.bak
+++ b/python/rds_parser_table_qt.py.bak
@@ -25,8 +25,8 @@ import pmt,functools,csv,md5,collections,copy,sqlite3,atexit,time,re,sys
 #old imports: folium
 from datetime import datetime
 from datetime import timedelta
-import crfa.chart as chart
-from crfa.tmc_classes import tmc_dict,tmc_message
+import multirds.chart as chart
+from multirds.tmc_classes import tmc_dict,tmc_message
 
 from PyQt4 import Qt, QtCore, QtGui
 import pprint,code,pickle#for easier testing
diff --git a/python/rds_parser_table_qt.pyc b/python/rds_parser_table_qt.pyc
index c330c4f..974ceb4 100644
Binary files a/python/rds_parser_table_qt.pyc and b/python/rds_parser_table_qt.pyc differ
diff --git a/python/rds_parser_table_qt.sync-conflict-20170315-102705.py b/python/rds_parser_table_qt.sync-conflict-20170315-102705.py
index fc90543..7eaf4b4 100644
--- a/python/rds_parser_table_qt.sync-conflict-20170315-102705.py
+++ b/python/rds_parser_table_qt.sync-conflict-20170315-102705.py
@@ -25,7 +25,7 @@ import pmt,functools,csv,md5,collections,copy,sqlite3,atexit,time,re,sys
 #old imports: folium
 from datetime import datetime
 from datetime import timedelta
-import crfa.chart as chart
+import multirds.chart as chart
 
 from PyQt4 import Qt, QtCore, QtGui
 import pprint,code,pickle#for easier testing
diff --git a/python/tmc_parser.py b/python/tmc_parser.py
index 025e72a..a5ae13e 100644
--- a/python/tmc_parser.py
+++ b/python/tmc_parser.py
@@ -25,7 +25,7 @@ import pmt
 from PyQt4 import Qt, QtCore, QtGui
 import code,time,csv,sqlite3,atexit
 from bitstring import BitArray
-from crfa.tmc_classes import tmc_dict,tmc_message,language
+from multirds.tmc_classes import tmc_dict,tmc_message,language
 from datetime import datetime
 from datetime import timedelta
 
diff --git a/swig/CMakeLists.txt b/swig/CMakeLists.txt
index a2e2cd4..7afce40 100644
--- a/swig/CMakeLists.txt
+++ b/swig/CMakeLists.txt
@@ -20,10 +20,10 @@
 ########################################################################
 # Check if there is C++ code at all
 ########################################################################
-if(NOT crfa_sources)
+if(NOT multirds_sources)
 	MESSAGE(STATUS "No C++ sources... skipping swig/")
 	return()
-endif(NOT crfa_sources)
+endif(NOT multirds_sources)
 
 ########################################################################
 # Include swig generation macros
@@ -43,23 +43,23 @@ foreach(incdir ${GNURADIO_RUNTIME_INCLUDE_DIRS})
     list(APPEND GR_SWIG_INCLUDE_DIRS ${incdir}/gnuradio/swig)
 endforeach(incdir)
 
-set(GR_SWIG_LIBRARIES gnuradio-crfa)
-set(GR_SWIG_DOC_FILE ${CMAKE_CURRENT_BINARY_DIR}/crfa_swig_doc.i)
+set(GR_SWIG_LIBRARIES gnuradio-multirds)
+set(GR_SWIG_DOC_FILE ${CMAKE_CURRENT_BINARY_DIR}/multirds_swig_doc.i)
 set(GR_SWIG_DOC_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../include)
 
-GR_SWIG_MAKE(crfa_swig crfa_swig.i)
+GR_SWIG_MAKE(multirds_swig multirds_swig.i)
 
 ########################################################################
 # Install the build swig module
 ########################################################################
-GR_SWIG_INSTALL(TARGETS crfa_swig DESTINATION ${GR_PYTHON_DIR}/crfa)
+GR_SWIG_INSTALL(TARGETS multirds_swig DESTINATION ${GR_PYTHON_DIR}/multirds)
 
 ########################################################################
 # Install swig .i files for development
 ########################################################################
 install(
     FILES
-    crfa_swig.i
-    ${CMAKE_CURRENT_BINARY_DIR}/crfa_swig_doc.i
-    DESTINATION ${GR_INCLUDE_DIR}/crfa/swig
+    multirds_swig.i
+    ${CMAKE_CURRENT_BINARY_DIR}/multirds_swig_doc.i
+    DESTINATION ${GR_INCLUDE_DIR}/multirds/swig
 )
diff --git a/swig/crfa_swig.i b/swig/crfa_swig.i
index 606ab65..a23650c 100644
--- a/swig/crfa_swig.i
+++ b/swig/crfa_swig.i
@@ -5,20 +5,20 @@
 %include "gnuradio.i"			// the common stuff
 
 //load generated python docstrings
-%include "crfa_swig_doc.i"
+%include "multirds_swig_doc.i"
 
 %{
-#include "crfa/rds_decoder.h"
-#include "crfa/diff_add_sync_decim.h"
-#include "crfa/sync_decim.h"
-#include "crfa/rds_decoder_redsea.h"
+#include "multirds/rds_decoder.h"
+#include "multirds/diff_add_sync_decim.h"
+#include "multirds/sync_decim.h"
+#include "multirds/rds_decoder_redsea.h"
 %}
 
-%include "crfa/rds_decoder.h"
-GR_SWIG_BLOCK_MAGIC2(crfa, rds_decoder);
-%include "crfa/diff_add_sync_decim.h"
-GR_SWIG_BLOCK_MAGIC2(crfa, diff_add_sync_decim);
-%include "crfa/sync_decim.h"
-GR_SWIG_BLOCK_MAGIC2(crfa, sync_decim);
-%include "crfa/rds_decoder_redsea.h"
-GR_SWIG_BLOCK_MAGIC2(crfa, rds_decoder_redsea);
+%include "multirds/rds_decoder.h"
+GR_SWIG_BLOCK_MAGIC2(multirds, rds_decoder);
+%include "multirds/diff_add_sync_decim.h"
+GR_SWIG_BLOCK_MAGIC2(multirds, diff_add_sync_decim);
+%include "multirds/sync_decim.h"
+GR_SWIG_BLOCK_MAGIC2(multirds, sync_decim);
+%include "multirds/rds_decoder_redsea.h"
+GR_SWIG_BLOCK_MAGIC2(multirds, rds_decoder_redsea);