7 files changed, 13 insertions, 9 deletions
diff --git a/gr-digital/examples/narrowband/benchmark_rx.py b/gr-digital/examples/narrowband/benchmark_rx.py
index a8a2e92c4..65aac3638 100755
--- a/gr-digital/examples/narrowband/benchmark_rx.py
+++ b/gr-digital/examples/narrowband/benchmark_rx.py
@@ -51,8 +51,10 @@ class my_top_block(gr.top_block):
             options.samples_per_symbol = self.source._sps
 
         elif(options.from_file is not None):
+            sys.stderr.write(("Reading samples from '%s'.\n\n" % (options.from_file)))
             self.source = gr.file_source(gr.sizeof_gr_complex, options.from_file)
         else:
+            sys.stderr.write("No source defined, pulling samples from null source.\n\n")
             self.source = gr.null_source(gr.sizeof_gr_complex)
 
         # Set up receive path
@@ -85,7 +87,7 @@ def main():
         print "ok = %5s  pktno = %4d  n_rcvd = %4d  n_right = %4d" % (
             ok, pktno, n_rcvd, n_right)
 
-    demods = digital.modulation_utils2.type_1_demods()
+    demods = digital.modulation_utils.type_1_demods()
 
     # Create Options Parser:
     parser = OptionParser (option_class=eng_option, conflict_handler="resolve")
diff --git a/gr-digital/examples/narrowband/benchmark_tx.py b/gr-digital/examples/narrowband/benchmark_tx.py
index 39b0066f4..1fd881981 100755
--- a/gr-digital/examples/narrowband/benchmark_tx.py
+++ b/gr-digital/examples/narrowband/benchmark_tx.py
@@ -50,8 +50,10 @@ class my_top_block(gr.top_block):
             options.samples_per_symbol = self.sink._sps
             
         elif(options.to_file is not None):
+            sys.stderr.write(("Saving samples to '%s'.\n\n" % (options.to_file)))
             self.sink = gr.file_sink(gr.sizeof_gr_complex, options.to_file)
         else:
+            sys.stderr.write("No sink defined, dumping samples to null sink.\n\n")
             self.sink = gr.null_sink(gr.sizeof_gr_complex)
 
         # do this after for any adjustments to the options that may
@@ -69,7 +71,7 @@ def main():
     def send_pkt(payload='', eof=False):
         return tb.txpath.send_pkt(payload, eof)
 
-    mods = digital.modulation_utils2.type_1_mods()
+    mods = digital.modulation_utils.type_1_mods()
 
     parser = OptionParser(option_class=eng_option, conflict_handler="resolve")
     expert_grp = parser.add_option_group("Expert")
diff --git a/gr-digital/examples/narrowband/digital_bert_rx.py b/gr-digital/examples/narrowband/digital_bert_rx.py
index 9ee1f5ee8..9878f55e1 100755
--- a/gr-digital/examples/narrowband/digital_bert_rx.py
+++ b/gr-digital/examples/narrowband/digital_bert_rx.py
@@ -178,7 +178,7 @@ def get_options(demods):
 
     uhd_receiver.add_options(parser)
 
-    demods = digital.modulation_utils2.type_1_demods()
+    demods = digital.modulation_utils.type_1_demods()
     for mod in demods.values():
         mod.add_options(parser)
 		      
@@ -191,7 +191,7 @@ def get_options(demods):
 
 
 if __name__ == "__main__":
-    demods = digital.modulation_utils2.type_1_demods()
+    demods = digital.modulation_utils.type_1_demods()
 
     (options, args) = get_options(demods)
 
diff --git a/gr-digital/examples/narrowband/digital_bert_tx.py b/gr-digital/examples/narrowband/digital_bert_tx.py
index 6b544c7f7..96cb338fe 100755
--- a/gr-digital/examples/narrowband/digital_bert_tx.py
+++ b/gr-digital/examples/narrowband/digital_bert_tx.py
@@ -122,7 +122,7 @@ def get_options(mods):
     return (options, args)
 
 if __name__ == "__main__":
-    mods = digital.modulation_utils2.type_1_mods()
+    mods = digital.modulation_utils.type_1_mods()
 
     (options, args) = get_options(mods)
     
diff --git a/gr-digital/examples/narrowband/rx_voice.py b/gr-digital/examples/narrowband/rx_voice.py
index b58704e16..42d7b893b 100755
--- a/gr-digital/examples/narrowband/rx_voice.py
+++ b/gr-digital/examples/narrowband/rx_voice.py
@@ -114,7 +114,7 @@ def main():
         print "ok = %r  n_rcvd = %4d  n_right = %4d" % (
             ok, n_rcvd, n_right)
 
-    demods = digital.modulation_utils2.type_1_demods()
+    demods = digital.modulation_utils.type_1_demods()
 
     # Create Options Parser:
     parser = OptionParser (option_class=eng_option, conflict_handler="resolve")
diff --git a/gr-digital/examples/narrowband/tunnel.py b/gr-digital/examples/narrowband/tunnel.py
index d25594df5..970920e6e 100755
--- a/gr-digital/examples/narrowband/tunnel.py
+++ b/gr-digital/examples/narrowband/tunnel.py
@@ -189,8 +189,8 @@ class cs_mac(object):
 
 def main():
 
-    mods = digital.modulation_utils2.type_1_mods()
-    demods = digital.modulation_utils2.type_1_demods()
+    mods = digital.modulation_utils.type_1_mods()
+    demods = digital.modulation_utils.type_1_demods()
 
     parser = OptionParser (option_class=eng_option, conflict_handler="resolve")
     expert_grp = parser.add_option_group("Expert")
diff --git a/gr-digital/examples/narrowband/tx_voice.py b/gr-digital/examples/narrowband/tx_voice.py
index eabb5e3c3..3d767a077 100755
--- a/gr-digital/examples/narrowband/tx_voice.py
+++ b/gr-digital/examples/narrowband/tx_voice.py
@@ -102,7 +102,7 @@ def main():
     def rx_callback(ok, payload):
         print "ok = %r, payload = '%s'" % (ok, payload)
 
-    mods = digital.modulation_utils2.type_1_mods()
+    mods = digital.modulation_utils.type_1_mods()
 
     parser = OptionParser(option_class=eng_option, conflict_handler="resolve")
     expert_grp = parser.add_option_group("Expert")