diff --git a/repeater/src/python/disctap_rx.py b/repeater/src/python/disctap_rx.py
index 5855825..7d1986d 100755
--- a/repeater/src/python/disctap_rx.py
+++ b/repeater/src/python/disctap_rx.py
@@ -21,7 +21,7 @@
 
 import sys
 import math
-from gnuradio import gr, gru, audio, eng_notation, blks2, optfir, fsk4, repeater
+from gnuradio import gr, gru, audio, eng_notation, blks2, optfir, op25, repeater
 from gnuradio.eng_option import eng_option
 from optparse import OptionParser
 
@@ -71,7 +71,7 @@ class my_top_block(gr.top_block):
         SYMBOL_FILTER = gr.fir_filter_fff (symbol_decim, symbol_coeffs)
         AMP = gr.multiply_const_ff(options.gain)
         msgq = gr.msg_queue(2)
-        FSK4 = fsk4.demod_ff(msgq, sample_rate, symbol_rate)
+        FSK4 = op25.fsk4_demod_ff(msgq, sample_rate, symbol_rate)
         levels = levels = [-2.0, 0.0, 2.0, 4.0]
         SLICER = repeater.fsk4_slicer_fb(levels)
         framer_msgq = gr.msg_queue(2)
diff --git a/repeater/src/python/scope.py b/repeater/src/python/scope.py
index 3065805..76a5845 100755
--- a/repeater/src/python/scope.py
+++ b/repeater/src/python/scope.py
@@ -37,7 +37,7 @@ import time
 import re
 import Numeric
 
-from gnuradio import audio, eng_notation, fsk4, gr, gru, repeater
+from gnuradio import audio, eng_notation, op25, gr, gru, repeater
 from gnuradio import blks2
 from gnuradio.eng_option import eng_option
 from gnuradio.wxgui import stdgui2, fftsink2, scopesink2, form
@@ -173,7 +173,7 @@ class p25_rx_block (stdgui2.std_top_block):
         self.symbol_filter = gr.fir_filter_fff(symbol_decim, rrc_coeffs)
 
         autotuneq = gr.msg_queue(2)
-        self.fsk4_demod = fsk4.demod_ff(autotuneq, self.basic_rate, self.symbol_rate)
+        self.fsk4_demod = op25.fsk4_demod_ff(autotuneq, self.basic_rate, self.symbol_rate)
 
         self.null_sym = gr.null_sink(gr.sizeof_float)
 
diff --git a/repeater/src/python/usrp_rx.py b/repeater/src/python/usrp_rx.py
index 19bc7d8..1558a7d 100755
--- a/repeater/src/python/usrp_rx.py
+++ b/repeater/src/python/usrp_rx.py
@@ -23,7 +23,7 @@
 # 
 
 from gnuradio import gr, gru, eng_notation, optfir
-from gnuradio import usrp, fsk4
+from gnuradio import usrp, op25
 from gnuradio import repeater
 from gnuradio import blks2
 from gnuradio.eng_option import eng_option
@@ -129,7 +129,7 @@ class rx_channel_c4fm(gr.hier_block2):
 
         # C4FM demodulator
         autotuneq = gr.msg_queue(2)
-        demod_fsk4 = fsk4.demod_ff(autotuneq, channel_rate, symbol_rate)
+        demod_fsk4 = op25.fsk4_demod_ff(autotuneq, channel_rate, symbol_rate)
  
         self.connect (self, chan, fm_demod, symbol_filter, demod_fsk4, self)