134 files changed, 565 insertions, 508 deletions
diff --git a/gr-blocks/include/blocks/CMakeLists.txt b/gr-blocks/include/gnuradio/blocks/CMakeLists.txt
index 14346f9c15..13e1ac71b8 100644
--- a/gr-blocks/include/blocks/CMakeLists.txt
+++ b/gr-blocks/include/gnuradio/blocks/CMakeLists.txt
@@ -187,6 +187,7 @@ install(FILES
     streams_to_vector.h
     stretch_ff.h
     tag_debug.h
+    tag_gate.h
     tagged_file_sink.h
     tagged_stream_mux.h
     tagged_stream_to_pdu.h
diff --git a/gr-blocks/include/blocks/add_XX.h.t b/gr-blocks/include/gnuradio/blocks/add_XX.h.t
index ffe08f683b..08e9646af6 100644
--- a/gr-blocks/include/blocks/add_XX.h.t
+++ b/gr-blocks/include/gnuradio/blocks/add_XX.h.t
@@ -25,8 +25,8 @@
 #ifndef @GUARD_NAME@
 #define @GUARD_NAME@
 
-#include <blocks/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_block.h>
 
 namespace gr {
   namespace blocks {
@@ -38,7 +38,7 @@ namespace gr {
      * \details
      * Add across all input streams.
      */
-    class BLOCKS_API @NAME@ : virtual public gr_sync_block
+    class BLOCKS_API @NAME@ : virtual public sync_block
     {
     public:
       
diff --git a/gr-blocks/include/blocks/add_const_XX.h.t b/gr-blocks/include/gnuradio/blocks/add_const_XX.h.t
index 3a99978b6b..3e783213a8 100644
--- a/gr-blocks/include/blocks/add_const_XX.h.t
+++ b/gr-blocks/include/gnuradio/blocks/add_const_XX.h.t
@@ -25,8 +25,8 @@
 #ifndef @GUARD_NAME@
 #define @GUARD_NAME@
 
-#include <blocks/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_block.h>
 
 namespace gr {
   namespace blocks {
@@ -35,7 +35,7 @@ namespace gr {
      * \brief output = input + constant
      * \ingroup math_operators_blk
      */
-    class BLOCKS_API @NAME@ : virtual public gr_sync_block
+    class BLOCKS_API @NAME@ : virtual public sync_block
     {
     public:
       
diff --git a/gr-blocks/include/blocks/add_const_vXX.h.t b/gr-blocks/include/gnuradio/blocks/add_const_vXX.h.t
index 33a50a42ca..ea6c35695e 100644
--- a/gr-blocks/include/blocks/add_const_vXX.h.t
+++ b/gr-blocks/include/gnuradio/blocks/add_const_vXX.h.t
@@ -25,8 +25,8 @@
 #ifndef @GUARD_NAME@
 #define @GUARD_NAME@
 
-#include <blocks/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_block.h>
 
 namespace gr {
   namespace blocks {
@@ -35,7 +35,7 @@ namespace gr {
      * \brief output = input + constant vector
      * \ingroup math_operators_blk
      */
-    class BLOCKS_API @NAME@ : virtual public gr_sync_block
+    class BLOCKS_API @NAME@ : virtual public sync_block
     {
 
     public:
diff --git a/gr-blocks/include/blocks/add_ff.h b/gr-blocks/include/gnuradio/blocks/add_ff.h
index 6a9bbfbded..fd2420ce09 100644
--- a/gr-blocks/include/blocks/add_ff.h
+++ b/gr-blocks/include/gnuradio/blocks/add_ff.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_BLOCKS_ADD_FF_H
 #define INCLUDED_BLOCKS_ADD_FF_H
 
-#include <blocks/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_block.h>
 
 namespace gr {
   namespace blocks {
@@ -36,11 +36,11 @@ namespace gr {
      * \details
      * Add across all input streams.
      */
-    class BLOCKS_API add_ff : virtual public gr_sync_block
+    class BLOCKS_API add_ff : virtual public sync_block
     {
     public:
 
-      // gr::blocks::add_ff::sptr
+      // gr::gnuradio/blocks::add_ff::sptr
       typedef boost::shared_ptr<add_ff> sptr;
 
       /*!
diff --git a/gr-blocks/include/blocks/and_XX.h.t b/gr-blocks/include/gnuradio/blocks/and_XX.h.t
index 048e1bea57..820daefdbf 100644
--- a/gr-blocks/include/blocks/and_XX.h.t
+++ b/gr-blocks/include/gnuradio/blocks/and_XX.h.t
@@ -25,8 +25,8 @@
 #ifndef @GUARD_NAME@
 #define @GUARD_NAME@
 
-#include <blocks/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_block.h>
 
 namespace gr {
   namespace blocks {
@@ -37,7 +37,7 @@ namespace gr {
      *
      * bitwise boolean and across all input streams.
      */
-    class BLOCKS_API @NAME@ : virtual public gr_sync_block
+    class BLOCKS_API @NAME@ : virtual public sync_block
     {
     public:
       
diff --git a/gr-blocks/include/blocks/and_const_XX.h.t b/gr-blocks/include/gnuradio/blocks/and_const_XX.h.t
index 9e478819cb..a4c83a4eab 100644
--- a/gr-blocks/include/blocks/and_const_XX.h.t
+++ b/gr-blocks/include/gnuradio/blocks/and_const_XX.h.t
@@ -25,8 +25,8 @@
 #ifndef @GUARD_NAME@
 #define @GUARD_NAME@
 
-#include <blocks/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_block.h>
 
 namespace gr {
   namespace blocks {
@@ -37,7 +37,7 @@ namespace gr {
      *
      * bitwise boolean and of const to the data stream.
      */
-    class BLOCKS_API @NAME@ : virtual public gr_sync_block
+    class BLOCKS_API @NAME@ : virtual public sync_block
     {
 
     public:
diff --git a/gr-blocks/include/blocks/annotator_1to1.h b/gr-blocks/include/gnuradio/blocks/annotator_1to1.h
index 61bc1697c9..a452da2e7e 100644
--- a/gr-blocks/include/blocks/annotator_1to1.h
+++ b/gr-blocks/include/gnuradio/blocks/annotator_1to1.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_GR_ANNOTATOR_1TO1_H
 #define	INCLUDED_GR_ANNOTATOR_1TO1_H
 
-#include <blocks/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_block.h>
 
 namespace gr {
   namespace blocks {
@@ -46,15 +46,15 @@ namespace gr {
      * Warning: This block is only meant for testing and showing how to use the
      * tags.
      */
-    class BLOCKS_API annotator_1to1 : virtual public gr_sync_block
+    class BLOCKS_API annotator_1to1 : virtual public sync_block
     {
     public:
-      // gr::blocks::annotator_1to1::sptr
+      // gr::gnuradio/blocks::annotator_1to1::sptr
       typedef boost::shared_ptr<annotator_1to1> sptr;
 
       static sptr make(int when, size_t sizeof_stream_item);
 
-      virtual std::vector<gr_tag_t> data() const = 0;
+      virtual std::vector<tag_t> data() const = 0;
     };
 
   } /* namespace blocks */
diff --git a/gr-blocks/include/blocks/annotator_alltoall.h b/gr-blocks/include/gnuradio/blocks/annotator_alltoall.h
index fa33d440b8..004aa54dd3 100644
--- a/gr-blocks/include/blocks/annotator_alltoall.h
+++ b/gr-blocks/include/gnuradio/blocks/annotator_alltoall.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_GR_ANNOTATOR_ALLTOALL_H
 #define	INCLUDED_GR_ANNOTATOR_ALLTOALL_H
 
-#include <blocks/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_block.h>
 
 namespace gr {
   namespace blocks {
@@ -46,15 +46,15 @@ namespace gr {
      *
      * This block is only meant for testing and showing how to use the tags.
      */
-    class BLOCKS_API annotator_alltoall : virtual public gr_sync_block
+    class BLOCKS_API annotator_alltoall : virtual public sync_block
     {
     public:
-      // gr::blocks::annotator_alltoall::sptr
+      // gr::gnuradio/blocks::annotator_alltoall::sptr
       typedef boost::shared_ptr<annotator_alltoall> sptr;
 
       static sptr make(int when, size_t sizeof_stream_item);
 
-      virtual std::vector<gr_tag_t> data() const = 0;
+      virtual std::vector<tag_t> data() const = 0;
     };
 
   } /* namespace blocks */
diff --git a/gr-blocks/include/blocks/annotator_raw.h b/gr-blocks/include/gnuradio/blocks/annotator_raw.h
index 56c25c808c..70c4254436 100644
--- a/gr-blocks/include/blocks/annotator_raw.h
+++ b/gr-blocks/include/gnuradio/blocks/annotator_raw.h
@@ -23,9 +23,9 @@
 #ifndef INCLUDED_GR_ANNOTATOR_RAW_H
 #define	INCLUDED_GR_ANNOTATOR_RAW_H
 
-#include <blocks/api.h>
-#include <gr_sync_block.h>
-#include <gr_tags.h>
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_block.h>
+#include <gnuradio/tags.h>
 
 namespace gr {
   namespace blocks {
@@ -35,16 +35,16 @@ namespace gr {
      * \ingroup debug_tools_blk
      *
      * \details
-     * This block creates arbitrary tags to be sent downstream blocks
+     * This block creates arbitrary tags to be sent downstream gnuradio/blocks
      * to be sent are set manually via accessor methods and are sent
      * only once.
      *
-     * This block is intended for testing of tag related blocks
+     * This block is intended for testing of tag related gnuradio/blocks
      */
-    class BLOCKS_API annotator_raw : virtual public gr_sync_block
+    class BLOCKS_API annotator_raw : virtual public sync_block
     {
     public:
-      // gr::blocks::annotator_raw::sptr
+      // gr::gnuradio/blocks::annotator_raw::sptr
       typedef boost::shared_ptr<annotator_raw> sptr;
 
       static sptr make(size_t sizeof_stream_item);
diff --git a/gr-blocks/include/blocks/api.h b/gr-blocks/include/gnuradio/blocks/api.h
index d77bdbdd5b..fd4e605b56 100644
--- a/gr-blocks/include/blocks/api.h
+++ b/gr-blocks/include/gnuradio/blocks/api.h
@@ -22,7 +22,7 @@
 #ifndef INCLUDED_BLOCKS_API_H
 #define INCLUDED_BLOCKS_API_H
 
-#include <attributes.h>
+#include <gnuradio/attributes.h>
 
 #ifdef gnuradio_blocks_EXPORTS
 #  define BLOCKS_API __GR_ATTR_EXPORT
diff --git a/gr-blocks/include/blocks/argmax_XX.h.t b/gr-blocks/include/gnuradio/blocks/argmax_XX.h.t
index 93aa367260..71468726ec 100644
--- a/gr-blocks/include/blocks/argmax_XX.h.t
+++ b/gr-blocks/include/gnuradio/blocks/argmax_XX.h.t
@@ -25,8 +25,8 @@
 #ifndef @GUARD_NAME@
 #define @GUARD_NAME@
 
-#include <blocks/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_block.h>
 
 namespace gr {
   namespace blocks {
@@ -46,7 +46,7 @@ namespace gr {
      *    Stream 1 will contain the number of the input stream that
      *    held the maximum value.
      */
-    class BLOCKS_API @NAME@ : virtual public gr_sync_block
+    class BLOCKS_API @NAME@ : virtual public sync_block
     {
     public:
       // gr::blocks::@NAME@::sptr
diff --git a/gr-blocks/include/blocks/bin_statistics_f.h b/gr-blocks/include/gnuradio/blocks/bin_statistics_f.h
index a73103866f..1d8661e0a2 100644
--- a/gr-blocks/include/blocks/bin_statistics_f.h
+++ b/gr-blocks/include/gnuradio/blocks/bin_statistics_f.h
@@ -23,10 +23,10 @@
 #ifndef INCLUDED_GR_BIN_STATISTICS_F_H
 #define INCLUDED_GR_BIN_STATISTICS_F_H
 
-#include <blocks/api.h>
-#include <gr_sync_block.h>
-#include <gr_msg_queue.h>
-#include <gr_feval.h>
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_block.h>
+#include <gnuradio/msg_queue.h>
+#include <gnuradio/feval.h>
 
 namespace gr {
   namespace blocks {
@@ -35,21 +35,21 @@ namespace gr {
      * \brief control scanning and record frequency domain statistics
      * \ingroup misc_blk
      */
-    class BLOCKS_API bin_statistics_f : virtual public gr_sync_block
+    class BLOCKS_API bin_statistics_f : virtual public sync_block
     {
     protected:
       std::vector<float> d_max; // per bin maxima
 
       virtual size_t vlen() const = 0;
       virtual double center_freq() const = 0;
-      virtual gr_msg_queue_sptr msgq() const = 0;
+      virtual gr::msg_queue::sptr msgq() const = 0;
 
       virtual void reset_stats() = 0;
       virtual void accrue_stats(const float *input) = 0;
       virtual void send_stats() = 0;
 
     public:
-      // gr::blocks::bin_statistics_f::sptr
+      // gr::gnuradio/blocks::bin_statistics_f::sptr
       typedef boost::shared_ptr<bin_statistics_f> sptr;
 
       /*!
@@ -59,13 +59,13 @@ namespace gr {
        *
        * \param vlen vector length
        * \param msgq message queue
-       * \param tune a gr_feval_dd callback function
+       * \param tune a feval_dd callback function
        * \param tune_delay number of samples for the tune delay
        * \param dwell_delay number of samples for the dwell delay
        */
       static sptr make(unsigned int vlen,      // vector length
-                       gr_msg_queue_sptr msgq,
-                       gr_feval_dd *tune,      // callback
+                       gr::msg_queue::sptr msgq,
+                       feval_dd *tune,      // callback
                        size_t tune_delay,      // samples
                        size_t dwell_delay);    // samples
     };
diff --git a/gr-blocks/include/blocks/burst_tagger.h b/gr-blocks/include/gnuradio/blocks/burst_tagger.h
index 312fb2ffbd..e10938980e 100644
--- a/gr-blocks/include/blocks/burst_tagger.h
+++ b/gr-blocks/include/gnuradio/blocks/burst_tagger.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_GR_BURST_TAGGER_H
 #define INCLUDED_GR_BURST_TAGGER_H
 
-#include <blocks/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_block.h>
 
 namespace gr {
   namespace blocks {
@@ -44,14 +44,14 @@ namespace gr {
      *
      * The signal on stream 0 is retransmitted to output stream 0.
      */
-    class BLOCKS_API burst_tagger : virtual public gr_sync_block
+    class BLOCKS_API burst_tagger : virtual public sync_block
     {
     public:
-      // gr::blocks::burst_tagger::sptr
+      // gr::gnuradio/blocks::burst_tagger::sptr
       typedef boost::shared_ptr<burst_tagger> sptr;
 
       /*!
-       * Build a burst tagger blocks.
+       * Build a burst tagger gnuradio/blocks.
        *
        * \param itemsize itemsize of the signal stream on input 0.
        */
diff --git a/gr-blocks/include/blocks/char_to_float.h b/gr-blocks/include/gnuradio/blocks/char_to_float.h
index 0002ceb30b..71861adf16 100644
--- a/gr-blocks/include/blocks/char_to_float.h
+++ b/gr-blocks/include/gnuradio/blocks/char_to_float.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_BLOCKS_CHAR_TO_FLOAT_H
 #define INCLUDED_BLOCKS_CHAR_TO_FLOAT_H
 
-#include <blocks/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_block.h>
 
 namespace gr {
   namespace blocks {
@@ -33,11 +33,11 @@ namespace gr {
      * \brief Convert stream of chars to a stream of float
      * \ingroup type_converters_blk
      */
-    class BLOCKS_API char_to_float : virtual public gr_sync_block
+    class BLOCKS_API char_to_float : virtual public sync_block
     {
     public:
       
-      // gr::blocks::char_to_float_ff::sptr
+      // gr::gnuradio/blocks::char_to_float_ff::sptr
       typedef boost::shared_ptr<char_to_float> sptr;
 
       /*!
diff --git a/gr-blocks/include/blocks/char_to_short.h b/gr-blocks/include/gnuradio/blocks/char_to_short.h
index fc9d3b4b52..62800b216a 100644
--- a/gr-blocks/include/blocks/char_to_short.h
+++ b/gr-blocks/include/gnuradio/blocks/char_to_short.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_BLOCKS_CHAR_TO_SHORT_H
 #define INCLUDED_BLOCKS_CHAR_TO_SHORT_H
 
-#include <blocks/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_block.h>
 
 namespace gr {
   namespace blocks {
@@ -33,11 +33,11 @@ namespace gr {
      * \brief Convert stream of chars to a stream of short
      * \ingroup type_converters_blk
      */
-    class BLOCKS_API char_to_short : virtual public gr_sync_block
+    class BLOCKS_API char_to_short : virtual public sync_block
     {
     public:
       
-      // gr::blocks::char_to_short_ff::sptr
+      // gr::gnuradio/blocks::char_to_short_ff::sptr
       typedef boost::shared_ptr<char_to_short> sptr;
 
       static sptr make(size_t vlen=1);
diff --git a/gr-blocks/include/blocks/check_lfsr_32k_s.h b/gr-blocks/include/gnuradio/blocks/check_lfsr_32k_s.h
index 89f56d8c90..86714d93fa 100644
--- a/gr-blocks/include/blocks/check_lfsr_32k_s.h
+++ b/gr-blocks/include/gnuradio/blocks/check_lfsr_32k_s.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_GR_CHECK_LFSR_32K_S_H
 #define INCLUDED_GR_CHECK_LFSR_32K_S_H
 
-#include <blocks/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_block.h>
 
 namespace gr {
   namespace blocks {
@@ -38,10 +38,10 @@ namespace gr {
      * gr::blocks::lfsr_32k_source_s to test the USRP using its
      * digital loopback mode.
      */
-    class BLOCKS_API check_lfsr_32k_s : virtual public gr_sync_block
+    class BLOCKS_API check_lfsr_32k_s : virtual public sync_block
     {
     public:
-      // gr::blocks::check_lfsr_32k_s::sptr
+      // gr::gnuradio/blocks::check_lfsr_32k_s::sptr
       typedef boost::shared_ptr<check_lfsr_32k_s> sptr;
 
       static sptr make();
diff --git a/gr-blocks/include/blocks/complex_to_arg.h b/gr-blocks/include/gnuradio/blocks/complex_to_arg.h
index 178f846704..63e2a37cb9 100644
--- a/gr-blocks/include/blocks/complex_to_arg.h
+++ b/gr-blocks/include/gnuradio/blocks/complex_to_arg.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_BLOCKS_COMPLEX_TO_ARG_H
 #define INCLUDED_BLOCKS_COMPLEX_TO_ARG_H
 
-#include <blocks/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_block.h>
 
 namespace gr {
   namespace blocks {
@@ -33,10 +33,10 @@ namespace gr {
      * \brief complex in, arg out (float)
      * \ingroup type_converters_blk
      */
-    class BLOCKS_API complex_to_arg : virtual public gr_sync_block
+    class BLOCKS_API complex_to_arg : virtual public sync_block
     {
     public:
-      // gr::blocks::complex_to_arg_ff::sptr
+      // gr::gnuradio/blocks::complex_to_arg_ff::sptr
       typedef boost::shared_ptr<complex_to_arg> sptr;
 
       /*!
diff --git a/gr-blocks/include/blocks/complex_to_float.h b/gr-blocks/include/gnuradio/blocks/complex_to_float.h
index 7648648d6c..341d2e2d9e 100644
--- a/gr-blocks/include/blocks/complex_to_float.h
+++ b/gr-blocks/include/gnuradio/blocks/complex_to_float.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_BLOCKS_COMPLEX_TO_FLOAT_H
 #define INCLUDED_BLOCKS_COMPLEX_TO_FLOAT_H
 
-#include <blocks/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_block.h>
 
 namespace gr {
   namespace blocks {
@@ -33,10 +33,10 @@ namespace gr {
      * \brief convert a stream of gr_complex to 1 or 2 streams of float
      * \ingroup type_converters_blk
      */
-    class BLOCKS_API complex_to_float : virtual public gr_sync_block
+    class BLOCKS_API complex_to_float : virtual public sync_block
     {
     public:
-      // gr::blocks::complex_to_float_ff::sptr
+      // gr::gnuradio/blocks::complex_to_float_ff::sptr
       typedef boost::shared_ptr<complex_to_float> sptr;
 
       /*!
diff --git a/gr-blocks/include/blocks/complex_to_imag.h b/gr-blocks/include/gnuradio/blocks/complex_to_imag.h
index cb1d32fec6..7a8d200639 100644
--- a/gr-blocks/include/blocks/complex_to_imag.h
+++ b/gr-blocks/include/gnuradio/blocks/complex_to_imag.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_BLOCKS_COMPLEX_TO_IMAG_H
 #define INCLUDED_BLOCKS_COMPLEX_TO_IMAG_H
 
-#include <blocks/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_block.h>
 
 namespace gr {
   namespace blocks {
@@ -33,10 +33,10 @@ namespace gr {
      * \brief complex in, imag out (float)
      * \ingroup type_converters_blk
      */
-    class BLOCKS_API complex_to_imag : virtual public gr_sync_block
+    class BLOCKS_API complex_to_imag : virtual public sync_block
     {
     public:
-      // gr::blocks::complex_to_imag_ff::sptr
+      // gr::gnuradio/blocks::complex_to_imag_ff::sptr
       typedef boost::shared_ptr<complex_to_imag> sptr;
 
       /*!
diff --git a/gr-blocks/include/blocks/complex_to_interleaved_short.h b/gr-blocks/include/gnuradio/blocks/complex_to_interleaved_short.h
index c7304787a9..8be4f86622 100644
--- a/gr-blocks/include/blocks/complex_to_interleaved_short.h
+++ b/gr-blocks/include/gnuradio/blocks/complex_to_interleaved_short.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_BLOCKS_COMPLEX_TO_INTERLEAVED_SHORT_H
 #define INCLUDED_BLOCKS_COMPLEX_TO_INTERLEAVED_SHORT_H
 
-#include <blocks/api.h>
-#include <gr_sync_interpolator.h>
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_interpolator.h>
 
 namespace gr {
   namespace blocks {
@@ -33,10 +33,10 @@ namespace gr {
      * \brief Convert stream of complex to a stream of interleaved shorts
      * \ingroup type_converters_blk
      */
-    class BLOCKS_API complex_to_interleaved_short : virtual public gr_sync_interpolator
+    class BLOCKS_API complex_to_interleaved_short : virtual public sync_interpolator
     {
     public:
-      // gr::blocks::complex_to_interleaved_short::sptr
+      // gr::gnuradio/blocks::complex_to_interleaved_short::sptr
       typedef boost::shared_ptr<complex_to_interleaved_short> sptr;
 
       /*!
diff --git a/gr-blocks/include/blocks/complex_to_mag.h b/gr-blocks/include/gnuradio/blocks/complex_to_mag.h
index b1758fd3eb..fcb1fe66ca 100644
--- a/gr-blocks/include/blocks/complex_to_mag.h
+++ b/gr-blocks/include/gnuradio/blocks/complex_to_mag.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_BLOCKS_COMPLEX_TO_MAG_H
 #define INCLUDED_BLOCKS_COMPLEX_TO_MAG_H
 
-#include <blocks/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_block.h>
 
 namespace gr {
   namespace blocks {
@@ -33,10 +33,10 @@ namespace gr {
      * \brief complex in, magnitude out (float)
      * \ingroup type_converters_blk
      */
-    class BLOCKS_API complex_to_mag : virtual public gr_sync_block
+    class BLOCKS_API complex_to_mag : virtual public sync_block
     {
     public:
-      // gr::blocks::complex_to_mag_ff::sptr
+      // gr::gnuradio/blocks::complex_to_mag_ff::sptr
       typedef boost::shared_ptr<complex_to_mag> sptr;
 
       /*!
diff --git a/gr-blocks/include/blocks/complex_to_mag_squared.h b/gr-blocks/include/gnuradio/blocks/complex_to_mag_squared.h
index a7c464fbb0..662505039c 100644
--- a/gr-blocks/include/blocks/complex_to_mag_squared.h
+++ b/gr-blocks/include/gnuradio/blocks/complex_to_mag_squared.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_BLOCKS_COMPLEX_TO_MAG_SQUARED_H
 #define INCLUDED_BLOCKS_COMPLEX_TO_MAG_SQUARED_H
 
-#include <blocks/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_block.h>
 
 namespace gr {
   namespace blocks {
@@ -33,10 +33,10 @@ namespace gr {
      * \brief complex in, magnitude squared out (float)
      * \ingroup type_converters_blk
      */
-    class BLOCKS_API complex_to_mag_squared : virtual public gr_sync_block
+    class BLOCKS_API complex_to_mag_squared : virtual public sync_block
     {
     public:
-      // gr::blocks::complex_to_mag_squared_ff::sptr
+      // gr::gnuradio/blocks::complex_to_mag_squared_ff::sptr
       typedef boost::shared_ptr<complex_to_mag_squared> sptr;
 
       /*!
diff --git a/gr-blocks/include/blocks/complex_to_real.h b/gr-blocks/include/gnuradio/blocks/complex_to_real.h
index 908ca9fc94..7efefcddd3 100644
--- a/gr-blocks/include/blocks/complex_to_real.h
+++ b/gr-blocks/include/gnuradio/blocks/complex_to_real.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_BLOCKS_COMPLEX_TO_REAL_H
 #define INCLUDED_BLOCKS_COMPLEX_TO_REAL_H
 
-#include <blocks/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_block.h>
 
 namespace gr {
   namespace blocks {
@@ -33,10 +33,10 @@ namespace gr {
      * \brief complex in, real out (float)
      * \ingroup type_converters_blk
      */
-    class BLOCKS_API complex_to_real : virtual public gr_sync_block
+    class BLOCKS_API complex_to_real : virtual public sync_block
     {
     public:
-      // gr::blocks::complex_to_real_ff::sptr
+      // gr::gnuradio/blocks::complex_to_real_ff::sptr
       typedef boost::shared_ptr<complex_to_real> sptr;
 
       /*!
diff --git a/gr-blocks/include/blocks/conjugate_cc.h b/gr-blocks/include/gnuradio/blocks/conjugate_cc.h
index 92096eea31..7e4440c713 100644
--- a/gr-blocks/include/blocks/conjugate_cc.h
+++ b/gr-blocks/include/gnuradio/blocks/conjugate_cc.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_BLOCKS_CONJUGATE_CC_H
 #define INCLUDED_BLOCKS_CONJUGATE_CC_H
 
-#include <blocks/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_block.h>
 
 namespace gr {
   namespace blocks {
@@ -33,11 +33,11 @@ namespace gr {
      * \brief output = complex conjugate of input
      * \ingroup math_operators_blk
      */
-    class BLOCKS_API conjugate_cc : virtual public gr_sync_block
+    class BLOCKS_API conjugate_cc : virtual public sync_block
     {
     public:
       
-      // gr::blocks::conjugate_cc_ff::sptr
+      // gr::gnuradio/blocks::conjugate_cc_ff::sptr
       typedef boost::shared_ptr<conjugate_cc> sptr;
 
       static sptr make();
diff --git a/gr-blocks/include/blocks/control_loop.h b/gr-blocks/include/gnuradio/blocks/control_loop.h
index 7c09f5915b..d53c81cbac 100644
--- a/gr-blocks/include/blocks/control_loop.h
+++ b/gr-blocks/include/gnuradio/blocks/control_loop.h
@@ -23,7 +23,7 @@
 #ifndef GR_BLOCKS_CONTROL_LOOP
 #define GR_BLOCKS_CONTROL_LOOP
 
-#include <blocks/api.h>
+#include <gnuradio/blocks/api.h>
 
 namespace gr {
   namespace blocks {
diff --git a/gr-blocks/include/blocks/copy.h b/gr-blocks/include/gnuradio/blocks/copy.h
index a243a54917..f960d4fba7 100644
--- a/gr-blocks/include/blocks/copy.h
+++ b/gr-blocks/include/gnuradio/blocks/copy.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_GR_COPY_H
 #define INCLUDED_GR_COPY_H
 
-#include <blocks/api.h>
-#include <gr_block.h>
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/block.h>
 
 namespace gr {
   namespace blocks {
@@ -37,10 +37,10 @@ namespace gr {
      * When enabled (default), this block copies its input to its
      * output. When disabled, this block drops its input on the floor.
      */
-    class BLOCKS_API copy : virtual public gr_block
+    class BLOCKS_API copy : virtual public block
     {
     public:
-      // gr::blocks::copy::sptr
+      // gr::gnuradio/blocks::copy::sptr
       typedef boost::shared_ptr<copy> sptr;
 
       static sptr make(size_t itemsize);
diff --git a/gr-blocks/include/blocks/count_bits.h b/gr-blocks/include/gnuradio/blocks/count_bits.h
index ceb882f67b..88f56f7221 100644
--- a/gr-blocks/include/blocks/count_bits.h
+++ b/gr-blocks/include/gnuradio/blocks/count_bits.h
@@ -23,7 +23,7 @@
 #ifndef _GR_COUNT_BITS_H_
 #define _GR_COUNT_BITS_H_
 
-#include <blocks/api.h>
+#include <gnuradio/blocks/api.h>
 
 namespace gr {
   namespace blocks {
diff --git a/gr-blocks/include/blocks/ctrlport_probe2_c.h b/gr-blocks/include/gnuradio/blocks/ctrlport_probe2_c.h
index 736c23e4e7..c15635bc2c 100644
--- a/gr-blocks/include/blocks/ctrlport_probe2_c.h
+++ b/gr-blocks/include/gnuradio/blocks/ctrlport_probe2_c.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_CTRLPORT_PROBE2_C_H
 #define INCLUDED_CTRLPORT_PROBE2_C_H
 
-#include <blocks/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_block.h>
 
 namespace gr {
   namespace blocks {
@@ -40,10 +40,10 @@ namespace gr {
      * the latest \p len number of complex samples so that every query
      * by a ControlPort client will get the same length vector.
      */
-    class BLOCKS_API ctrlport_probe2_c : virtual public gr_sync_block
+    class BLOCKS_API ctrlport_probe2_c : virtual public sync_block
     {
     public:
-      // gr::blocks::ctrlport_probe2_c::sptr
+      // gr::gnuradio/blocks::ctrlport_probe2_c::sptr
       typedef boost::shared_ptr<ctrlport_probe2_c> sptr;
 
       /*!
diff --git a/gr-blocks/include/blocks/ctrlport_probe_c.h b/gr-blocks/include/gnuradio/blocks/ctrlport_probe_c.h
index 579621c680..88eed7e5d7 100644
--- a/gr-blocks/include/blocks/ctrlport_probe_c.h
+++ b/gr-blocks/include/gnuradio/blocks/ctrlport_probe_c.h
@@ -23,9 +23,9 @@
 #ifndef INCLUDED_CTRLPORT_PROBE_C_H
 #define INCLUDED_CTRLPORT_PROBE_C_H
 
-#include <blocks/api.h>
-#include <gr_sync_block.h>
-#include <rpcregisterhelpers.h>
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_block.h>
+#include <gnuradio/rpcregisterhelpers.h>
 #include <boost/thread/shared_mutex.hpp>
 
 namespace gr {
@@ -42,10 +42,10 @@ namespace gr {
      * sends the current vector held in the work function when the
      * queried by a ControlPort client.
      */
-    class BLOCKS_API ctrlport_probe_c : virtual public gr_sync_block
+    class BLOCKS_API ctrlport_probe_c : virtual public sync_block
     {
     public:
-      // gr::blocks::ctrlport_probe_c::sptr
+      // gr::gnuradio/blocks::ctrlport_probe_c::sptr
       typedef boost::shared_ptr<ctrlport_probe_c> sptr;
 
       /*!
diff --git a/gr-blocks/include/blocks/deinterleave.h b/gr-blocks/include/gnuradio/blocks/deinterleave.h
index bb6ad59a22..e9e7ebd58a 100644
--- a/gr-blocks/include/blocks/deinterleave.h
+++ b/gr-blocks/include/gnuradio/blocks/deinterleave.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_BLOCKS_DEINTERLEAVE_H
 #define INCLUDED_BLOCKS_DEINTERLEAVE_H
 
-#include <blocks/api.h>
-#include <gr_sync_decimator.h>
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_decimator.h>
 
 namespace gr {
   namespace blocks {
@@ -33,10 +33,10 @@ namespace gr {
      * \brief deinterleave a single input into N outputs
      * \ingroup stream_operators_blk
      */
-    class BLOCKS_API deinterleave : virtual public gr_sync_decimator
+    class BLOCKS_API deinterleave : virtual public sync_decimator
     {
     public:
-      // gr::blocks::deinterleave::sptr
+      // gr::gnuradio/blocks::deinterleave::sptr
       typedef boost::shared_ptr<deinterleave> sptr;
 
       /*!
diff --git a/gr-blocks/include/blocks/delay.h b/gr-blocks/include/gnuradio/blocks/delay.h
index 2a59fa0fca..8fc5bb3028 100644
--- a/gr-blocks/include/blocks/delay.h
+++ b/gr-blocks/include/gnuradio/blocks/delay.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_BLOCKS_DELAY_H
 #define INCLUDED_BLOCKS_DELAY_H
 
-#include <blocks/api.h>
-#include <gr_block.h>
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/block.h>
 
 namespace gr {
   namespace blocks {
@@ -33,10 +33,10 @@ namespace gr {
      * \brief delay the input by a certain number of samples
      * \ingroup misc_blk
      */
-    class BLOCKS_API delay : virtual public gr_block
+    class BLOCKS_API delay : virtual public block
     {
     public:
-      // gr::blocks::delay::sptr
+      // gr::gnuradio/blocks::delay::sptr
       typedef boost::shared_ptr<delay> sptr;
 
       /*!
diff --git a/gr-blocks/include/blocks/divide_XX.h.t b/gr-blocks/include/gnuradio/blocks/divide_XX.h.t
index 821a458ec4..25e7941f72 100644
--- a/gr-blocks/include/blocks/divide_XX.h.t
+++ b/gr-blocks/include/gnuradio/blocks/divide_XX.h.t
@@ -25,8 +25,8 @@
 #ifndef @GUARD_NAME@
 #define @GUARD_NAME@
 
-#include <blocks/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_block.h>
 
 namespace gr {
   namespace blocks {
@@ -38,7 +38,7 @@ namespace gr {
      * \details
      * Divide across all input streams.
      */
-    class BLOCKS_API @NAME@ : virtual public gr_sync_block
+    class BLOCKS_API @NAME@ : virtual public sync_block
     {
     public:
       
diff --git a/gr-blocks/include/blocks/endian_swap.h b/gr-blocks/include/gnuradio/blocks/endian_swap.h
index c26a1d2aa4..841fc3c4b8 100644
--- a/gr-blocks/include/blocks/endian_swap.h
+++ b/gr-blocks/include/gnuradio/blocks/endian_swap.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_GR_ENDIAN_SWAP_H
 #define INCLUDED_GR_ENDIAN_SWAP_H
 
-#include <blocks/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_block.h>
 
 namespace gr {
   namespace blocks {
@@ -33,10 +33,10 @@ namespace gr {
      * \brief Convert stream of items into thier byte swapped version
      * \ingroup stream_operators_blk
      */
-    class BLOCKS_API endian_swap : virtual public gr_sync_block
+    class BLOCKS_API endian_swap : virtual public sync_block
     {
     public:
-      // gr::blocks::endian_swap::sptr
+      // gr::gnuradio/blocks::endian_swap::sptr
       typedef boost::shared_ptr<endian_swap> sptr;
 
       /*!
diff --git a/gr-blocks/include/blocks/file_descriptor_sink.h b/gr-blocks/include/gnuradio/blocks/file_descriptor_sink.h
index e98f918c14..9a3cf2edad 100644
--- a/gr-blocks/include/blocks/file_descriptor_sink.h
+++ b/gr-blocks/include/gnuradio/blocks/file_descriptor_sink.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_GR_FILE_DESCRIPTOR_SINK_H
 #define INCLUDED_GR_FILE_DESCRIPTOR_SINK_H
 
-#include <blocks/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_block.h>
 
 namespace gr {
   namespace blocks {
@@ -33,10 +33,10 @@ namespace gr {
      * \brief Write stream to file descriptor.
      * \ingroup file_operators_blk
      */
-    class BLOCKS_API file_descriptor_sink : virtual public gr_sync_block
+    class BLOCKS_API file_descriptor_sink : virtual public sync_block
     {
     public:
-      // gr::blocks::file_descriptor_sink::sptr
+      // gr::gnuradio/blocks::file_descriptor_sink::sptr
       typedef boost::shared_ptr<file_descriptor_sink> sptr;
 
       /*!
diff --git a/gr-blocks/include/blocks/file_descriptor_source.h b/gr-blocks/include/gnuradio/blocks/file_descriptor_source.h
index ac827800cd..24e6028892 100644
--- a/gr-blocks/include/blocks/file_descriptor_source.h
+++ b/gr-blocks/include/gnuradio/blocks/file_descriptor_source.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_GR_FILE_DESCRIPTOR_SOURCE_H
 #define INCLUDED_GR_FILE_DESCRIPTOR_SOURCE_H
 
-#include <blocks/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_block.h>
 
 
 namespace gr {
@@ -34,7 +34,7 @@ namespace gr {
      * \brief Read stream from file descriptor.
      * \ingroup file_operators_blk
      */
-    class BLOCKS_API file_descriptor_source : virtual public gr_sync_block
+    class BLOCKS_API file_descriptor_source : virtual public sync_block
     {
     protected:
       virtual int read_items(char *buf, int nitems) = 0;
@@ -42,7 +42,7 @@ namespace gr {
       virtual void flush_residue() = 0;
 
     public:
-      // gr::blocks::file_descriptor_source::sptr
+      // gr::gnuradio/blocks::file_descriptor_source::sptr
       typedef boost::shared_ptr<file_descriptor_source> sptr;
 
       /*!
diff --git a/gr-blocks/include/blocks/file_meta_sink.h b/gr-blocks/include/gnuradio/blocks/file_meta_sink.h
index 763e0a2da0..10230008a3 100644
--- a/gr-blocks/include/blocks/file_meta_sink.h
+++ b/gr-blocks/include/gnuradio/blocks/file_meta_sink.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_BLOCKS_FILE_META_SINK_H
 #define INCLUDED_BLOCKS_FILE_META_SINK_H
 
-#include <blocks/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_block.h>
 
 namespace gr {
   namespace blocks {
@@ -67,10 +67,10 @@ namespace gr {
      * the data segment starts plus the data segment size. Following
      * will either be a new header or EOF.
      */
-    class BLOCKS_API file_meta_sink : virtual public gr_sync_block
+    class BLOCKS_API file_meta_sink : virtual public sync_block
     {
     public:
-      // gr::blocks::file_meta_sink::sptr
+      // gr::gnuradio/blocks::file_meta_sink::sptr
       typedef boost::shared_ptr<file_meta_sink> sptr;
 
       /*!
diff --git a/gr-blocks/include/blocks/file_meta_source.h b/gr-blocks/include/gnuradio/blocks/file_meta_source.h
index 83997fc9b5..38b6a43d86 100644
--- a/gr-blocks/include/blocks/file_meta_source.h
+++ b/gr-blocks/include/gnuradio/blocks/file_meta_source.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_BLOCKS_FILE_META_SOURCE_H
 #define INCLUDED_BLOCKS_FILE_META_SOURCE_H
 
-#include <blocks/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_block.h>
 
 namespace gr {
   namespace blocks {
@@ -48,10 +48,10 @@ namespace gr {
      * Any item inside of the extra header dictionary is ready out and
      * made into a stream tag.
      */
-    class BLOCKS_API file_meta_source : virtual public gr_sync_block
+    class BLOCKS_API file_meta_source : virtual public sync_block
     {
     public:
-      // gr::blocks::file_meta_source::sptr
+      // gr::gnuradio/blocks::file_meta_source::sptr
       typedef boost::shared_ptr<file_meta_source> sptr;
 
       /*!
diff --git a/gr-blocks/include/blocks/file_sink.h b/gr-blocks/include/gnuradio/blocks/file_sink.h
index c894defd78..7ea2889835 100644
--- a/gr-blocks/include/blocks/file_sink.h
+++ b/gr-blocks/include/gnuradio/blocks/file_sink.h
@@ -23,9 +23,9 @@
 #ifndef INCLUDED_GR_FILE_SINK_H
 #define INCLUDED_GR_FILE_SINK_H
 
-#include <blocks/api.h>
-#include <blocks/file_sink_base.h>
-#include <gr_sync_block.h>
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/blocks/file_sink_base.h>
+#include <gnuradio/sync_block.h>
 
 namespace gr {
   namespace blocks {
@@ -34,11 +34,11 @@ namespace gr {
      * \brief Write stream to file.
      * \ingroup file_operators_blk
      */
-    class BLOCKS_API file_sink : virtual public gr_sync_block,
+    class BLOCKS_API file_sink : virtual public sync_block,
                                  virtual public file_sink_base
     {
     public:
-      // gr::blocks::file_sink::sptr
+      // gr::gnuradio/blocks::file_sink::sptr
       typedef boost::shared_ptr<file_sink> sptr;
 
       /*!
diff --git a/gr-blocks/include/blocks/file_sink_base.h b/gr-blocks/include/gnuradio/blocks/file_sink_base.h
index 3eeb0e63da..812da6dfae 100644
--- a/gr-blocks/include/blocks/file_sink_base.h
+++ b/gr-blocks/include/gnuradio/blocks/file_sink_base.h
@@ -23,7 +23,7 @@
 #ifndef INCLUDED_GR_FILE_SINK_BASE_H
 #define INCLUDED_GR_FILE_SINK_BASE_H
 
-#include <blocks/api.h>
+#include <gnuradio/blocks/api.h>
 #include <boost/thread.hpp>
 #include <cstdio>
 
diff --git a/gr-blocks/include/blocks/file_source.h b/gr-blocks/include/gnuradio/blocks/file_source.h
index 6f1bc49ea1..3ed2747c3e 100644
--- a/gr-blocks/include/blocks/file_source.h
+++ b/gr-blocks/include/gnuradio/blocks/file_source.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_BLOCKS_FILE_SOURCE_H
 #define INCLUDED_BLOCKS_FILE_SOURCE_H
 
-#include <blocks/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_block.h>
 
 namespace gr {
   namespace blocks {
@@ -33,11 +33,11 @@ namespace gr {
      * \brief Read stream from file
      * \ingroup file_operators_blk
      */
-    class BLOCKS_API file_source : virtual public gr_sync_block
+    class BLOCKS_API file_source : virtual public sync_block
     {
     public:
 
-      // gr::blocks::file_source::sptr
+      // gr::gnuradio/blocks::file_source::sptr
       typedef boost::shared_ptr<file_source> sptr;
 
       /*!
diff --git a/gr-blocks/include/blocks/float_to_char.h b/gr-blocks/include/gnuradio/blocks/float_to_char.h
index c0193da573..5933606088 100644
--- a/gr-blocks/include/blocks/float_to_char.h
+++ b/gr-blocks/include/gnuradio/blocks/float_to_char.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_BLOCKS_FLOAT_TO_CHAR_H
 #define INCLUDED_BLOCKS_FLOAT_TO_CHAR_H
 
-#include <blocks/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_block.h>
 
 namespace gr {
   namespace blocks {
@@ -33,10 +33,10 @@ namespace gr {
      * \brief Convert stream of floats to a stream of char
      * \ingroup type_converters_blk
      */
-    class BLOCKS_API float_to_char : virtual public gr_sync_block
+    class BLOCKS_API float_to_char : virtual public sync_block
     {
     public:
-      // gr::blocks::float_to_char_ff::sptr
+      // gr::gnuradio/blocks::float_to_char_ff::sptr
       typedef boost::shared_ptr<float_to_char> sptr;
 
       /*!
diff --git a/gr-blocks/include/blocks/float_to_complex.h b/gr-blocks/include/gnuradio/blocks/float_to_complex.h
index aba9aed8c4..c8a97f1fb7 100644
--- a/gr-blocks/include/blocks/float_to_complex.h
+++ b/gr-blocks/include/gnuradio/blocks/float_to_complex.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_BLOCKS_FLOAT_TO_COMPLEX_H
 #define INCLUDED_BLOCKS_FLOAT_TO_COMPLEX_H
 
-#include <blocks/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_block.h>
 
 namespace gr {
   namespace blocks {
@@ -33,10 +33,10 @@ namespace gr {
      * \brief one or two floats in, complex out
      * \ingroup type_converters_blk
      */
-    class BLOCKS_API float_to_complex : virtual public gr_sync_block
+    class BLOCKS_API float_to_complex : virtual public sync_block
     {
     public:
-      // gr::blocks::float_to_complex_ff::sptr
+      // gr::gnuradio/blocks::float_to_complex_ff::sptr
       typedef boost::shared_ptr<float_to_complex> sptr;
 
       /*!
diff --git a/gr-blocks/include/blocks/float_to_int.h b/gr-blocks/include/gnuradio/blocks/float_to_int.h
index 3c8e7ad5ab..0d82b7e5c5 100644
--- a/gr-blocks/include/blocks/float_to_int.h
+++ b/gr-blocks/include/gnuradio/blocks/float_to_int.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_BLOCKS_FLOAT_TO_INT_H
 #define INCLUDED_BLOCKS_FLOAT_TO_INT_H
 
-#include <blocks/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_block.h>
 
 namespace gr {
   namespace blocks {
@@ -33,10 +33,10 @@ namespace gr {
      * \brief Convert stream of floats to a stream of ints.
      * \ingroup type_converters_blk
      */
-    class BLOCKS_API float_to_int : virtual public gr_sync_block
+    class BLOCKS_API float_to_int : virtual public sync_block
     {
     public:
-      // gr::blocks::float_to_int_ff::sptr
+      // gr::gnuradio/blocks::float_to_int_ff::sptr
       typedef boost::shared_ptr<float_to_int> sptr;
 
       /*!
diff --git a/gr-blocks/include/blocks/float_to_short.h b/gr-blocks/include/gnuradio/blocks/float_to_short.h
index 8f5f60e55b..ad62189dd2 100644
--- a/gr-blocks/include/blocks/float_to_short.h
+++ b/gr-blocks/include/gnuradio/blocks/float_to_short.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_BLOCKS_FLOAT_TO_SHORT_H
 #define INCLUDED_BLOCKS_FLOAT_TO_SHORT_H
 
-#include <blocks/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_block.h>
 
 namespace gr {
   namespace blocks {
@@ -33,10 +33,10 @@ namespace gr {
      * \brief Convert stream of floats to a stream of shorts
      * \ingroup type_converters_blk
      */
-    class BLOCKS_API float_to_short : virtual public gr_sync_block
+    class BLOCKS_API float_to_short : virtual public sync_block
     {
     public:
-      // gr::blocks::float_to_short_ff::sptr
+      // gr::gnuradio/blocks::float_to_short_ff::sptr
       typedef boost::shared_ptr<float_to_short> sptr;
 
       /*!
diff --git a/gr-blocks/include/blocks/float_to_uchar.h b/gr-blocks/include/gnuradio/blocks/float_to_uchar.h
index 9bfaaa65aa..3a34079bc1 100644
--- a/gr-blocks/include/blocks/float_to_uchar.h
+++ b/gr-blocks/include/gnuradio/blocks/float_to_uchar.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_BLOCKS_FLOAT_TO_UCHAR_H
 #define INCLUDED_BLOCKS_FLOAT_TO_UCHAR_H
 
-#include <blocks/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_block.h>
 
 namespace gr {
   namespace blocks {
@@ -33,11 +33,11 @@ namespace gr {
      * \brief Convert stream of floats to a stream of unsigned chars
      * \ingroup type_converters_blk
      */
-    class BLOCKS_API float_to_uchar : virtual public gr_sync_block
+    class BLOCKS_API float_to_uchar : virtual public sync_block
     {
     public:
       
-      // gr::blocks::float_to_uchar_ff::sptr
+      // gr::gnuradio/blocks::float_to_uchar_ff::sptr
       typedef boost::shared_ptr<float_to_uchar> sptr;
 
       /*!
diff --git a/gr-blocks/include/blocks/head.h b/gr-blocks/include/gnuradio/blocks/head.h
index 4693f988b8..f4a870908a 100644
--- a/gr-blocks/include/blocks/head.h
+++ b/gr-blocks/include/gnuradio/blocks/head.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_GR_HEAD_H
 #define INCLUDED_GR_HEAD_H
 
-#include <blocks/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_block.h>
 #include <stddef.h>			// size_t
 
 namespace gr {
@@ -37,10 +37,10 @@ namespace gr {
      * \details
      * Useful for building test cases
      */
-    class BLOCKS_API head : virtual public gr_sync_block
+    class BLOCKS_API head : virtual public sync_block
     {
     public:
-      // gr::blocks::head::sptr
+      // gr::gnuradio/blocks::head::sptr
       typedef boost::shared_ptr<head> sptr;
 
       static sptr make(size_t sizeof_stream_item,
diff --git a/gr-blocks/include/blocks/int_to_float.h b/gr-blocks/include/gnuradio/blocks/int_to_float.h
index 179667e4df..6813449a95 100644
--- a/gr-blocks/include/blocks/int_to_float.h
+++ b/gr-blocks/include/gnuradio/blocks/int_to_float.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_BLOCKS_INT_TO_FLOAT_H
 #define INCLUDED_BLOCKS_INT_TO_FLOAT_H
 
-#include <blocks/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_block.h>
 
 namespace gr {
   namespace blocks {
@@ -33,10 +33,10 @@ namespace gr {
      * \brief Convert stream of ints to a stream of floats.
      * \ingroup type_converters_blk
      */
-    class BLOCKS_API int_to_float : virtual public gr_sync_block
+    class BLOCKS_API int_to_float : virtual public sync_block
     {
     public:
-      // gr::blocks::int_to_float_ff::sptr
+      // gr::gnuradio/blocks::int_to_float_ff::sptr
       typedef boost::shared_ptr<int_to_float> sptr;
 
       /*!
diff --git a/gr-blocks/include/blocks/integrate_XX.h.t b/gr-blocks/include/gnuradio/blocks/integrate_XX.h.t
index 45a49def0c..343ab1ef6c 100644
--- a/gr-blocks/include/blocks/integrate_XX.h.t
+++ b/gr-blocks/include/gnuradio/blocks/integrate_XX.h.t
@@ -25,8 +25,8 @@
 #ifndef @GUARD_NAME@
 #define @GUARD_NAME@
 
-#include <blocks/api.h>
-#include <gr_sync_decimator.h>
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_decimator.h>
 
 namespace gr {
   namespace blocks {
@@ -35,7 +35,7 @@ namespace gr {
      * \brief Integrate successive samples and decimate
      * \ingroup math_operators_blk
      */
-    class BLOCKS_API @NAME@ : virtual public gr_sync_decimator
+    class BLOCKS_API @NAME@ : virtual public sync_decimator
     {
     public:
       
diff --git a/gr-blocks/include/blocks/interleave.h b/gr-blocks/include/gnuradio/blocks/interleave.h
index 043ad6d27b..a2aa2fc6c2 100644
--- a/gr-blocks/include/blocks/interleave.h
+++ b/gr-blocks/include/gnuradio/blocks/interleave.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_BLOCKS_INTERLEAVE_H
 #define INCLUDED_BLOCKS_INTERLEAVE_H
 
-#include <blocks/api.h>
-#include <gr_sync_interpolator.h>
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_interpolator.h>
 
 namespace gr {
   namespace blocks {
@@ -33,10 +33,10 @@ namespace gr {
      * \brief interleave N inputs into a single output
      * \ingroup stream_operators_blk
      */
-    class BLOCKS_API interleave : virtual public gr_sync_interpolator
+    class BLOCKS_API interleave : virtual public sync_interpolator
     {
     public:
-      // gr::blocks::interleave::sptr
+      // gr::gnuradio/blocks::interleave::sptr
       typedef boost::shared_ptr<interleave> sptr;
 
       /*!
diff --git a/gr-blocks/include/blocks/interleaved_short_to_complex.h b/gr-blocks/include/gnuradio/blocks/interleaved_short_to_complex.h
index 44b6dfcdf4..38caaf7ffa 100644
--- a/gr-blocks/include/blocks/interleaved_short_to_complex.h
+++ b/gr-blocks/include/gnuradio/blocks/interleaved_short_to_complex.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_BLOCKS_INTERLEAVED_SHORT_TO_COMPLEX_H
 #define INCLUDED_BLOCKS_INTERLEAVED_SHORT_TO_COMPLEX_H
 
-#include <blocks/api.h>
-#include <gr_sync_decimator.h>
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_decimator.h>
 
 namespace gr {
   namespace blocks {
@@ -33,10 +33,10 @@ namespace gr {
      * \brief Convert stream of interleaved shorts to a stream of complex
      * \ingroup type_converters_blk
      */
-    class BLOCKS_API interleaved_short_to_complex : virtual public gr_sync_decimator
+    class BLOCKS_API interleaved_short_to_complex : virtual public sync_decimator
     {
     public:
-      // gr::blocks::interleaved_short_to_complex::sptr
+      // gr::gnuradio/blocks::interleaved_short_to_complex::sptr
       typedef boost::shared_ptr<interleaved_short_to_complex> sptr;
 
       /*!
diff --git a/gr-blocks/include/blocks/keep_m_in_n.h b/gr-blocks/include/gnuradio/blocks/keep_m_in_n.h
index 88d94fab85..4a1de48331 100644
--- a/gr-blocks/include/blocks/keep_m_in_n.h
+++ b/gr-blocks/include/gnuradio/blocks/keep_m_in_n.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_BLOCKS_KEEP_M_IN_N_H
 #define INCLUDED_BLOCKS_KEEP_M_IN_N_H
 
-#include <blocks/api.h>
-#include <gr_block.h>
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/block.h>
 
 namespace gr {
   namespace blocks {
@@ -33,11 +33,11 @@ namespace gr {
      * \brief decimate a stream, keeping \p m items out of every \p n.
      * \ingroup stream_operators_blk
      */
-    class BLOCKS_API keep_m_in_n : virtual public gr_block
+    class BLOCKS_API keep_m_in_n : virtual public block
     {
     public:
       
-      // gr::blocks::keep_m_in_n::sptr
+      // gr::gnuradio/blocks::keep_m_in_n::sptr
       typedef boost::shared_ptr<keep_m_in_n> sptr;
 
       /*!
diff --git a/gr-blocks/include/blocks/keep_one_in_n.h b/gr-blocks/include/gnuradio/blocks/keep_one_in_n.h
index 9cce1e93ed..bc63bf9383 100644
--- a/gr-blocks/include/blocks/keep_one_in_n.h
+++ b/gr-blocks/include/gnuradio/blocks/keep_one_in_n.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_BLOCKS_KEEP_ONE_IN_N_H
 #define INCLUDED_BLOCKS_KEEP_ONE_IN_N_H
 
-#include <blocks/api.h>
-#include <gr_block.h>
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/block.h>
 
 namespace gr {
   namespace blocks {
@@ -33,11 +33,11 @@ namespace gr {
      * \brief decimate a stream, keeping one item out of every \p n.
      * \ingroup stream_operators_blk
      */
-    class BLOCKS_API keep_one_in_n : virtual public gr_block
+    class BLOCKS_API keep_one_in_n : virtual public block
     {
     public:
       
-      // gr::blocks::keep_one_in_n::sptr
+      // gr::gnuradio/blocks::keep_one_in_n::sptr
       typedef boost::shared_ptr<keep_one_in_n> sptr;
 
       /*!
diff --git a/gr-blocks/include/blocks/lfsr_15_1_0.h b/gr-blocks/include/gnuradio/blocks/lfsr_15_1_0.h
index b906844585..2ebfe08319 100644
--- a/gr-blocks/include/blocks/lfsr_15_1_0.h
+++ b/gr-blocks/include/gnuradio/blocks/lfsr_15_1_0.h
@@ -23,7 +23,7 @@
 #ifndef INCLUDED_GRI_LFSR_15_1_0_H
 #define INCLUDED_GRI_LFSR_15_1_0_H
 
-#include <blocks/api.h>
+#include <gnuradio/blocks/api.h>
 
 namespace gr {
   namespace blocks {
diff --git a/gr-blocks/include/blocks/lfsr_32k.h b/gr-blocks/include/gnuradio/blocks/lfsr_32k.h
index 23954139d8..502efebc5d 100644
--- a/gr-blocks/include/blocks/lfsr_32k.h
+++ b/gr-blocks/include/gnuradio/blocks/lfsr_32k.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_GRI_LFSR_32k_H
 #define INCLUDED_GRI_LFSR_32k_H
 
-#include <blocks/api.h>
-#include <blocks/lfsr_15_1_0.h>
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/blocks/lfsr_15_1_0.h>
 
 namespace gr {
   namespace blocks {
diff --git a/gr-blocks/include/blocks/lfsr_32k_source_s.h b/gr-blocks/include/gnuradio/blocks/lfsr_32k_source_s.h
index 843c7a57e6..619e9a424d 100644
--- a/gr-blocks/include/blocks/lfsr_32k_source_s.h
+++ b/gr-blocks/include/gnuradio/blocks/lfsr_32k_source_s.h
@@ -23,9 +23,9 @@
 #ifndef INCLUDED_GR_LFSR_32K_SOURCE_S_H
 #define INCLUDED_GR_LFSR_32K_SOURCE_S_H
 
-#include <blocks/api.h>
-#include <blocks/lfsr_32k.h>
-#include <gr_sync_block.h>
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/blocks/lfsr_32k.h>
+#include <gnuradio/sync_block.h>
 
 namespace gr {
   namespace blocks {
@@ -38,10 +38,10 @@ namespace gr {
      * This source is typically used along with gr::blocks::check_lfsr_32k_s to
      * test the USRP using its digital loopback mode.
      */
-    class BLOCKS_API lfsr_32k_source_s : virtual public gr_sync_block
+    class BLOCKS_API lfsr_32k_source_s : virtual public sync_block
     {
     public:
-      // gr::blocks::lfsr_32k_source_s::sptr
+      // gr::gnuradio/blocks::lfsr_32k_source_s::sptr
       typedef boost::shared_ptr<lfsr_32k_source_s> sptr;
 
       /*!
diff --git a/gr-blocks/include/blocks/log2_const.h b/gr-blocks/include/gnuradio/blocks/log2_const.h
index 67d63810fc..c2526e76ed 100644
--- a/gr-blocks/include/blocks/log2_const.h
+++ b/gr-blocks/include/gnuradio/blocks/log2_const.h
@@ -27,7 +27,7 @@
 #ifndef INCLUDED_BLOCKS_LOG2_CONST_H
 #define INCLUDED_BLOCKS_LOG2_CONST_H
 
-#include <blocks/api.h>
+#include <gnuradio/blocks/api.h>
 #include <assert.h>
 
 namespace gr {
diff --git a/gr-blocks/include/blocks/max_XX.h.t b/gr-blocks/include/gnuradio/blocks/max_XX.h.t
index 738d7bb938..44b3ad4878 100644
--- a/gr-blocks/include/blocks/max_XX.h.t
+++ b/gr-blocks/include/gnuradio/blocks/max_XX.h.t
@@ -25,8 +25,8 @@
 #ifndef @GUARD_NAME@
 #define @GUARD_NAME@
 
-#include <blocks/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_block.h>
 
 namespace gr {
   namespace blocks {
@@ -43,7 +43,7 @@ namespace gr {
      *    Stream 0 will contain the index value in the vector where
      *    the maximum value occurred.
      */
-    class BLOCKS_API @NAME@ : virtual public gr_sync_block
+    class BLOCKS_API @NAME@ : virtual public sync_block
     {
     public:
       // gr::blocks::@NAME@::sptr
diff --git a/gr-blocks/include/blocks/message_burst_source.h b/gr-blocks/include/gnuradio/blocks/message_burst_source.h
index 72997abf2c..0e7527cbe0 100644
--- a/gr-blocks/include/blocks/message_burst_source.h
+++ b/gr-blocks/include/gnuradio/blocks/message_burst_source.h
@@ -23,9 +23,9 @@
 #ifndef INCLUDED_GR_MESSAGE_BURST_SOURCE_H
 #define INCLUDED_GR_MESSAGE_BURST_SOURCE_H
 
-#include <blocks/api.h>
-#include <gr_sync_block.h>
-#include <gr_msg_queue.h>
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_block.h>
+#include <gnuradio/msg_queue.h>
 
 namespace gr {
   namespace blocks {
@@ -34,16 +34,16 @@ namespace gr {
      * \brief Turn received messages into a stream and tag them for UHD to send.
      * \ingroup message_tools_blk
      */
-    class BLOCKS_API message_burst_source : virtual public gr_sync_block
+    class BLOCKS_API message_burst_source : virtual public sync_block
     {
     public:
-      // gr::blocks::message_source::sptr
+      // gr::gnuradio/blocks::message_source::sptr
       typedef boost::shared_ptr<message_burst_source> sptr;
 
       static sptr make(size_t itemsize, int msgq_limit);
-      static sptr make(size_t itemsize, gr_msg_queue_sptr msgq);
+      static sptr make(size_t itemsize, gr::msg_queue::sptr msgq);
 
-      virtual gr_msg_queue_sptr msgq() const = 0;
+      virtual gr::msg_queue::sptr msgq() const = 0;
     };
 
   } /* namespace blocks */
diff --git a/gr-blocks/include/blocks/message_debug.h b/gr-blocks/include/gnuradio/blocks/message_debug.h
index 59a778ba49..cc9612542c 100644
--- a/gr-blocks/include/blocks/message_debug.h
+++ b/gr-blocks/include/gnuradio/blocks/message_debug.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_GR_MESSAGE_DEBUG_H
 #define INCLUDED_GR_MESSAGE_DEBUG_H
 
-#include <blocks/api.h>
-#include <gr_block.h>
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/block.h>
 
 namespace gr {
   namespace blocks {
@@ -48,10 +48,10 @@ namespace gr {
      * \li print_pdu: specifically designed to handle formatted PDUs
      *                (see pdu.h).
      */
-    class BLOCKS_API message_debug : virtual public gr_block
+    class BLOCKS_API message_debug : virtual public block
     {
     public:
-      // gr::blocks::message_debug::sptr
+      // gr::gnuradio/blocks::message_debug::sptr
       typedef boost::shared_ptr<message_debug> sptr;
 
       /*! 
diff --git a/gr-blocks/include/blocks/message_sink.h b/gr-blocks/include/gnuradio/blocks/message_sink.h
index aec636e3cf..60eaa84497 100644
--- a/gr-blocks/include/blocks/message_sink.h
+++ b/gr-blocks/include/gnuradio/blocks/message_sink.h
@@ -23,9 +23,9 @@
 #ifndef INCLUDED_GR_MESSAGE_SINK_H
 #define INCLUDED_GR_MESSAGE_SINK_H
 
-#include <blocks/api.h>
-#include <gr_sync_block.h>
-#include <gr_msg_queue.h>
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_block.h>
+#include <gnuradio/msg_queue.h>
 
 namespace gr {
   namespace blocks {
@@ -34,14 +34,14 @@ namespace gr {
      * \brief Gather received items into messages and insert into msgq
      * \ingroup message_tools_blk
      */
-    class BLOCKS_API message_sink : virtual public gr_sync_block
+    class BLOCKS_API message_sink : virtual public sync_block
     {
     public:
-      // gr::blocks::message_sink::sptr
+      // gr::gnuradio/blocks::message_sink::sptr
       typedef boost::shared_ptr<message_sink> sptr;
 
-      static sptr make(size_t itemsize, gr_msg_queue_sptr msgq, bool dont_block);
-      static sptr make(size_t itemsize, gr_msg_queue_sptr msgq, bool dont_block,
+      static sptr make(size_t itemsize, gr::msg_queue::sptr msgq, bool dont_block);
+      static sptr make(size_t itemsize, gr::msg_queue::sptr msgq, bool dont_block,
 		       const std::string& lengthtagname);
 
     };
diff --git a/gr-blocks/include/blocks/message_source.h b/gr-blocks/include/gnuradio/blocks/message_source.h
index 2aa3ddaa35..af21d7333f 100644
--- a/gr-blocks/include/blocks/message_source.h
+++ b/gr-blocks/include/gnuradio/blocks/message_source.h
@@ -23,9 +23,9 @@
 #ifndef INCLUDED_GR_MESSAGE_SOURCE_H
 #define INCLUDED_GR_MESSAGE_SOURCE_H
 
-#include <blocks/api.h>
-#include <gr_sync_block.h>
-#include <gr_msg_queue.h>
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_block.h>
+#include <gnuradio/msg_queue.h>
 
 namespace gr {
   namespace blocks {
@@ -34,18 +34,18 @@ namespace gr {
      * \brief Turn received messages into a stream
      * \ingroup message_tools_blk
      */
-    class BLOCKS_API message_source : virtual public gr_sync_block
+    class BLOCKS_API message_source : virtual public sync_block
     {
     public:
-      // gr::blocks::message_source::sptr
+      // gr::gnuradio/blocks::message_source::sptr
       typedef boost::shared_ptr<message_source> sptr;
 
       static sptr make(size_t itemsize, int msgq_limit=0);
-      static sptr make(size_t itemsize, gr_msg_queue_sptr msgq);
-      static sptr make(size_t itemsize, gr_msg_queue_sptr msgq,
+      static sptr make(size_t itemsize, gr::msg_queue::sptr msgq);
+      static sptr make(size_t itemsize, gr::msg_queue::sptr msgq,
 		       const std::string& lengthtagname);
 
-      virtual gr_msg_queue_sptr msgq() const = 0;
+      virtual gr::msg_queue::sptr msgq() const = 0;
     };
 
   } /* namespace blocks */
diff --git a/gr-blocks/include/blocks/message_strobe.h b/gr-blocks/include/gnuradio/blocks/message_strobe.h
index abd9b73596..07b6833b43 100644
--- a/gr-blocks/include/blocks/message_strobe.h
+++ b/gr-blocks/include/gnuradio/blocks/message_strobe.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_GR_MESSAGE_STROBE_H
 #define INCLUDED_GR_MESSAGE_STROBE_H
 
-#include <blocks/api.h>
-#include <gr_block.h>
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/block.h>
 
 namespace gr {
   namespace blocks {
@@ -37,10 +37,10 @@ namespace gr {
      * Takes a PMT message and sends it out every \p period_ms
      * milliseconds. Useful for testing/debugging the message system.
      */
-    class BLOCKS_API message_strobe : virtual public gr_block
+    class BLOCKS_API message_strobe : virtual public block
     {
     public:
-      // gr::blocks::message_strobe::sptr
+      // gr::gnuradio/blocks::message_strobe::sptr
       typedef boost::shared_ptr<message_strobe> sptr;
 
       /*!
diff --git a/gr-blocks/include/blocks/moving_average_XX.h.t b/gr-blocks/include/gnuradio/blocks/moving_average_XX.h.t
index 5b996bd4d5..37472f70d7 100644
--- a/gr-blocks/include/blocks/moving_average_XX.h.t
+++ b/gr-blocks/include/gnuradio/blocks/moving_average_XX.h.t
@@ -25,8 +25,8 @@
 #ifndef @GUARD_NAME@
 #define @GUARD_NAME@
 
-#include <blocks/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_block.h>
 
 namespace gr {
   namespace blocks {
@@ -35,7 +35,7 @@ namespace gr {
      * \brief output is the moving sum of the last N samples, scaled by the scale factor
      * \ingroup level_controllers_blk
      */
-    class BLOCKS_API @NAME@ : virtual public gr_sync_block
+    class BLOCKS_API @NAME@ : virtual public sync_block
     {
     public: 
       // gr::blocks::@NAME@::sptr
diff --git a/gr-blocks/include/blocks/multiply_XX.h.t b/gr-blocks/include/gnuradio/blocks/multiply_XX.h.t
index 4ad25d35e9..1071b5b5c5 100644
--- a/gr-blocks/include/blocks/multiply_XX.h.t
+++ b/gr-blocks/include/gnuradio/blocks/multiply_XX.h.t
@@ -25,8 +25,8 @@
 #ifndef @GUARD_NAME@
 #define @GUARD_NAME@
 
-#include <blocks/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_block.h>
 
 namespace gr {
   namespace blocks {
@@ -38,7 +38,7 @@ namespace gr {
      * \details
      * Multiply across all input streams.
      */
-    class BLOCKS_API @NAME@ : virtual public gr_sync_block
+    class BLOCKS_API @NAME@ : virtual public sync_block
     {
     public:
 
diff --git a/gr-blocks/include/blocks/multiply_cc.h b/gr-blocks/include/gnuradio/blocks/multiply_cc.h
index 79533c2dc6..c6116b6452 100644
--- a/gr-blocks/include/blocks/multiply_cc.h
+++ b/gr-blocks/include/gnuradio/blocks/multiply_cc.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_GR_MULTIPLY_CC_H
 #define INCLUDED_GR_MULTIPLY_CC_H
 
-#include <blocks/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_block.h>
 
 namespace gr {
   namespace blocks {
@@ -36,11 +36,11 @@ namespace gr {
      * \details
      * Multiply across all input streams.
      */
-    class BLOCKS_API multiply_cc : virtual public gr_sync_block
+    class BLOCKS_API multiply_cc : virtual public sync_block
     {
     public:
 
-      // gr::blocks::multiply_cc::sptr
+      // gr::gnuradio/blocks::multiply_cc::sptr
       typedef boost::shared_ptr<multiply_cc> sptr;
 
       /*!
diff --git a/gr-blocks/include/blocks/multiply_conjugate_cc.h b/gr-blocks/include/gnuradio/blocks/multiply_conjugate_cc.h
index 7fa46f891e..43101bf441 100644
--- a/gr-blocks/include/blocks/multiply_conjugate_cc.h
+++ b/gr-blocks/include/gnuradio/blocks/multiply_conjugate_cc.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_GR_MULTIPLY_CONJUGATE_CC_H
 #define INCLUDED_GR_MULTIPLY_CONJUGATE_CC_H
 
-#include <blocks/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_block.h>
 
 namespace gr {
   namespace blocks {
@@ -33,11 +33,11 @@ namespace gr {
      * \brief Multiplies stream 0 by the complex conjugate of stream 1.
      * \ingroup math_operators_blk
      */
-    class BLOCKS_API multiply_conjugate_cc : virtual public gr_sync_block
+    class BLOCKS_API multiply_conjugate_cc : virtual public sync_block
     {
     public:
 
-      // gr::blocks::multiply_conjugate_cc::sptr
+      // gr::gnuradio/blocks::multiply_conjugate_cc::sptr
       typedef boost::shared_ptr<multiply_conjugate_cc> sptr;
 
       /*!
diff --git a/gr-blocks/include/blocks/multiply_const_XX.h.t b/gr-blocks/include/gnuradio/blocks/multiply_const_XX.h.t
index 4f5ac5c5a6..d1bc76c3b3 100644
--- a/gr-blocks/include/blocks/multiply_const_XX.h.t
+++ b/gr-blocks/include/gnuradio/blocks/multiply_const_XX.h.t
@@ -25,8 +25,8 @@
 #ifndef @GUARD_NAME@
 #define @GUARD_NAME@
 
-#include <blocks/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_block.h>
 
 namespace gr {
   namespace blocks {
@@ -35,7 +35,7 @@ namespace gr {
      * \brief output = input * constant
      * \ingroup math_operators_blk
      */
-    class BLOCKS_API @NAME@ : virtual public gr_sync_block
+    class BLOCKS_API @NAME@ : virtual public sync_block
     {
 
     public:
diff --git a/gr-blocks/include/blocks/multiply_const_cc.h b/gr-blocks/include/gnuradio/blocks/multiply_const_cc.h
index 3469b4df17..d24c1135c3 100644
--- a/gr-blocks/include/blocks/multiply_const_cc.h
+++ b/gr-blocks/include/gnuradio/blocks/multiply_const_cc.h
@@ -25,8 +25,8 @@
 #ifndef INCLUDED_MULTIPLY_CONST_CC_H
 #define INCLUDED_MULTIPLY_CONST_CC_H
 
-#include <blocks/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_block.h>
 
 namespace gr {
   namespace blocks {
@@ -35,12 +35,12 @@ namespace gr {
      * \brief output = input * complex constant
      * \ingroup math_operators_blk
      */
-    class BLOCKS_API multiply_const_cc : virtual public gr_sync_block
+    class BLOCKS_API multiply_const_cc : virtual public sync_block
     {
 
     public:
       
-      // gr::blocks::multiply_const_cc::sptr
+      // gr::gnuradio/blocks::multiply_const_cc::sptr
       typedef boost::shared_ptr<multiply_const_cc> sptr;
       
       /*!
diff --git a/gr-blocks/include/blocks/multiply_const_ff.h b/gr-blocks/include/gnuradio/blocks/multiply_const_ff.h
index 627e0c39a6..0fc81dc38f 100644
--- a/gr-blocks/include/blocks/multiply_const_ff.h
+++ b/gr-blocks/include/gnuradio/blocks/multiply_const_ff.h
@@ -25,8 +25,8 @@
 #ifndef INCLUDED_MULTIPLY_CONST_FF_H
 #define INCLUDED_MULTIPLY_CONST_FF_H
 
-#include <blocks/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_block.h>
 
 namespace gr {
   namespace blocks {
@@ -35,12 +35,12 @@ namespace gr {
      * \brief output = input * real constant
      * \ingroup math_operators_blk
      */
-    class BLOCKS_API multiply_const_ff : virtual public gr_sync_block
+    class BLOCKS_API multiply_const_ff : virtual public sync_block
     {
 
     public:
       
-      // gr::blocks::multiply_const_ff::sptr
+      // gr::gnuradio/blocks::multiply_const_ff::sptr
       typedef boost::shared_ptr<multiply_const_ff> sptr;
       
       /*!
diff --git a/gr-blocks/include/blocks/multiply_const_vXX.h.t b/gr-blocks/include/gnuradio/blocks/multiply_const_vXX.h.t
index e9eb66083e..ed180dba33 100644
--- a/gr-blocks/include/blocks/multiply_const_vXX.h.t
+++ b/gr-blocks/include/gnuradio/blocks/multiply_const_vXX.h.t
@@ -25,8 +25,8 @@
 #ifndef @GUARD_NAME@
 #define @GUARD_NAME@
 
-#include <blocks/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_block.h>
 
 namespace gr {
   namespace blocks {
@@ -35,7 +35,7 @@ namespace gr {
      * \brief output = input * constant vector (element-wise)
      * \ingroup math_operators_blk
      */
-    class BLOCKS_API @NAME@ : virtual public gr_sync_block
+    class BLOCKS_API @NAME@ : virtual public sync_block
     {
 
     public:
diff --git a/gr-blocks/include/blocks/multiply_ff.h b/gr-blocks/include/gnuradio/blocks/multiply_ff.h
index ef3f5109bd..b7ee6ca430 100644
--- a/gr-blocks/include/blocks/multiply_ff.h
+++ b/gr-blocks/include/gnuradio/blocks/multiply_ff.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_GR_MULTIPLY_FF_H
 #define INCLUDED_GR_MULTIPLY_FF_H
 
-#include <blocks/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_block.h>
 
 namespace gr {
   namespace blocks {
@@ -36,11 +36,11 @@ namespace gr {
      * \details
      * Multiply across all input streams.
      */
-    class BLOCKS_API multiply_ff : virtual public gr_sync_block
+    class BLOCKS_API multiply_ff : virtual public sync_block
     {
     public:
 
-      // gr::blocks::multiply_ff::sptr
+      // gr::gnuradio/blocks::multiply_ff::sptr
       typedef boost::shared_ptr<multiply_ff> sptr;
 
       /*!
diff --git a/gr-blocks/include/blocks/mute_XX.h.t b/gr-blocks/include/gnuradio/blocks/mute_XX.h.t
index b9a394df2f..ab246c54b5 100644
--- a/gr-blocks/include/blocks/mute_XX.h.t
+++ b/gr-blocks/include/gnuradio/blocks/mute_XX.h.t
@@ -25,8 +25,8 @@
 #ifndef @GUARD_NAME@
 #define @GUARD_NAME@
 
-#include <blocks/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_block.h>
 
 namespace gr {
   namespace blocks {
@@ -35,7 +35,7 @@ namespace gr {
      * \brief output = input or zero if muted.
      * \ingroup level_controllers_blk
      */
-    class BLOCKS_API @NAME@ : virtual public gr_sync_block
+    class BLOCKS_API @NAME@ : virtual public sync_block
     {
     public:
       // gr::blocks::@NAME@::sptr
diff --git a/gr-blocks/include/blocks/nlog10_ff.h b/gr-blocks/include/gnuradio/blocks/nlog10_ff.h
index 7c4dfd8962..642cf987bd 100644
--- a/gr-blocks/include/blocks/nlog10_ff.h
+++ b/gr-blocks/include/gnuradio/blocks/nlog10_ff.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_BLOCKS_NLOG10_FF_H
 #define INCLUDED_BLOCKS_NLOG10_FF_H
 
-#include <blocks/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_block.h>
 
 namespace gr {
   namespace blocks {
@@ -33,11 +33,11 @@ namespace gr {
      * \brief output = n*log10(input) + k
      * \ingroup math_operators_blk
      */
-    class BLOCKS_API nlog10_ff : virtual public gr_sync_block
+    class BLOCKS_API nlog10_ff : virtual public sync_block
     {
     public:
       
-      // gr::blocks::nlog10_ff::sptr
+      // gr::gnuradio/blocks::nlog10_ff::sptr
       typedef boost::shared_ptr<nlog10_ff> sptr;
 
       /*!
diff --git a/gr-blocks/include/blocks/nop.h b/gr-blocks/include/gnuradio/blocks/nop.h
index a75adad621..20ca0532a9 100644
--- a/gr-blocks/include/blocks/nop.h
+++ b/gr-blocks/include/gnuradio/blocks/nop.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_GR_NOP_H
 #define INCLUDED_GR_NOP_H
 
-#include <blocks/api.h>
-#include <gr_block.h>
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/block.h>
 #include <stddef.h>			// size_t
 
 namespace gr {
@@ -34,10 +34,10 @@ namespace gr {
      * \brief Does nothing. Used for testing only.
      * \ingroup misc_blk
      */
-    class BLOCKS_API nop : virtual public gr_block
+    class BLOCKS_API nop : virtual public block
     {
     public:
-      // gr::blocks::nop::sptr
+      // gr::gnuradio/blocks::nop::sptr
       typedef boost::shared_ptr<nop> sptr;
 
       /*!
diff --git a/gr-blocks/include/blocks/not_XX.h.t b/gr-blocks/include/gnuradio/blocks/not_XX.h.t
index fc06327722..2c32237ce5 100644
--- a/gr-blocks/include/blocks/not_XX.h.t
+++ b/gr-blocks/include/gnuradio/blocks/not_XX.h.t
@@ -25,8 +25,8 @@
 #ifndef @GUARD_NAME@
 #define @GUARD_NAME@
 
-#include <blocks/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_block.h>
 
 namespace gr {
   namespace blocks {
@@ -37,7 +37,7 @@ namespace gr {
      *
      * bitwise boolean not of input streams.
      */
-    class BLOCKS_API @NAME@ : virtual public gr_sync_block
+    class BLOCKS_API @NAME@ : virtual public sync_block
     {
     public:
       
diff --git a/gr-blocks/include/blocks/null_sink.h b/gr-blocks/include/gnuradio/blocks/null_sink.h
index 8e772ab61f..840d58aade 100644
--- a/gr-blocks/include/blocks/null_sink.h
+++ b/gr-blocks/include/gnuradio/blocks/null_sink.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_GR_NULL_SINK_H
 #define INCLUDED_GR_NULL_SINK_H
 
-#include <blocks/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_block.h>
 #include <stddef.h>			// size_t
 
 namespace gr {
@@ -35,10 +35,10 @@ namespace gr {
      * required and we don't want to do anything real.
      * \ingroup misc_blk
      */
-    class BLOCKS_API null_sink : virtual public gr_sync_block
+    class BLOCKS_API null_sink : virtual public sync_block
     {
     public:
-      // gr::blocks::null_sink::sptr
+      // gr::gnuradio/blocks::null_sink::sptr
       typedef boost::shared_ptr<null_sink> sptr;
 
       /*!
diff --git a/gr-blocks/include/blocks/null_source.h b/gr-blocks/include/gnuradio/blocks/null_source.h
index fc782c1cb5..387c649f45 100644
--- a/gr-blocks/include/blocks/null_source.h
+++ b/gr-blocks/include/gnuradio/blocks/null_source.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_GR_NULL_SOURCE_H
 #define INCLUDED_GR_NULL_SOURCE_H
 
-#include <blocks/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_block.h>
 
 namespace gr {
   namespace blocks {
@@ -33,10 +33,10 @@ namespace gr {
      * \brief A source of zeros used mainly for testing.
      * \ingroup misc_blk
      */
-    class BLOCKS_API null_source : virtual public gr_sync_block
+    class BLOCKS_API null_source : virtual public sync_block
     {
     public:
-      // gr::blocks::null_source::sptr
+      // gr::gnuradio/blocks::null_source::sptr
       typedef boost::shared_ptr<null_source> sptr;
 
       /*!
diff --git a/gr-blocks/include/blocks/or_XX.h.t b/gr-blocks/include/gnuradio/blocks/or_XX.h.t
index 67afe54ea9..d485f04962 100644
--- a/gr-blocks/include/blocks/or_XX.h.t
+++ b/gr-blocks/include/gnuradio/blocks/or_XX.h.t
@@ -25,8 +25,8 @@
 #ifndef @GUARD_NAME@
 #define @GUARD_NAME@
 
-#include <blocks/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_block.h>
 
 namespace gr {
   namespace blocks {
@@ -37,7 +37,7 @@ namespace gr {
      *
      * Bitwise boolean or across all input streams.
      */
-    class BLOCKS_API @NAME@ : virtual public gr_sync_block
+    class BLOCKS_API @NAME@ : virtual public sync_block
     {
     public:
       
diff --git a/gr-blocks/include/blocks/pack_k_bits_bb.h b/gr-blocks/include/gnuradio/blocks/pack_k_bits_bb.h
index 41ae4bc418..584ea6361e 100644
--- a/gr-blocks/include/blocks/pack_k_bits_bb.h
+++ b/gr-blocks/include/gnuradio/blocks/pack_k_bits_bb.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_GR_PACK_K_BITS_BB_H
 #define	INCLUDED_GR_PACK_K_BITS_BB_H
 
-#include <blocks/api.h>
-#include <gr_sync_decimator.h>
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_decimator.h>
 
 namespace gr {
   namespace blocks {
@@ -34,10 +34,10 @@ namespace gr {
      * byte with k relevent bits.
      * \ingroup byte_operators_blk
      */
-    class BLOCKS_API pack_k_bits_bb : virtual public gr_sync_decimator
+    class BLOCKS_API pack_k_bits_bb : virtual public sync_decimator
     {
     public:
-      // gr::blocks::pack_k_bits_bb::sptr
+      // gr::gnuradio/blocks::pack_k_bits_bb::sptr
       typedef boost::shared_ptr<pack_k_bits_bb> sptr;
       
       /*!
diff --git a/gr-blocks/include/blocks/packed_to_unpacked_XX.h.t b/gr-blocks/include/gnuradio/blocks/packed_to_unpacked_XX.h.t
index d8edba2297..98b7df2658 100644
--- a/gr-blocks/include/blocks/packed_to_unpacked_XX.h.t
+++ b/gr-blocks/include/gnuradio/blocks/packed_to_unpacked_XX.h.t
@@ -25,9 +25,9 @@
 #ifndef @GUARD_NAME@
 #define @GUARD_NAME@
 
-#include <blocks/api.h>
-#include <gr_block.h>
-#include <gr_endianness.h>
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/block.h>
+#include <gnuradio/endianness.h>
 
 namespace gr {
   namespace blocks {
@@ -58,14 +58,14 @@ namespace gr {
      * \sa gr::blocks::chunks_to_symbols_bf, gr::blocks::chunks_to_symbols_bc.
      * \sa gr::blocks::chunks_to_symbols_sf, gr::blocks::chunks_to_symbols_sc.
      */
-    class BLOCKS_API @NAME@ : virtual public gr_block
+    class BLOCKS_API @NAME@ : virtual public block
     {
     public:
       // gr::blocks::@NAME@::sptr
       typedef boost::shared_ptr<@NAME@> sptr;
 
       static sptr make(unsigned int bits_per_chunk,
-                       gr_endianness_t endianness);
+                       endianness_t endianness);
     };
 
   } /* namespace blocks */
diff --git a/gr-blocks/include/blocks/patterned_interleaver.h b/gr-blocks/include/gnuradio/blocks/patterned_interleaver.h
index 01e9a0d58f..ad3d1e9c8e 100644
--- a/gr-blocks/include/blocks/patterned_interleaver.h
+++ b/gr-blocks/include/gnuradio/blocks/patterned_interleaver.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_BLOCKS_PATTERNED_INTERLEAVER_H
 #define INCLUDED_BLOCKS_PATTERNED_INTERLEAVER_H
 
-#include <blocks/api.h>
-#include <gr_block.h>
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/block.h>
 
 namespace gr {
   namespace blocks {
@@ -33,7 +33,7 @@ namespace gr {
      * \brief Interleave items based on the provided vector \p pattern.
      * \ingroup stream_operators_blk
      */
-    class BLOCKS_API patterned_interleaver : virtual public gr_block
+    class BLOCKS_API patterned_interleaver : virtual public block
     {
     public:
       typedef boost::shared_ptr<patterned_interleaver> sptr;
diff --git a/gr-blocks/include/blocks/pdu.h b/gr-blocks/include/gnuradio/blocks/pdu.h
index 8890c5cb17..decc5e17d0 100644
--- a/gr-blocks/include/blocks/pdu.h
+++ b/gr-blocks/include/gnuradio/blocks/pdu.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_BLOCKS_PDU_H
 #define INCLUDED_BLOCKS_PDU_H
 
-#include <blocks/api.h>
-#include <gr_complex.h>
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/gr_complex.h>
 #include <pmt/pmt.h>
 
 #define PDU_PORT_ID    pmt::mp("pdus")
diff --git a/gr-blocks/include/blocks/pdu_to_tagged_stream.h b/gr-blocks/include/gnuradio/blocks/pdu_to_tagged_stream.h
index 6a26673149..758d7412db 100644
--- a/gr-blocks/include/blocks/pdu_to_tagged_stream.h
+++ b/gr-blocks/include/gnuradio/blocks/pdu_to_tagged_stream.h
@@ -23,9 +23,9 @@
 #ifndef INCLUDED_BLOCKS_PDU_TO_TAGGED_STREAM_H
 #define INCLUDED_BLOCKS_PDU_TO_TAGGED_STREAM_H
 
-#include <blocks/api.h>
-#include <blocks/pdu.h>
-#include <gr_sync_block.h>
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/blocks/pdu.h>
+#include <gnuradio/sync_block.h>
 
 namespace gr {
   namespace blocks {
@@ -34,10 +34,10 @@ namespace gr {
      * \brief Turns received PDUs into a tagged stream of items
      * \ingroup message_tools_blk
      */
-    class BLOCKS_API pdu_to_tagged_stream : virtual public gr_sync_block
+    class BLOCKS_API pdu_to_tagged_stream : virtual public sync_block
     {
     public:
-      // gr::blocks::pdu_to_tagged_stream::sptr
+      // gr::gnuradio/blocks::pdu_to_tagged_stream::sptr
       typedef boost::shared_ptr<pdu_to_tagged_stream> sptr;
 
       /*!
diff --git a/gr-blocks/include/blocks/peak_detector2_fb.h b/gr-blocks/include/gnuradio/blocks/peak_detector2_fb.h
index aa30d46a04..84b8a74a72 100644
--- a/gr-blocks/include/blocks/peak_detector2_fb.h
+++ b/gr-blocks/include/gnuradio/blocks/peak_detector2_fb.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_GR_PEAK_DETECTOR2_FB_H
 #define INCLUDED_GR_PEAK_DETECTOR2_FB_H
 
-#include <blocks/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_block.h>
 
 namespace gr {
   namespace blocks {
@@ -38,10 +38,10 @@ namespace gr {
      * 0's. A separate debug output may be connected, to view the
      * internal EWMA described below.
      */
-    class BLOCKS_API peak_detector2_fb : virtual public gr_sync_block
+    class BLOCKS_API peak_detector2_fb : virtual public sync_block
     {
     public:
-      // gr::blocks::peak_detector2_fb::sptr
+      // gr::gnuradio/blocks::peak_detector2_fb::sptr
       typedef boost::shared_ptr<peak_detector2_fb> sptr;
 
       /*!
diff --git a/gr-blocks/include/blocks/peak_detector_XX.h.t b/gr-blocks/include/gnuradio/blocks/peak_detector_XX.h.t
index 8d42f42ea8..6bf14320a0 100644
--- a/gr-blocks/include/blocks/peak_detector_XX.h.t
+++ b/gr-blocks/include/gnuradio/blocks/peak_detector_XX.h.t
@@ -25,8 +25,8 @@
 #ifndef @GUARD_NAME@
 #define @GUARD_NAME@
 
-#include <blocks/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_block.h>
 
 namespace gr {
   namespace blocks {
@@ -39,7 +39,7 @@ namespace gr {
      * If a peak is detected, this block outputs a 1,
      * or it outputs 0's.
      */
-    class BLOCKS_API @NAME@ : virtual public gr_sync_block
+    class BLOCKS_API @NAME@ : virtual public sync_block
     {
     public:
       // gr::blocks::@NAME@::sptr
diff --git a/gr-blocks/include/blocks/plateau_detector_fb.h b/gr-blocks/include/gnuradio/blocks/plateau_detector_fb.h
index 119262d396..3f5ea189e9 100644
--- a/gr-blocks/include/blocks/plateau_detector_fb.h
+++ b/gr-blocks/include/gnuradio/blocks/plateau_detector_fb.h
@@ -24,8 +24,8 @@
 #ifndef INCLUDED_BLOCKS_PLATEAU_DETECTOR_FB_H
 #define INCLUDED_BLOCKS_PLATEAU_DETECTOR_FB_H
 
-#include <blocks/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_block.h>
 
 namespace gr {
   namespace blocks {
@@ -51,7 +51,7 @@ namespace gr {
      * An implicit hysteresis is provided by the fact that after detecting one plateau,
      * it waits at least max_len samples before the next plateau can be detected.
      */
-    class BLOCKS_API plateau_detector_fb : virtual public gr_sync_block
+    class BLOCKS_API plateau_detector_fb : virtual public sync_block
     {
     public:
        typedef boost::shared_ptr<plateau_detector_fb> sptr;
diff --git a/gr-blocks/include/blocks/probe_rate.h b/gr-blocks/include/gnuradio/blocks/probe_rate.h
index fc0b9f29d4..7789de1925 100644
--- a/gr-blocks/include/blocks/probe_rate.h
+++ b/gr-blocks/include/gnuradio/blocks/probe_rate.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_BLOCKS_PROBE_RATE_H
 #define INCLUDED_BLOCKS_PROBE_RATE_H
 
-#include <blocks/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_block.h>
 
 namespace gr {
   namespace blocks {
@@ -33,10 +33,10 @@ namespace gr {
      * \brief throughput measurement
      * \ingroup measurement_tools_blk
      */
-    class BLOCKS_API probe_rate : virtual public gr_sync_block
+    class BLOCKS_API probe_rate : virtual public sync_block
     {
     public:
-      // gr::blocks::probe_rate::sptr
+      // gr::gnuradio/blocks::probe_rate::sptr
       typedef boost::shared_ptr<probe_rate> sptr;
 
       /*!
diff --git a/gr-blocks/include/blocks/probe_signal_X.h.t b/gr-blocks/include/gnuradio/blocks/probe_signal_X.h.t
index fb0d84bb41..5398411a73 100644
--- a/gr-blocks/include/blocks/probe_signal_X.h.t
+++ b/gr-blocks/include/gnuradio/blocks/probe_signal_X.h.t
@@ -25,8 +25,8 @@
 #ifndef @GUARD_NAME@
 #define @GUARD_NAME@
 
-#include <blocks/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_block.h>
 
 namespace gr {
   namespace blocks {
@@ -35,7 +35,7 @@ namespace gr {
      * \brief Sink that allows a sample to be grabbed from Python.
      * \ingroup measurement_tools_blk
      */
-    class BLOCKS_API @NAME@ : virtual public gr_sync_block
+    class BLOCKS_API @NAME@ : virtual public sync_block
     {
     public:
       // gr::blocks::@NAME@::sptr
diff --git a/gr-blocks/include/blocks/probe_signal_vX.h.t b/gr-blocks/include/gnuradio/blocks/probe_signal_vX.h.t
index 77462dc658..05e0137953 100644
--- a/gr-blocks/include/blocks/probe_signal_vX.h.t
+++ b/gr-blocks/include/gnuradio/blocks/probe_signal_vX.h.t
@@ -26,8 +26,8 @@
 #define @GUARD_NAME@
 
 #include <vector>
-#include <blocks/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_block.h>
 
 namespace gr {
   namespace blocks {
@@ -37,7 +37,7 @@ namespace gr {
      * \ingroup sink_blk
      * \ingroup measurement_tools_blk
      */
-    class BLOCKS_API @NAME@ : virtual public gr_sync_block
+    class BLOCKS_API @NAME@ : virtual public sync_block
     {
     public:
       // gr::blocks::@NAME@::sptr
diff --git a/gr-blocks/include/blocks/random_pdu.h b/gr-blocks/include/gnuradio/blocks/random_pdu.h
index 6cc7afaae3..6ffdd86a9e 100644
--- a/gr-blocks/include/blocks/random_pdu.h
+++ b/gr-blocks/include/gnuradio/blocks/random_pdu.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_BLOCKS_RANDOM_PDU_H
 #define INCLUDED_BLOCKS_RANDOM_PDU_H
 
-#include <blocks/api.h>
-#include <gr_block.h>
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/block.h>
 
 namespace gr {
   namespace blocks {
@@ -34,10 +34,10 @@ namespace gr {
      * \ingroup message_tools_blk
      * \ingroup debug_tools_blk
      */
-    class BLOCKS_API random_pdu : virtual public gr_block
+    class BLOCKS_API random_pdu : virtual public block
     {
     public:
-      // gr::blocks::random_pdu::sptr
+      // gr::gnuradio/blocks::random_pdu::sptr
       typedef boost::shared_ptr<random_pdu> sptr;
 
       /*!
diff --git a/gr-blocks/include/blocks/regenerate_bb.h b/gr-blocks/include/gnuradio/blocks/regenerate_bb.h
index a2cc76737e..0ff8b4c9d1 100644
--- a/gr-blocks/include/blocks/regenerate_bb.h
+++ b/gr-blocks/include/gnuradio/blocks/regenerate_bb.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_GR_REGENERATE_BB_H
 #define INCLUDED_GR_REGENERATE_BB_H
 
-#include <blocks/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_block.h>
 
 namespace gr {
   namespace blocks {
@@ -41,10 +41,10 @@ namespace gr {
      * Note that if max_regen=(-1)/ULONG_MAX then the regeneration
      * will run forever.
      */
-    class BLOCKS_API regenerate_bb : virtual public gr_sync_block
+    class BLOCKS_API regenerate_bb : virtual public sync_block
     {
     public:
-      // gr::blocks::regenerate_bb::sptr
+      // gr::gnuradio/blocks::regenerate_bb::sptr
       typedef boost::shared_ptr<regenerate_bb> sptr;
 
       /*!
diff --git a/gr-blocks/include/blocks/repack_bits_bb.h b/gr-blocks/include/gnuradio/blocks/repack_bits_bb.h
index f33d4bdf8e..c594966e6e 100644
--- a/gr-blocks/include/blocks/repack_bits_bb.h
+++ b/gr-blocks/include/gnuradio/blocks/repack_bits_bb.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_BLOCKS_REPACK_BITS_BB_H
 #define INCLUDED_BLOCKS_REPACK_BITS_BB_H
 
-#include <blocks/api.h>
-#include <gr_tagged_stream_block.h>
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/tagged_stream_block.h>
 
 namespace gr {
   namespace blocks {
@@ -44,7 +44,7 @@ namespace gr {
      * bits is not an integer multiple of \p l, or bits are truncated from the input
      * if \p align_output is set to true.
      */
-    class BLOCKS_API repack_bits_bb : virtual public gr_tagged_stream_block
+    class BLOCKS_API repack_bits_bb : virtual public tagged_stream_block
     {
      public:
       typedef boost::shared_ptr<repack_bits_bb> sptr;
diff --git a/gr-blocks/include/blocks/repeat.h b/gr-blocks/include/gnuradio/blocks/repeat.h
index b353205541..50a3daf38f 100644
--- a/gr-blocks/include/blocks/repeat.h
+++ b/gr-blocks/include/gnuradio/blocks/repeat.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_BLOCKS_REPEAT_H
 #define INCLUDED_BLOCKS_REPEAT_H
 
-#include <blocks/api.h>
-#include <gr_sync_interpolator.h>
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_interpolator.h>
 
 namespace gr {
   namespace blocks {
@@ -33,10 +33,10 @@ namespace gr {
      * \brief repeat each input \p repeat times 
      * \ingroup stream_operators_blk
      */
-    class BLOCKS_API repeat : virtual public gr_sync_interpolator
+    class BLOCKS_API repeat : virtual public sync_interpolator
     {
     public:
-      // gr::blocks::repeat::sptr
+      // gr::gnuradio/blocks::repeat::sptr
       typedef boost::shared_ptr<repeat> sptr;
 
       /*!
diff --git a/gr-blocks/include/blocks/rms_cf.h b/gr-blocks/include/gnuradio/blocks/rms_cf.h
index 94a17f7a67..f10a19521a 100644
--- a/gr-blocks/include/blocks/rms_cf.h
+++ b/gr-blocks/include/gnuradio/blocks/rms_cf.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_BLOCKS_RMS_CF_H
 #define INCLUDED_BLOCKS_RMS_CF_H
 
-#include <blocks/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_block.h>
 
 namespace gr {
   namespace blocks {
@@ -33,10 +33,10 @@ namespace gr {
      * \brief RMS average power
      * \ingroup math_operators_blk
      */
-    class BLOCKS_API rms_cf : virtual public gr_sync_block
+    class BLOCKS_API rms_cf : virtual public sync_block
     {
     public:
-      // gr::blocks::rms_cf::sptr
+      // gr::gnuradio/blocks::rms_cf::sptr
       typedef boost::shared_ptr<rms_cf> sptr;
 
       /*!
diff --git a/gr-blocks/include/blocks/rms_ff.h b/gr-blocks/include/gnuradio/blocks/rms_ff.h
index e202d79f2c..60b0c50f9d 100644
--- a/gr-blocks/include/blocks/rms_ff.h
+++ b/gr-blocks/include/gnuradio/blocks/rms_ff.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_BLOCKS_RMS_FF_H
 #define INCLUDED_BLOCKS_RMS_FF_H
 
-#include <blocks/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_block.h>
 
 namespace gr {
   namespace blocks {
@@ -33,10 +33,10 @@ namespace gr {
      * \brief RMS average power
      * \ingroup math_operators_blk
      */
-    class BLOCKS_API rms_ff : virtual public gr_sync_block
+    class BLOCKS_API rms_ff : virtual public sync_block
     {
     public:
-      // gr::blocks::rms_ff::sptr
+      // gr::gnuradio/blocks::rms_ff::sptr
       typedef boost::shared_ptr<rms_ff> sptr;
 
       /*!
diff --git a/gr-blocks/include/blocks/rotator.h b/gr-blocks/include/gnuradio/blocks/rotator.h
index 918e86edd2..975bfc62aa 100644
--- a/gr-blocks/include/blocks/rotator.h
+++ b/gr-blocks/include/gnuradio/blocks/rotator.h
@@ -23,8 +23,8 @@
 #ifndef _GR_ROTATOR_H_
 #define _GR_ROTATOR_H_
 
-#include <blocks/api.h>
-#include <gr_complex.h>
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/gr_complex.h>
 
 namespace gr {
   namespace blocks {
diff --git a/gr-blocks/include/blocks/sample_and_hold_XX.h.t b/gr-blocks/include/gnuradio/blocks/sample_and_hold_XX.h.t
index 0d2ecdc5d7..2f15b2490f 100644
--- a/gr-blocks/include/blocks/sample_and_hold_XX.h.t
+++ b/gr-blocks/include/gnuradio/blocks/sample_and_hold_XX.h.t
@@ -25,8 +25,8 @@
 #ifndef @GUARD_NAME@
 #define @GUARD_NAME@
 
-#include <blocks/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_block.h>
 
 namespace gr {
   namespace blocks {
@@ -39,7 +39,7 @@ namespace gr {
      * Samples the data stream (input stream 0) and holds the value if
      * the control signal is 1 (intput stream 1).
      */
-    class BLOCKS_API @NAME@ : virtual public gr_sync_block
+    class BLOCKS_API @NAME@ : virtual public sync_block
     {
     public:
       // gr::blocks::@NAME@::sptr
diff --git a/gr-blocks/include/blocks/short_to_char.h b/gr-blocks/include/gnuradio/blocks/short_to_char.h
index 09e784f101..f6073ea46f 100644
--- a/gr-blocks/include/blocks/short_to_char.h
+++ b/gr-blocks/include/gnuradio/blocks/short_to_char.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_BLOCKS_SHORT_TO_CHAR_H
 #define INCLUDED_BLOCKS_SHORT_TO_CHAR_H
 
-#include <blocks/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_block.h>
 
 namespace gr {
   namespace blocks {
@@ -33,10 +33,10 @@ namespace gr {
      * \brief Convert stream of shorts to a stream of chars.
      * \ingroup type_converters_blk
      */
-    class BLOCKS_API short_to_char : virtual public gr_sync_block
+    class BLOCKS_API short_to_char : virtual public sync_block
     {
     public:
-      // gr::blocks::short_to_char_ff::sptr
+      // gr::gnuradio/blocks::short_to_char_ff::sptr
       typedef boost::shared_ptr<short_to_char> sptr;
 
       /*!
diff --git a/gr-blocks/include/blocks/short_to_float.h b/gr-blocks/include/gnuradio/blocks/short_to_float.h
index ec85e892ed..7d5c2caac9 100644
--- a/gr-blocks/include/blocks/short_to_float.h
+++ b/gr-blocks/include/gnuradio/blocks/short_to_float.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_BLOCKS_SHORT_TO_FLOAT_H
 #define INCLUDED_BLOCKS_SHORT_TO_FLOAT_H
 
-#include <blocks/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_block.h>
 
 namespace gr {
   namespace blocks {
@@ -33,10 +33,10 @@ namespace gr {
      * \brief Convert stream of shorts to a stream of floats
      * \ingroup type_converters_blk
      */
-    class BLOCKS_API short_to_float : virtual public gr_sync_block
+    class BLOCKS_API short_to_float : virtual public sync_block
     {
     public:
-      // gr::blocks::short_to_float_ff::sptr
+      // gr::gnuradio/blocks::short_to_float_ff::sptr
       typedef boost::shared_ptr<short_to_float> sptr;
 
       /*!
diff --git a/gr-blocks/include/blocks/skiphead.h b/gr-blocks/include/gnuradio/blocks/skiphead.h
index 27a8afea92..1d3a019d72 100644
--- a/gr-blocks/include/blocks/skiphead.h
+++ b/gr-blocks/include/gnuradio/blocks/skiphead.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_GR_SKIPHEAD_H
 #define INCLUDED_GR_SKIPHEAD_H
 
-#include <blocks/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_block.h>
 #include <stddef.h>      // size_t
 
 namespace gr {
@@ -38,10 +38,10 @@ namespace gr {
      * Useful for building test cases and sources which have metadata
      * or junk at the start
      */
-    class BLOCKS_API skiphead : virtual public gr_block
+    class BLOCKS_API skiphead : virtual public block
     {
     public:
-      // gr::blocks::skiphead::sptr
+      // gr::gnuradio/blocks::skiphead::sptr
       typedef boost::shared_ptr<skiphead> sptr;
 
       static sptr make(size_t itemsize,
diff --git a/gr-blocks/include/blocks/socket_pdu.h b/gr-blocks/include/gnuradio/blocks/socket_pdu.h
index f72d303c75..906d1aba0b 100644
--- a/gr-blocks/include/blocks/socket_pdu.h
+++ b/gr-blocks/include/gnuradio/blocks/socket_pdu.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_BLOCKS_SOCKET_PDU_H
 #define INCLUDED_BLOCKS_SOCKET_PDU_H
 
-#include <blocks/api.h>
-#include <gr_block.h>
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/block.h>
 
 namespace gr {
   namespace blocks {
@@ -33,10 +33,10 @@ namespace gr {
      * \brief Creates socket interface and translates traffic to PDUs
      * \ingroup networking_tools_blk
      */
-    class BLOCKS_API socket_pdu : virtual public gr_block
+    class BLOCKS_API socket_pdu : virtual public block
     {
     public:
-      // gr::blocks::socket_pdu::sptr
+      // gr::gnuradio/blocks::socket_pdu::sptr
       typedef boost::shared_ptr<socket_pdu> sptr;
 
       /*!
diff --git a/gr-blocks/include/blocks/stream_mux.h b/gr-blocks/include/gnuradio/blocks/stream_mux.h
index 0e29aab364..67f5874c3a 100644
--- a/gr-blocks/include/blocks/stream_mux.h
+++ b/gr-blocks/include/gnuradio/blocks/stream_mux.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_BLOCKS_STREAM_MUX_H
 #define INCLUDED_BLOCKS_STREAM_MUX_H
 
-#include <blocks/api.h>
-#include <gr_block.h>
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/block.h>
 #include <vector>
 
 namespace gr {
@@ -42,11 +42,11 @@ namespace gr {
      *
      * [N0, N1, N2, ..., Nm, N0, N1, ...]
      */
-    class BLOCKS_API stream_mux : virtual public gr_block
+    class BLOCKS_API stream_mux : virtual public block
     {
     public:
       
-      // gr::blocks::stream_mux::sptr
+      // gr::gnuradio/blocks::stream_mux::sptr
       typedef boost::shared_ptr<stream_mux> sptr;
 
       /*!
diff --git a/gr-blocks/include/blocks/stream_to_streams.h b/gr-blocks/include/gnuradio/blocks/stream_to_streams.h
index e9b257575f..cef660c3ba 100644
--- a/gr-blocks/include/blocks/stream_to_streams.h
+++ b/gr-blocks/include/gnuradio/blocks/stream_to_streams.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_BLOCKS_STREAM_TO_STREAMS_H
 #define INCLUDED_BLOCKS_STREAM_TO_STREAMS_H
 
-#include <blocks/api.h>
-#include <gr_sync_decimator.h>
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_decimator.h>
 
 namespace gr {
   namespace blocks {
@@ -37,10 +37,10 @@ namespace gr {
      * Converts a stream of N items into N streams of 1 item.
      * Repeat ad infinitum.
      */
-    class BLOCKS_API stream_to_streams : virtual public gr_sync_decimator
+    class BLOCKS_API stream_to_streams : virtual public sync_decimator
     {
     public:
-      // gr::blocks::stream_to_streams::sptr
+      // gr::gnuradio/blocks::stream_to_streams::sptr
       typedef boost::shared_ptr<stream_to_streams> sptr;
 
       /*!
diff --git a/gr-blocks/include/blocks/stream_to_vector.h b/gr-blocks/include/gnuradio/blocks/stream_to_vector.h
index 98325500b1..d059693945 100644
--- a/gr-blocks/include/blocks/stream_to_vector.h
+++ b/gr-blocks/include/gnuradio/blocks/stream_to_vector.h
@@ -23,20 +23,20 @@
 #ifndef INCLUDED_BLOCKS_STREAM_TO_VECTOR_H
 #define INCLUDED_BLOCKS_STREAM_TO_VECTOR_H
 
-#include <blocks/api.h>
-#include <gr_sync_decimator.h>
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_decimator.h>
 
 namespace gr {
   namespace blocks {
 
     /*!
-     * \brief convert a stream of items into a stream of blocks containing nitems_per_block
+     * \brief convert a stream of items into a stream of gnuradio/blocks containing nitems_per_block
      * \ingroup stream_operators_blk
      */
-    class BLOCKS_API stream_to_vector : virtual public gr_sync_decimator
+    class BLOCKS_API stream_to_vector : virtual public sync_decimator
     {
     public:
-      // gr::blocks::stream_to_vector::sptr
+      // gr::gnuradio/blocks::stream_to_vector::sptr
       typedef boost::shared_ptr<stream_to_vector> sptr;
 
       /*!
diff --git a/gr-blocks/include/blocks/streams_to_stream.h b/gr-blocks/include/gnuradio/blocks/streams_to_stream.h
index e677a18e2a..ba6d04a38e 100644
--- a/gr-blocks/include/blocks/streams_to_stream.h
+++ b/gr-blocks/include/gnuradio/blocks/streams_to_stream.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_BLOCKS_STREAMS_TO_STREAM_H
 #define INCLUDED_BLOCKS_STREAMS_TO_STREAM_H
 
-#include <blocks/api.h>
-#include <gr_sync_interpolator.h>
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_interpolator.h>
 
 namespace gr {
   namespace blocks {
@@ -37,10 +37,10 @@ namespace gr {
      * Convert N streams of 1 item into 1 stream of N items.
      * Repeat ad infinitum.
      */
-    class BLOCKS_API streams_to_stream : virtual public gr_sync_interpolator
+    class BLOCKS_API streams_to_stream : virtual public sync_interpolator
     {
     public:
-      // gr::blocks::streams_to_stream::sptr
+      // gr::gnuradio/blocks::streams_to_stream::sptr
       typedef boost::shared_ptr<streams_to_stream> sptr;
 
       /*!
diff --git a/gr-blocks/include/blocks/streams_to_vector.h b/gr-blocks/include/gnuradio/blocks/streams_to_vector.h
index f4df16c9f4..5954bdf07f 100644
--- a/gr-blocks/include/blocks/streams_to_vector.h
+++ b/gr-blocks/include/gnuradio/blocks/streams_to_vector.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_BLOCKS_STREAMS_TO_VECTOR_H
 #define INCLUDED_BLOCKS_STREAMS_TO_VECTOR_H
 
-#include <blocks/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_block.h>
 
 namespace gr {
   namespace blocks {
@@ -33,10 +33,10 @@ namespace gr {
      * \brief convert N streams of items to 1 stream of vector length N
      * \ingroup stream_operators_blk
      */
-    class BLOCKS_API streams_to_vector : virtual public gr_sync_block
+    class BLOCKS_API streams_to_vector : virtual public sync_block
     {
     public:
-      // gr::blocks::streams_to_vector::sptr
+      // gr::gnuradio/blocks::streams_to_vector::sptr
       typedef boost::shared_ptr<streams_to_vector> sptr;
 
       /*!
diff --git a/gr-blocks/include/blocks/stretch_ff.h b/gr-blocks/include/gnuradio/blocks/stretch_ff.h
index 47bcb9ee87..86f366935e 100644
--- a/gr-blocks/include/blocks/stretch_ff.h
+++ b/gr-blocks/include/gnuradio/blocks/stretch_ff.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_GR_STRETCH_FF_H
 #define INCLUDED_GR_STRETCH_FF_H
 
-#include <blocks/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_block.h>
 
 namespace gr {
   namespace blocks {
@@ -35,10 +35,10 @@ namespace gr {
      * signature matching by normalizing spectrum dynamic ranges.
      * \ingroup stream_operators_blk
      */
-    class BLOCKS_API stretch_ff : virtual public gr_sync_block
+    class BLOCKS_API stretch_ff : virtual public sync_block
     {
     public:
-      // gr::blocks::stretch_ff::sptr
+      // gr::gnuradio/blocks::stretch_ff::sptr
       typedef boost::shared_ptr<stretch_ff> sptr;
       
       /*!
diff --git a/gr-blocks/include/blocks/sub_XX.h.t b/gr-blocks/include/gnuradio/blocks/sub_XX.h.t
index db854346f6..ecc55fc865 100644
--- a/gr-blocks/include/blocks/sub_XX.h.t
+++ b/gr-blocks/include/gnuradio/blocks/sub_XX.h.t
@@ -25,8 +25,8 @@
 #ifndef @GUARD_NAME@
 #define @GUARD_NAME@
 
-#include <blocks/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_block.h>
 
 namespace gr {
   namespace blocks {
@@ -38,7 +38,7 @@ namespace gr {
      * \details
      * Subtract across all input streams.
      */
-    class BLOCKS_API @NAME@ : virtual public gr_sync_block
+    class BLOCKS_API @NAME@ : virtual public sync_block
     {
     public:
       
diff --git a/gr-blocks/include/blocks/tag_debug.h b/gr-blocks/include/gnuradio/blocks/tag_debug.h
index 8093a6152f..88dfb1b726 100644
--- a/gr-blocks/include/blocks/tag_debug.h
+++ b/gr-blocks/include/gnuradio/blocks/tag_debug.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_GR_TAG_DEBUG_H
 #define INCLUDED_GR_TAG_DEBUG_H
 
-#include <blocks/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_block.h>
 
 namespace gr {
   namespace blocks {
@@ -50,10 +50,10 @@ namespace gr {
      * The tags from the last call to this work function are stored
      * and can be retrieved using the function 'current_tags'.
      */
-    class BLOCKS_API tag_debug : virtual public gr_sync_block
+    class BLOCKS_API tag_debug : virtual public sync_block
     {
     public:
-      // gr::blocks::tag_debug::sptr
+      // gr::gnuradio/blocks::tag_debug::sptr
       typedef boost::shared_ptr<tag_debug> sptr;
 
       /*!
@@ -66,10 +66,10 @@ namespace gr {
                        const std::string &name);
 
       /*!
-       * \brief Returns a vector of gr_tag_t items as of the last call to
+       * \brief Returns a vector of tag_t items as of the last call to
        * work.
        */
-      virtual std::vector<gr_tag_t> current_tags() = 0;
+      virtual std::vector<tag_t> current_tags() = 0;
 
       /*!
        * \brief Set the display of tags to stdout on/off.
diff --git a/gr-blocks/include/gnuradio/blocks/tag_gate.h b/gr-blocks/include/gnuradio/blocks/tag_gate.h
new file mode 100644
index 0000000000..5363301192
--- /dev/null
+++ b/gr-blocks/include/gnuradio/blocks/tag_gate.h
@@ -0,0 +1,56 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING.  If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_BLOCKS_TAG_GATE_H
+#define INCLUDED_BLOCKS_TAG_GATE_H
+
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_block.h>
+
+namespace gr {
+  namespace blocks {
+
+    /*!
+     * \brief Control tag propagation.
+     * \ingroup blocks
+     *
+     * Use this block to stop tags from propagating.
+     */
+    class BLOCKS_API tag_gate : virtual public gr::sync_block
+    {
+     public:
+      typedef boost::shared_ptr<tag_gate> sptr;
+
+      virtual void set_propagation(bool propagate_tags) = 0;
+
+      /*!
+       * \param item_size Item size
+       * \param propagate_tags Set this to true to allow tags to pass through this block.
+       */
+      static sptr make(size_t item_size, bool propagate_tags=false);
+    };
+
+  } // namespace blocks
+} // namespace gr
+
+#endif /* INCLUDED_BLOCKS_TAG_GATE_H */
+
diff --git a/gr-blocks/include/blocks/tagged_file_sink.h b/gr-blocks/include/gnuradio/blocks/tagged_file_sink.h
index 2014b66964..287ecb8246 100644
--- a/gr-blocks/include/blocks/tagged_file_sink.h
+++ b/gr-blocks/include/gnuradio/blocks/tagged_file_sink.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_GR_TAGGED_FILE_SINK_H
 #define INCLUDED_GR_TAGGED_FILE_SINK_H
 
-#include <blocks/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_block.h>
 
 namespace gr {
   namespace blocks {
@@ -45,10 +45,10 @@ namespace gr {
      * found, the new time is calculated based off the sample rate of
      * the block.
      */
-    class BLOCKS_API tagged_file_sink : virtual public gr_sync_block
+    class BLOCKS_API tagged_file_sink : virtual public sync_block
     {
     public:
-      // gr::blocks::tagged_file_sink::sptr
+      // gr::gnuradio/blocks::tagged_file_sink::sptr
       typedef boost::shared_ptr<tagged_file_sink> sptr;
       
       /*!
diff --git a/gr-blocks/include/blocks/tagged_stream_mux.h b/gr-blocks/include/gnuradio/blocks/tagged_stream_mux.h
index 2fa9b3f01d..73a02f9e1d 100644
--- a/gr-blocks/include/blocks/tagged_stream_mux.h
+++ b/gr-blocks/include/gnuradio/blocks/tagged_stream_mux.h
@@ -22,8 +22,8 @@
 #ifndef INCLUDED_TAGGED_STREAM_MUX_H
 #define INCLUDED_TAGGED_STREAM_MUX_H
 
-#include <blocks/api.h>
-#include <gr_tagged_stream_block.h>
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/tagged_stream_block.h>
 
 namespace gr {
   namespace blocks {
@@ -42,7 +42,7 @@ namespace gr {
      * All other tags are propagated as expected, i.e. they stay associated
      * with the same input item.
      */
-    class BLOCKS_API tagged_stream_mux : virtual public gr_tagged_stream_block
+    class BLOCKS_API tagged_stream_mux : virtual public tagged_stream_block
     {
      public:
       typedef boost::shared_ptr<tagged_stream_mux> sptr;
diff --git a/gr-blocks/include/blocks/tagged_stream_to_pdu.h b/gr-blocks/include/gnuradio/blocks/tagged_stream_to_pdu.h
index b990c44ab1..9b0f24a535 100644
--- a/gr-blocks/include/blocks/tagged_stream_to_pdu.h
+++ b/gr-blocks/include/gnuradio/blocks/tagged_stream_to_pdu.h
@@ -23,9 +23,9 @@
 #ifndef INCLUDED_BLOCKS_TAGGED_STREAM_TO_PDU_H
 #define INCLUDED_BLOCKS_TAGGED_STREAM_TO_PDU_H
 
-#include <blocks/api.h>
-#include <blocks/pdu.h>
-#include <gr_sync_block.h>
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/blocks/pdu.h>
+#include <gnuradio/sync_block.h>
 
 namespace gr {
   namespace blocks {
@@ -34,10 +34,10 @@ namespace gr {
      * \brief Turns received stream data and tags into PDUs
      * \ingroup message_tools_blk
      */
-    class BLOCKS_API tagged_stream_to_pdu : virtual public gr_sync_block
+    class BLOCKS_API tagged_stream_to_pdu : virtual public sync_block
     {
     public:
-      // gr::blocks::tagged_stream_to_pdu::sptr
+      // gr::gnuradio/blocks::tagged_stream_to_pdu::sptr
       typedef boost::shared_ptr<tagged_stream_to_pdu> sptr;
 
       /*!
diff --git a/gr-blocks/include/blocks/threshold_ff.h b/gr-blocks/include/gnuradio/blocks/threshold_ff.h
index 6a20e7ed43..253041b83a 100644
--- a/gr-blocks/include/blocks/threshold_ff.h
+++ b/gr-blocks/include/gnuradio/blocks/threshold_ff.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_GR_THRESHOLD_FF_H
 #define INCLUDED_GR_THRESHOLD_FF_H
 
-#include <blocks/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_block.h>
 
 namespace gr {
   namespace blocks {
@@ -38,10 +38,10 @@ namespace gr {
      * excedes the \p hi value, it will output a 1 until the signal
      * falls below the \p lo value.
      */
-    class BLOCKS_API threshold_ff : virtual public gr_sync_block
+    class BLOCKS_API threshold_ff : virtual public sync_block
     {
     public:
-      // gr::blocks::threshold_ff::sptr
+      // gr::gnuradio/blocks::threshold_ff::sptr
       typedef boost::shared_ptr<threshold_ff> sptr;
 
       /* \brief Create a threadshold block.
diff --git a/gr-blocks/include/blocks/throttle.h b/gr-blocks/include/gnuradio/blocks/throttle.h
index d9d9f311c4..662582e0ba 100644
--- a/gr-blocks/include/blocks/throttle.h
+++ b/gr-blocks/include/gnuradio/blocks/throttle.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_GR_THROTTLE_H
 #define INCLUDED_GR_THROTTLE_H
 
-#include <blocks/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_block.h>
 
 namespace gr {
   namespace blocks {
@@ -43,7 +43,7 @@ namespace gr {
      * controlled by a source or sink tied to sample clock. E.g., a
      * USRP or audio card.
      */
-    class BLOCKS_API throttle : virtual public gr_sync_block
+    class BLOCKS_API throttle : virtual public sync_block
     {
     public:
       typedef boost::shared_ptr<throttle> sptr;
diff --git a/gr-blocks/include/blocks/transcendental.h b/gr-blocks/include/gnuradio/blocks/transcendental.h
index a3a483e8f3..9d7a1e70e2 100644
--- a/gr-blocks/include/blocks/transcendental.h
+++ b/gr-blocks/include/gnuradio/blocks/transcendental.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_GR_TRANSCENDENTAL_H
 #define INCLUDED_GR_TRANSCENDENTAL_H
 
-#include <blocks/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_block.h>
 #include <string>
 
 namespace gr {
@@ -42,10 +42,10 @@ namespace gr {
      *
      * output[i] = trans_fcn(input[i])
      */
-    class BLOCKS_API transcendental : virtual public gr_sync_block
+    class BLOCKS_API transcendental : virtual public sync_block
     {
     public:
-      // gr::blocks::transcendental::sptr
+      // gr::gnuradio/blocks::transcendental::sptr
       typedef boost::shared_ptr<transcendental> sptr;
 
       static sptr make(const std::string &name,
diff --git a/gr-blocks/include/blocks/tuntap_pdu.h b/gr-blocks/include/gnuradio/blocks/tuntap_pdu.h
index afa03cfb82..53d9371bc4 100644
--- a/gr-blocks/include/blocks/tuntap_pdu.h
+++ b/gr-blocks/include/gnuradio/blocks/tuntap_pdu.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_BLOCKS_TUNTAP_PDU_H
 #define INCLUDED_BLOCKS_TUNTAP_PDU_H
 
-#include <blocks/api.h>
-#include <gr_block.h>
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/block.h>
 
 namespace gr {
   namespace blocks {
@@ -33,10 +33,10 @@ namespace gr {
      * \brief Creates TUNTAP interface and translates traffic to PDUs
      * \ingroup networking_tools_blk
      */
-    class BLOCKS_API tuntap_pdu : virtual public gr_block
+    class BLOCKS_API tuntap_pdu : virtual public block
     {
     public:
-      // gr::blocks::tuntap_pdu::sptr
+      // gr::gnuradio/blocks::tuntap_pdu::sptr
       typedef boost::shared_ptr<tuntap_pdu> sptr;
 
       /*!
diff --git a/gr-blocks/include/blocks/uchar_to_float.h b/gr-blocks/include/gnuradio/blocks/uchar_to_float.h
index 725c4e5021..a978a76958 100644
--- a/gr-blocks/include/blocks/uchar_to_float.h
+++ b/gr-blocks/include/gnuradio/blocks/uchar_to_float.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_BLOCKS_UCHAR_TO_FLOAT_H
 #define INCLUDED_BLOCKS_UCHAR_TO_FLOAT_H
 
-#include <blocks/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_block.h>
 
 namespace gr {
   namespace blocks {
@@ -33,10 +33,10 @@ namespace gr {
      * \brief Convert stream of unsigned chars to a stream of floats
      * \ingroup type_converters_blk
      */
-    class BLOCKS_API uchar_to_float : virtual public gr_sync_block
+    class BLOCKS_API uchar_to_float : virtual public sync_block
     {
     public:
-      // gr::blocks::uchar_to_float_ff::sptr
+      // gr::gnuradio/blocks::uchar_to_float_ff::sptr
       typedef boost::shared_ptr<uchar_to_float> sptr;
 
       /*!
diff --git a/gr-blocks/include/blocks/udp_sink.h b/gr-blocks/include/gnuradio/blocks/udp_sink.h
index 9530217515..d9360938e2 100644
--- a/gr-blocks/include/blocks/udp_sink.h
+++ b/gr-blocks/include/gnuradio/blocks/udp_sink.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_GR_UDP_SINK_H
 #define INCLUDED_GR_UDP_SINK_H
 
-#include <blocks/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_block.h>
 
 namespace gr {
   namespace blocks {
@@ -33,10 +33,10 @@ namespace gr {
      * \brief Write stream to an UDP socket.
      * \ingroup networking_tools_blk
      */
-    class BLOCKS_API udp_sink : virtual public gr_sync_block
+    class BLOCKS_API udp_sink : virtual public sync_block
     {
     public:
-      // gr::blocks::udp_sink::sptr
+      // gr::gnuradio/blocks::udp_sink::sptr
       typedef boost::shared_ptr<udp_sink> sptr;
 
       /*!
diff --git a/gr-blocks/include/blocks/udp_source.h b/gr-blocks/include/gnuradio/blocks/udp_source.h
index 4681b0b54a..e5534bc328 100644
--- a/gr-blocks/include/blocks/udp_source.h
+++ b/gr-blocks/include/gnuradio/blocks/udp_source.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_GR_UDP_SOURCE_H
 #define INCLUDED_GR_UDP_SOURCE_H
 
-#include <blocks/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_block.h>
 
 namespace gr {
   namespace blocks {
@@ -33,10 +33,10 @@ namespace gr {
      * \brief Read stream from an UDP socket.
      * \ingroup networking_tools_blk
      */
-    class BLOCKS_API udp_source : virtual public gr_sync_block
+    class BLOCKS_API udp_source : virtual public sync_block
     {
     public:
-      // gr::blocks::udp_source::sptr
+      // gr::gnuradio/blocks::udp_source::sptr
       typedef boost::shared_ptr<udp_source> sptr;
 
       /*!
diff --git a/gr-blocks/include/blocks/unpack_k_bits_bb.h b/gr-blocks/include/gnuradio/blocks/unpack_k_bits_bb.h
index a36cfb50e4..942973f60d 100644
--- a/gr-blocks/include/blocks/unpack_k_bits_bb.h
+++ b/gr-blocks/include/gnuradio/blocks/unpack_k_bits_bb.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_GR_UNPACK_K_BITS_BB_H
 #define	INCLUDED_GR_UNPACK_K_BITS_BB_H
 
-#include <blocks/api.h>
-#include <gr_sync_interpolator.h>
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_interpolator.h>
 
 namespace gr {
   namespace blocks {
@@ -33,10 +33,10 @@ namespace gr {
      * \brief Converts a byte with k relevent bits to k output bytes with 1 bit in the LSB.
      * \ingroup byte_operators_blk
      */
-    class BLOCKS_API unpack_k_bits_bb : virtual public gr_sync_interpolator
+    class BLOCKS_API unpack_k_bits_bb : virtual public sync_interpolator
     {
     public:
-      // gr::blocks::unpack_k_bits_bb::sptr
+      // gr::gnuradio/blocks::unpack_k_bits_bb::sptr
       typedef boost::shared_ptr<unpack_k_bits_bb> sptr;
       
       /*!
diff --git a/gr-blocks/include/blocks/unpacked_to_packed_XX.h.t b/gr-blocks/include/gnuradio/blocks/unpacked_to_packed_XX.h.t
index 649b9082fb..194d79e0d2 100644
--- a/gr-blocks/include/blocks/unpacked_to_packed_XX.h.t
+++ b/gr-blocks/include/gnuradio/blocks/unpacked_to_packed_XX.h.t
@@ -25,9 +25,9 @@
 #ifndef @GUARD_NAME@
 #define @GUARD_NAME@
 
-#include <blocks/api.h>
-#include <gr_block.h>
-#include <gr_endianness.h>
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/block.h>
+#include <gnuradio/endianness.h>
 
 namespace gr {
   namespace blocks {
@@ -57,14 +57,14 @@ namespace gr {
      * \sa gr::blocks::chunks_to_symbols_bf, gr::blocks::chunks_to_symbols_bc.
      * \sa gr::blocks::chunks_to_symbols_sf, gr::blocks::chunks_to_symbols_sc.
      */
-    class BLOCKS_API @NAME@ : virtual public gr_block
+    class BLOCKS_API @NAME@ : virtual public block
     {
     public:
       // gr::blocks::@NAME@::sptr
       typedef boost::shared_ptr<@NAME@> sptr;
 
       static sptr make(unsigned int bits_per_chunk,
-                       gr_endianness_t endianness);
+                       endianness_t endianness);
     };
 
   } /* namespace blocks */
diff --git a/gr-blocks/include/blocks/vco_f.h b/gr-blocks/include/gnuradio/blocks/vco_f.h
index 7245f4c96b..c0fe5cd51c 100644
--- a/gr-blocks/include/blocks/vco_f.h
+++ b/gr-blocks/include/gnuradio/blocks/vco_f.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_GR_VCO_F_H
 #define INCLUDED_GR_VCO_F_H
 
-#include <blocks/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_block.h>
 
 namespace gr {
   namespace blocks {
@@ -37,10 +37,10 @@ namespace gr {
      * \details
      * input: float stream of control voltages; output: float oscillator output
      */
-    class BLOCKS_API vco_f : virtual public gr_sync_block
+    class BLOCKS_API vco_f : virtual public sync_block
     {
     public:
-      // gr::blocks::vco_f::sptr
+      // gr::gnuradio/blocks::vco_f::sptr
       typedef boost::shared_ptr<vco_f> sptr;
 
       /*!
diff --git a/gr-blocks/include/blocks/vector_insert_X.h.t b/gr-blocks/include/gnuradio/blocks/vector_insert_X.h.t
index c45e5152fa..8b26b0b9b0 100644
--- a/gr-blocks/include/blocks/vector_insert_X.h.t
+++ b/gr-blocks/include/gnuradio/blocks/vector_insert_X.h.t
@@ -25,8 +25,8 @@
 #ifndef @GUARD_NAME@
 #define @GUARD_NAME@
 
-#include <blocks/api.h>
-#include <gr_block.h>
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/block.h>
 
 namespace gr {
   namespace blocks {
@@ -35,7 +35,7 @@ namespace gr {
      * \brief source of @TYPE@'s that gets its data from a vector
      * \ingroup stream_operators_blk
      */
-    class BLOCKS_API @NAME@ : virtual public gr_block 
+    class BLOCKS_API @NAME@ : virtual public block 
     {
     public:
       // gr::blocks::@NAME@::sptr
diff --git a/gr-blocks/include/blocks/vector_map.h b/gr-blocks/include/gnuradio/blocks/vector_map.h
index 73437b43fb..d26b0c56f9 100644
--- a/gr-blocks/include/blocks/vector_map.h
+++ b/gr-blocks/include/gnuradio/blocks/vector_map.h
@@ -23,9 +23,9 @@
 #ifndef INCLUDED_GR_VECTOR_MAP_H
 #define INCLUDED_GR_VECTOR_MAP_H
 
-#include <blocks/api.h>
+#include <gnuradio/blocks/api.h>
 #include <vector>
-#include <gr_sync_block.h>
+#include <gnuradio/sync_block.h>
 
 namespace gr {
   namespace blocks {
@@ -45,10 +45,10 @@ namespace gr {
      * form (element1_mapping, element2_mapping, ...)  and
      * element1_mapping is of the form (in_stream, in_element).
      */
-    class BLOCKS_API vector_map : virtual public gr_sync_block
+    class BLOCKS_API vector_map : virtual public sync_block
     {
     public:
-      // gr::blocks::vector_map::sptr
+      // gr::gnuradio/blocks::vector_map::sptr
       typedef boost::shared_ptr<vector_map> sptr;
 
       /*!
diff --git a/gr-blocks/include/blocks/vector_sink_X.h.t b/gr-blocks/include/gnuradio/blocks/vector_sink_X.h.t
index 1d17700f5f..527ebf7dff 100644
--- a/gr-blocks/include/blocks/vector_sink_X.h.t
+++ b/gr-blocks/include/gnuradio/blocks/vector_sink_X.h.t
@@ -25,8 +25,8 @@
 #ifndef @GUARD_NAME@
 #define @GUARD_NAME@
 
-#include <blocks/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_block.h>
 
 namespace gr {
   namespace blocks {
@@ -35,7 +35,7 @@ namespace gr {
      * \brief @TYPE@ sink that writes to a vector
      * \ingroup debug_tools_blk
      */
-    class BLOCKS_API @NAME@ : virtual public gr_sync_block
+    class BLOCKS_API @NAME@ : virtual public sync_block
     {
     public:
       // gr::blocks::@NAME@::sptr
@@ -45,7 +45,7 @@ namespace gr {
 
       virtual void reset() = 0;
       virtual std::vector<@TYPE@> data() const = 0;
-      virtual std::vector<gr_tag_t> tags() const = 0;
+      virtual std::vector<tag_t> tags() const = 0;
     };
 
   } /* namespace blocks */
diff --git a/gr-blocks/include/blocks/vector_source_X.h.t b/gr-blocks/include/gnuradio/blocks/vector_source_X.h.t
index 8d3693f3ee..7ff18ad083 100644
--- a/gr-blocks/include/blocks/vector_source_X.h.t
+++ b/gr-blocks/include/gnuradio/blocks/vector_source_X.h.t
@@ -25,8 +25,8 @@
 #ifndef @GUARD_NAME@
 #define @GUARD_NAME@
 
-#include <blocks/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_block.h>
 
 namespace gr {
   namespace blocks {
@@ -35,7 +35,7 @@ namespace gr {
      * \brief source of @TYPE@'s that gets its data from a vector
      * \ingroup misc_blk
      */
-    class BLOCKS_API @NAME@ : virtual public gr_sync_block
+    class BLOCKS_API @NAME@ : virtual public sync_block
     {
     public:
       // gr::blocks::@NAME@::sptr
@@ -43,11 +43,11 @@ namespace gr {
 
       static sptr make(const std::vector<@TYPE@> &data,
                        bool repeat=false, int vlen=1,
-                       const std::vector<gr_tag_t> &tags=std::vector<gr_tag_t>());
+                       const std::vector<tag_t> &tags=std::vector<tag_t>());
 
       virtual void rewind() = 0;
       virtual void set_data(const std::vector<@TYPE@> &data,
-                            const std::vector<gr_tag_t> &tags=std::vector<gr_tag_t>()) = 0;
+                            const std::vector<tag_t> &tags=std::vector<tag_t>()) = 0;
     };
 
   } /* namespace blocks */
diff --git a/gr-blocks/include/blocks/vector_to_stream.h b/gr-blocks/include/gnuradio/blocks/vector_to_stream.h
index 2a02704287..3b08bd08b5 100644
--- a/gr-blocks/include/blocks/vector_to_stream.h
+++ b/gr-blocks/include/gnuradio/blocks/vector_to_stream.h
@@ -23,20 +23,20 @@
 #ifndef INCLUDED_BLOCKS_VECTOR_TO_STREAM_H
 #define INCLUDED_BLOCKS_VECTOR_TO_STREAM_H
 
-#include <blocks/api.h>
-#include <gr_sync_interpolator.h>
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_interpolator.h>
 
 namespace gr {
   namespace blocks {
 
     /*!
-     * \brief convert a stream of blocks of nitems_per_block items into a stream of items
+     * \brief convert a stream of gnuradio/blocks of nitems_per_block items into a stream of items
      * \ingroup stream_operators_blk
      */
-    class BLOCKS_API vector_to_stream : virtual public gr_sync_interpolator
+    class BLOCKS_API vector_to_stream : virtual public sync_interpolator
     {
     public:
-      // gr::blocks::vector_to_stream::sptr
+      // gr::gnuradio/blocks::vector_to_stream::sptr
       typedef boost::shared_ptr<vector_to_stream> sptr;
 
       /*!
diff --git a/gr-blocks/include/blocks/vector_to_streams.h b/gr-blocks/include/gnuradio/blocks/vector_to_streams.h
index 364bc9afbd..ce10ed3155 100644
--- a/gr-blocks/include/blocks/vector_to_streams.h
+++ b/gr-blocks/include/gnuradio/blocks/vector_to_streams.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_BLOCKS_VECTOR_TO_STREAMS_H
 #define INCLUDED_BLOCKS_VECTOR_TO_STREAMS_H
 
-#include <blocks/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_block.h>
 
 namespace gr {
   namespace blocks {
@@ -33,10 +33,10 @@ namespace gr {
      * \brief Convert 1 stream of vectors of length N to N streams of items
      * \ingroup stream_operators_blk
      */
-    class BLOCKS_API vector_to_streams : virtual public gr_sync_block
+    class BLOCKS_API vector_to_streams : virtual public sync_block
     {
     public:
-      // gr::blocks::vector_to_streams::sptr
+      // gr::gnuradio/blocks::vector_to_streams::sptr
       typedef boost::shared_ptr<vector_to_streams> sptr;
 
       /*!
diff --git a/gr-blocks/include/blocks/wavfile.h b/gr-blocks/include/gnuradio/blocks/wavfile.h
index 719ef92253..f0c8a4c1e7 100644
--- a/gr-blocks/include/blocks/wavfile.h
+++ b/gr-blocks/include/gnuradio/blocks/wavfile.h
@@ -21,9 +21,9 @@
  */
 
 // This file stores all the RIFF file type knowledge for the wavfile_*
-// blocks.
+// gnuradio/blocks.
 
-#include <blocks/api.h>
+#include <gnuradio/blocks/api.h>
 #include <cstdio>
 
 namespace gr {
diff --git a/gr-blocks/include/blocks/wavfile_sink.h b/gr-blocks/include/gnuradio/blocks/wavfile_sink.h
index f380e055a2..97550bfa98 100644
--- a/gr-blocks/include/blocks/wavfile_sink.h
+++ b/gr-blocks/include/gnuradio/blocks/wavfile_sink.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_GR_WAVFILE_SINK_H
 #define INCLUDED_GR_WAVFILE_SINK_H
 
-#include <blocks/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_block.h>
 
 namespace gr {
   namespace blocks {
@@ -37,10 +37,10 @@ namespace gr {
      * Values must be floats within [-1;1].
      * Check gr_make_wavfile_sink() for extra info.
      */
-    class BLOCKS_API wavfile_sink : virtual public gr_sync_block
+    class BLOCKS_API wavfile_sink : virtual public sync_block
     {
     public:
-      // gr::blocks::wavfile_sink::sptr
+      // gr::gnuradio/blocks::wavfile_sink::sptr
       typedef boost::shared_ptr<wavfile_sink> sptr;
 
       /*
diff --git a/gr-blocks/include/blocks/wavfile_source.h b/gr-blocks/include/gnuradio/blocks/wavfile_source.h
index 5332a0c20e..b8fe4988f1 100644
--- a/gr-blocks/include/blocks/wavfile_source.h
+++ b/gr-blocks/include/gnuradio/blocks/wavfile_source.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_GR_WAVFILE_SOURCE_H
 #define INCLUDED_GR_WAVFILE_SOURCE_H
 
-#include <blocks/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_block.h>
 
 namespace gr {
   namespace blocks {
@@ -37,10 +37,10 @@ namespace gr {
      * Unless otherwise called, values are within [-1;1].
      * Check gr_make_wavfile_source() for extra info.
      */
-    class BLOCKS_API wavfile_source : virtual public gr_sync_block
+    class BLOCKS_API wavfile_source : virtual public sync_block
     {
     public:
-      // gr::blocks::wavfile_source::sptr
+      // gr::gnuradio/blocks::wavfile_source::sptr
       typedef boost::shared_ptr<wavfile_source> sptr;
 
       static sptr make(const char *filename, bool repeat = false);
diff --git a/gr-blocks/include/blocks/xor_XX.h.t b/gr-blocks/include/gnuradio/blocks/xor_XX.h.t
index a890dbaf89..fa32192e76 100644
--- a/gr-blocks/include/blocks/xor_XX.h.t
+++ b/gr-blocks/include/gnuradio/blocks/xor_XX.h.t
@@ -25,8 +25,8 @@
 #ifndef @GUARD_NAME@
 #define @GUARD_NAME@
 
-#include <blocks/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/blocks/api.h>
+#include <gnuradio/sync_block.h>
 
 namespace gr {
   namespace blocks {
@@ -37,7 +37,7 @@ namespace gr {
      *
      * Bitwise boolean xor across all input streams.
      */
-    class BLOCKS_API @NAME@ : virtual public gr_sync_block
+    class BLOCKS_API @NAME@ : virtual public sync_block
     {
     public: