3 files changed, 30 insertions, 30 deletions
diff --git a/gr-blocks/include/blocks/packed_to_unpacked_XX.h.t b/gr-blocks/include/blocks/packed_to_unpacked_XX.h.t
index 9ab8b8bdfc..c00a27527e 100644
--- a/gr-blocks/include/blocks/packed_to_unpacked_XX.h.t
+++ b/gr-blocks/include/blocks/packed_to_unpacked_XX.h.t
@@ -47,7 +47,7 @@ namespace gr {
      * processed. The right thing is done if bits_per_chunk is not a
      * power of two.
      *
-     * The combination of gr_packed_to_unpacked_XX_ followed by
+     * The combination of gr::blocks::packed_to_unpacked_XX_ followed by
      * gr_chunks_to_symbols_Xf or gr_chunks_to_symbols_Xc handles the
      * general case of mapping from a stream of bytes or shorts into
      * arbitrary float or complex symbols.
diff --git a/gr-blocks/include/blocks/unpacked_to_packed_XX.h.t b/gr-blocks/include/blocks/unpacked_to_packed_XX.h.t
index 749f0e00f9..d570785a68 100644
--- a/gr-blocks/include/blocks/unpacked_to_packed_XX.h.t
+++ b/gr-blocks/include/blocks/unpacked_to_packed_XX.h.t
@@ -46,7 +46,7 @@ namespace gr {
      * output bytes or shorts are filled with valid input bits.  The
      * right thing is done if bits_per_chunk is not a power of two.
      *
-     * The combination of gr_packed_to_unpacked_XX followed by
+     * The combination of gr::blocks::packed_to_unpacked_XX followed by
      * gr_chunks_to_symbols_Xf or gr_chunks_to_symbols_Xc handles the
      * general case of mapping from a stream of bytes or shorts into
      * arbitrary float or complex symbols.
diff --git a/gr-blocks/python/qa_packed_to_unpacked.py b/gr-blocks/python/qa_packed_to_unpacked.py
index 98a02e78f6..d84f5dbd37 100755
--- a/gr-blocks/python/qa_packed_to_unpacked.py
+++ b/gr-blocks/python/qa_packed_to_unpacked.py
@@ -62,7 +62,7 @@ class test_packing(gr_unittest.TestCase):
         src_data = (0x11,)
         expected_results = (4, 2)
         src = gr.vector_source_b(src_data, False)
-        op = gr.packed_to_unpacked_bb(3, gr.GR_LSB_FIRST)
+        op = blocks.packed_to_unpacked_bb(3, gr.GR_LSB_FIRST)
         dst = gr.vector_sink_b()
 
         self.tb.connect(src, op)
@@ -75,7 +75,7 @@ class test_packing(gr_unittest.TestCase):
         src_data = (0x11,)
         expected_results = (0, 4)
         src = gr.vector_source_b(src_data, False)
-        op = gr.packed_to_unpacked_bb(3, gr.GR_MSB_FIRST)
+        op = blocks.packed_to_unpacked_bb(3, gr.GR_MSB_FIRST)
         dst = gr.vector_sink_b()
 
         self.tb.connect(src, op)
@@ -88,7 +88,7 @@ class test_packing(gr_unittest.TestCase):
         src_data = (1,0,0,0,0,0,1,0,0,1,0,1,1,0,1,0)
         expected_results = (0x82, 0x5a)
         src = gr.vector_source_b(src_data, False)
-        op = gr.unpacked_to_packed_bb(1, gr.GR_MSB_FIRST)
+        op = blocks.unpacked_to_packed_bb(1, gr.GR_MSB_FIRST)
         dst = gr.vector_sink_b()
 
         self.tb.connect(src, op)
@@ -101,7 +101,7 @@ class test_packing(gr_unittest.TestCase):
         src_data = (0,1,0,0,0,0,0,1,0,1,0,1,1,0,1,0)
         expected_results = (0x82, 0x5a)
         src = gr.vector_source_b(src_data, False)
-        op = gr.unpacked_to_packed_bb(1, gr.GR_LSB_FIRST)
+        op = blocks.unpacked_to_packed_bb(1, gr.GR_LSB_FIRST)
         dst = gr.vector_sink_b()
 
         self.tb.connect(src, op)
@@ -114,7 +114,7 @@ class test_packing(gr_unittest.TestCase):
         src_data = (4, 2, 0,0,0)
         expected_results = (0x11,)
         src = gr.vector_source_b(src_data, False)
-        op = gr.unpacked_to_packed_bb(3, gr.GR_LSB_FIRST)
+        op = blocks.unpacked_to_packed_bb(3, gr.GR_LSB_FIRST)
         dst = gr.vector_sink_b()
 
         self.tb.connect(src, op)
@@ -127,7 +127,7 @@ class test_packing(gr_unittest.TestCase):
         src_data = (0, 4, 2,0,0)
         expected_results = (0x11,)
         src = gr.vector_source_b(src_data,False)
-        op = gr.unpacked_to_packed_bb(3, gr.GR_MSB_FIRST)
+        op = blocks.unpacked_to_packed_bb(3, gr.GR_MSB_FIRST)
         dst = gr.vector_sink_b()
 
         self.tb.connect(src, op)
@@ -145,8 +145,8 @@ class test_packing(gr_unittest.TestCase):
         expected_results = src_data
 
         src = gr.vector_source_b(tuple(src_data), False)
-        op1 = gr.packed_to_unpacked_bb(3, gr.GR_MSB_FIRST)
-        op2 = gr.unpacked_to_packed_bb(3, gr.GR_MSB_FIRST)
+        op1 = blocks.packed_to_unpacked_bb(3, gr.GR_MSB_FIRST)
+        op2 = blocks.unpacked_to_packed_bb(3, gr.GR_MSB_FIRST)
         dst = gr.vector_sink_b()
 
         self.tb.connect(src, op1, op2)
@@ -163,8 +163,8 @@ class test_packing(gr_unittest.TestCase):
         src_data = tuple(src_data)
         expected_results = src_data
         src = gr.vector_source_b(tuple(src_data), False)
-        op1 = gr.packed_to_unpacked_bb(7, gr.GR_MSB_FIRST)
-        op2 = gr.unpacked_to_packed_bb(7, gr.GR_MSB_FIRST)
+        op1 = blocks.packed_to_unpacked_bb(7, gr.GR_MSB_FIRST)
+        op2 = blocks.unpacked_to_packed_bb(7, gr.GR_MSB_FIRST)
         dst = gr.vector_sink_b()
 
         self.tb.connect(src, op1, op2)
@@ -181,8 +181,8 @@ class test_packing(gr_unittest.TestCase):
         src_data = tuple(src_data)
         expected_results = src_data
         src = gr.vector_source_b(tuple(src_data),False)
-        op1 = gr.packed_to_unpacked_bb(7, gr.GR_LSB_FIRST)
-        op2 = gr.unpacked_to_packed_bb(7, gr.GR_LSB_FIRST)
+        op1 = blocks.packed_to_unpacked_bb(7, gr.GR_LSB_FIRST)
+        op2 = blocks.unpacked_to_packed_bb(7, gr.GR_LSB_FIRST)
         dst = gr.vector_sink_b()
 
         self.tb.connect(src, op1, op2)
@@ -201,8 +201,8 @@ class test_packing(gr_unittest.TestCase):
         src_data = tuple(src_data)
         expected_results = src_data
         src = gr.vector_source_s(tuple(src_data), False)
-        op1 = gr.packed_to_unpacked_ss(1, gr.GR_MSB_FIRST)
-        op2 = gr.unpacked_to_packed_ss(1, gr.GR_MSB_FIRST)
+        op1 = blocks.packed_to_unpacked_ss(1, gr.GR_MSB_FIRST)
+        op2 = blocks.unpacked_to_packed_ss(1, gr.GR_MSB_FIRST)
         dst = gr.vector_sink_s()
 
         self.tb.connect(src, op1, op2)
@@ -219,8 +219,8 @@ class test_packing(gr_unittest.TestCase):
         src_data = tuple(src_data)
         expected_results = src_data
         src = gr.vector_source_s(tuple(src_data), False)
-        op1 = gr.packed_to_unpacked_ss(1, gr.GR_LSB_FIRST)
-        op2 = gr.unpacked_to_packed_ss(1, gr.GR_LSB_FIRST)
+        op1 = blocks.packed_to_unpacked_ss(1, gr.GR_LSB_FIRST)
+        op2 = blocks.unpacked_to_packed_ss(1, gr.GR_LSB_FIRST)
         dst = gr.vector_sink_s()
 
         self.tb.connect(src, op1, op2)
@@ -237,8 +237,8 @@ class test_packing(gr_unittest.TestCase):
         src_data = tuple(src_data)
         expected_results = src_data
         src = gr.vector_source_s(tuple(src_data), False)
-        op1 = gr.packed_to_unpacked_ss(8, gr.GR_MSB_FIRST)
-        op2 = gr.unpacked_to_packed_ss(8, gr.GR_MSB_FIRST)
+        op1 = blocks.packed_to_unpacked_ss(8, gr.GR_MSB_FIRST)
+        op2 = blocks.unpacked_to_packed_ss(8, gr.GR_MSB_FIRST)
         dst = gr.vector_sink_s()
 
         self.tb.connect(src, op1, op2)
@@ -255,8 +255,8 @@ class test_packing(gr_unittest.TestCase):
         src_data = tuple(src_data)
         expected_results = src_data
         src = gr.vector_source_s(tuple(src_data), False)
-        op1 = gr.packed_to_unpacked_ss(8, gr.GR_LSB_FIRST)
-        op2 = gr.unpacked_to_packed_ss(8, gr.GR_LSB_FIRST)
+        op1 = blocks.packed_to_unpacked_ss(8, gr.GR_LSB_FIRST)
+        op2 = blocks.unpacked_to_packed_ss(8, gr.GR_LSB_FIRST)
         dst = gr.vector_sink_s()
 
         self.tb.connect(src, op1, op2)
@@ -275,8 +275,8 @@ class test_packing(gr_unittest.TestCase):
         src_data = tuple(src_data)
         expected_results = src_data
         src = gr.vector_source_i(tuple(src_data), False)
-        op1 = gr.packed_to_unpacked_ii(1, gr.GR_MSB_FIRST)
-        op2 = gr.unpacked_to_packed_ii(1, gr.GR_MSB_FIRST)
+        op1 = blocks.packed_to_unpacked_ii(1, gr.GR_MSB_FIRST)
+        op2 = blocks.unpacked_to_packed_ii(1, gr.GR_MSB_FIRST)
         dst = gr.vector_sink_i()
 
         self.tb.connect(src, op1, op2)
@@ -293,8 +293,8 @@ class test_packing(gr_unittest.TestCase):
         src_data = tuple(src_data)
         expected_results = src_data
         src = gr.vector_source_i(tuple(src_data), False)
-        op1 = gr.packed_to_unpacked_ii(1, gr.GR_LSB_FIRST)
-        op2 = gr.unpacked_to_packed_ii(1, gr.GR_LSB_FIRST)
+        op1 = blocks.packed_to_unpacked_ii(1, gr.GR_LSB_FIRST)
+        op2 = blocks.unpacked_to_packed_ii(1, gr.GR_LSB_FIRST)
         dst = gr.vector_sink_i()
 
         self.tb.connect(src, op1, op2)
@@ -311,8 +311,8 @@ class test_packing(gr_unittest.TestCase):
         src_data = tuple(src_data)
         expected_results = src_data
         src = gr.vector_source_i(tuple(src_data), False)
-        op1 = gr.packed_to_unpacked_ii(8, gr.GR_MSB_FIRST)
-        op2 = gr.unpacked_to_packed_ii(8, gr.GR_MSB_FIRST)
+        op1 = blocks.packed_to_unpacked_ii(8, gr.GR_MSB_FIRST)
+        op2 = blocks.unpacked_to_packed_ii(8, gr.GR_MSB_FIRST)
         dst = gr.vector_sink_i()
 
         self.tb.connect(src, op1, op2)
@@ -329,8 +329,8 @@ class test_packing(gr_unittest.TestCase):
         src_data = tuple(src_data)
         expected_results = src_data
         src = gr.vector_source_i(tuple(src_data), False)
-        op1 = gr.packed_to_unpacked_ii(8, gr.GR_LSB_FIRST)
-        op2 = gr.unpacked_to_packed_ii(8, gr.GR_LSB_FIRST)
+        op1 = blocks.packed_to_unpacked_ii(8, gr.GR_LSB_FIRST)
+        op2 = blocks.unpacked_to_packed_ii(8, gr.GR_LSB_FIRST)
         dst = gr.vector_sink_i()
 
         self.tb.connect(src, op1, op2)