diff --git a/python/audio_imbe.py b/python/audio_imbe.py
index ddc4303..c2a5a02 100755
--- a/python/audio_imbe.py
+++ b/python/audio_imbe.py
@@ -2,7 +2,6 @@
 import sys
 import math
 from gnuradio import gr, gru, audio, eng_notation, blks2, optfir, fsk4, repeater
-from gnuradio import op25_imbe
 from gnuradio.eng_option import eng_option
 from optparse import OptionParser
 
@@ -36,7 +35,7 @@ class my_top_block(gr.top_block):
         msgq = gr.msg_queue(2)
         FSK4 = fsk4.demod_ff(msgq, sample_rate, symbol_rate)
         DECODE = repeater.imbe_decode_fb()
-        IMBE = op25_imbe.vocoder(False,                 # 0=Decode,True=Encode
+        IMBE = repeater.vocoder(False,                 # 0=Decode,True=Encode
                                   options.verbose,      # Verbose flag
                                   options.stretch,      # flex amount
                                   "",                   # udp ip address
diff --git a/python/op25_audio_tx.py b/python/op25_audio_tx.py
index 0d3f09f..124c708 100755
--- a/python/op25_audio_tx.py
+++ b/python/op25_audio_tx.py
@@ -34,7 +34,7 @@ from gnuradio import gr, gru, audio, eng_notation, blks2, optfir
 from gnuradio.eng_option import eng_option
 from optparse import OptionParser
 
-from gnuradio import op25_imbe
+from gnuradio import repeater
 import op25_c4fm_mod
 
 class app_top_block(gr.top_block):
@@ -64,7 +64,7 @@ class app_top_block(gr.top_block):
             self.audio_amps.append(t)
             t = gr.float_to_short()
             self.converters.append(t)
-            t = op25_imbe.vocoder(True,                 # 0=Decode,True=Encode
+            t = repeater.vocoder(True,                 # 0=Decode,True=Encode
                                   options.verbose,      # Verbose flag
                                   options.stretch,      # flex amount
                                   "",                   # udp ip address
diff --git a/python/op25_remote_tx.py b/python/op25_remote_tx.py
index ee29354..f0aebbc 100755
--- a/python/op25_remote_tx.py
+++ b/python/op25_remote_tx.py
@@ -34,7 +34,7 @@ from gnuradio import gr, gru, audio, eng_notation, blks2, optfir
 from gnuradio.eng_option import eng_option
 from optparse import OptionParser
 
-from gnuradio import op25_imbe
+from gnuradio import repeater
 
 class app_top_block(gr.top_block):
     def __init__(self, options, queue):
@@ -58,7 +58,7 @@ class app_top_block(gr.top_block):
             self.audio_amps.append(t)
             t = gr.float_to_short()
             self.converters.append(t)
-            t = op25_imbe.vocoder(True,                 # 0=Decode,True=Encode
+            t = repeater.vocoder(True,                 # 0=Decode,True=Encode
                                   options.verbose,      # Verbose flag
                                   options.stretch,      # flex amount
                                   options.udp_addr,     # udp ip address
diff --git a/python/op25_tx.py b/python/op25_tx.py
index da6f71a..515c0dd 100755
--- a/python/op25_tx.py
+++ b/python/op25_tx.py
@@ -39,7 +39,7 @@ running this script when using method B.
 
 """
 
-from gnuradio import gr, eng_notation, op25_imbe
+from gnuradio import gr, eng_notation, repeater
 from gnuradio import usrp
 from gnuradio import audio
 from gnuradio import blks2
@@ -197,7 +197,7 @@ class fm_tx_block(stdgui2.std_top_block):
             self.audio_amps.append(t)
             t = gr.float_to_short()
             self.converters.append(t)
-            t = op25_imbe.vocoder(True,			# 0=Decode,True=Encode
+            t = repeater.vocoder(True,			# 0=Decode,True=Encode
                                   options.verbose,	# Verbose flag
                                   options.stretch,	# flex amount
                                   "",			# udp ip address