6 files changed, 27 insertions, 27 deletions
diff --git a/gr-uhd/lib/amsg_source_impl.cc b/gr-uhd/lib/amsg_source_impl.cc
index cf344db202..deaff232d1 100644
--- a/gr-uhd/lib/amsg_source_impl.cc
+++ b/gr-uhd/lib/amsg_source_impl.cc
@@ -29,7 +29,7 @@ namespace gr {
 
     amsg_source::sptr
     amsg_source::make(const ::uhd::device_addr_t &device_addr,
-                      gr_msg_queue_sptr msgq)
+                      msg_queue::sptr msgq)
     {
       check_abi();
       return amsg_source::sptr
@@ -37,13 +37,13 @@ namespace gr {
     }
 
     ::uhd::async_metadata_t
-    amsg_source::msg_to_async_metadata_t(const gr_message_sptr msg)
+    amsg_source::msg_to_async_metadata_t(const message::sptr msg)
     {
       return *(::uhd::async_metadata_t *)msg->msg();
     }
 
     amsg_source_impl::amsg_source_impl(const ::uhd::device_addr_t &device_addr,
-                                       gr_msg_queue_sptr msgq)
+                                       msg_queue::sptr msgq)
       : _msgq(msgq), _running(true)
     {
       _dev = ::uhd::usrp::multi_usrp::make(device_addr);
@@ -60,11 +60,11 @@ namespace gr {
     void
     amsg_source_impl::recv_loop()
     {
-      gr_message_sptr msg;
+      message::sptr msg;
       ::uhd::async_metadata_t *md;
 
       while(_running) {
-        msg = gr_make_message(0, 0.0, 0.0, sizeof(::uhd::async_metadata_t));
+        msg = message::make(0, 0.0, 0.0, sizeof(::uhd::async_metadata_t));
         md = (::uhd::async_metadata_t*) msg->msg();
 
         while(!_dev->get_device()->recv_async_msg(*md, 0.1)) {
@@ -77,7 +77,7 @@ namespace gr {
     }
 
     void
-    amsg_source_impl::post(gr_message_sptr msg)
+    amsg_source_impl::post(message::sptr msg)
     {
       _msgq->insert_tail(msg);
     }
diff --git a/gr-uhd/lib/amsg_source_impl.h b/gr-uhd/lib/amsg_source_impl.h
index f0f3d4bfb1..5bba3627f7 100644
--- a/gr-uhd/lib/amsg_source_impl.h
+++ b/gr-uhd/lib/amsg_source_impl.h
@@ -20,8 +20,8 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include <uhd/amsg_source.h>
-#include <thread/thread.h>
+#include <gnuradio/uhd/amsg_source.h>
+#include <gnuradio/thread/thread.h>
 
 namespace gr {
   namespace uhd {
@@ -30,16 +30,16 @@ namespace gr {
     {
     public:
       amsg_source_impl(const ::uhd::device_addr_t &device_addr,
-                       gr_msg_queue_sptr msgq);
+                       msg_queue::sptr msgq);
       ~amsg_source_impl();
 
       void recv_loop();
-      void post(gr_message_sptr msg);
+      void post(message::sptr msg);
 
     protected:
       ::uhd::usrp::multi_usrp::sptr _dev;
       gr::thread::thread _amsg_thread;
-      gr_msg_queue_sptr _msgq;
+      msg_queue::sptr _msgq;
       bool _running;
     };
 
diff --git a/gr-uhd/lib/usrp_sink_impl.cc b/gr-uhd/lib/usrp_sink_impl.cc
index 8a315a2e40..d38ffc344d 100644
--- a/gr-uhd/lib/usrp_sink_impl.cc
+++ b/gr-uhd/lib/usrp_sink_impl.cc
@@ -22,7 +22,7 @@
 
 #include "usrp_sink_impl.h"
 #include "gr_uhd_common.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
 #include <boost/make_shared.hpp>
 #include <stdexcept>
 
@@ -60,9 +60,9 @@ namespace gr {
 
     usrp_sink_impl::usrp_sink_impl(const ::uhd::device_addr_t &device_addr,
                                    const ::uhd::stream_args_t &stream_args)
-      : gr_sync_block("gr uhd usrp sink",
+      : sync_block("gr uhd usrp sink",
                       args_to_io_sig(stream_args),
-                      gr_make_io_signature(0, 0, 0)),
+                      io_signature::make(0, 0, 0)),
         _stream_args(stream_args),
         _nchan(std::max<size_t>(1, stream_args.channels.size())),
         _stream_now(_nchan == 1),
@@ -473,10 +473,10 @@ namespace gr {
     usrp_sink_impl::tag_work(int &ninput_items)
     {
       //the for loop below assumes tags sorted by count low -> high
-      std::sort(_tags.begin(), _tags.end(), gr_tag_t::offset_compare);
+      std::sort(_tags.begin(), _tags.end(), tag_t::offset_compare);
 
       //extract absolute sample counts
-      const gr_tag_t &tag0 = _tags.front();
+      const tag_t &tag0 = _tags.front();
       const uint64_t tag0_count = tag0.offset;
       const uint64_t samp0_count = this->nitems_read(0);
 
@@ -491,7 +491,7 @@ namespace gr {
       _metadata.has_time_spec = false;
 
       //process all of the tags found with the same count as tag0
-      BOOST_FOREACH(const gr_tag_t &my_tag, _tags) {
+      BOOST_FOREACH(const tag_t &my_tag, _tags) {
         const uint64_t my_tag_count = my_tag.offset;
         const pmt::pmt_t &key = my_tag.key;
         const pmt::pmt_t &value = my_tag.value;
diff --git a/gr-uhd/lib/usrp_sink_impl.h b/gr-uhd/lib/usrp_sink_impl.h
index b75dc1dc6d..c714eb53eb 100644
--- a/gr-uhd/lib/usrp_sink_impl.h
+++ b/gr-uhd/lib/usrp_sink_impl.h
@@ -20,7 +20,7 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include <uhd/usrp_sink.h>
+#include <gnuradio/uhd/usrp_sink.h>
 #include <uhd/convert.hpp>
 
 static const pmt::pmt_t SOB_KEY = pmt::string_to_symbol("tx_sob");
@@ -30,7 +30,7 @@ static const pmt::pmt_t TIME_KEY = pmt::string_to_symbol("tx_time");
 namespace gr {
   namespace uhd {
 
-    inline gr_io_signature_sptr
+    inline io_signature::sptr
     args_to_io_sig(const ::uhd::stream_args_t &args)
     {
       const size_t nchan = std::max<size_t>(args.channels.size(), 1);
@@ -43,7 +43,7 @@ namespace gr {
       if(args.cpu_format == "sc16")
         size = 4;
 #endif
-      return gr_make_io_signature(nchan, nchan, size);
+      return io_signature::make(nchan, nchan, size);
     }
 
     /***********************************************************************
@@ -134,7 +134,7 @@ namespace gr {
       bool _start_time_set;
 
       //stream tags related stuff
-      std::vector<gr_tag_t> _tags;
+      std::vector<tag_t> _tags;
     };
 
   } /* namespace uhd */
diff --git a/gr-uhd/lib/usrp_source_impl.cc b/gr-uhd/lib/usrp_source_impl.cc
index 50c144fb86..c5df60222a 100644
--- a/gr-uhd/lib/usrp_source_impl.cc
+++ b/gr-uhd/lib/usrp_source_impl.cc
@@ -22,7 +22,7 @@
 
 #include "usrp_source_impl.h"
 #include "gr_uhd_common.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
 #include <boost/format.hpp>
 #include <boost/thread/thread.hpp>
 #include <boost/make_shared.hpp>
@@ -63,8 +63,8 @@ namespace gr {
 
     usrp_source_impl::usrp_source_impl(const ::uhd::device_addr_t &device_addr,
                                        const ::uhd::stream_args_t &stream_args):
-      gr_sync_block("gr uhd usrp source",
-                    gr_make_io_signature(0, 0, 0),
+      sync_block("gr uhd usrp source",
+                    io_signature::make(0, 0, 0),
                     args_to_io_sig(stream_args)),
       _stream_args(stream_args),
       _nchan(std::max<size_t>(1, stream_args.channels.size())),
diff --git a/gr-uhd/lib/usrp_source_impl.h b/gr-uhd/lib/usrp_source_impl.h
index 218cc9b6e3..58bb21551c 100644
--- a/gr-uhd/lib/usrp_source_impl.h
+++ b/gr-uhd/lib/usrp_source_impl.h
@@ -20,7 +20,7 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include <uhd/usrp_source.h>
+#include <gnuradio/uhd/usrp_source.h>
 #include <uhd/convert.hpp>
 
 static const pmt::pmt_t TIME_KEY = pmt::string_to_symbol("rx_time");
@@ -30,7 +30,7 @@ static const pmt::pmt_t FREQ_KEY = pmt::string_to_symbol("rx_freq");
 namespace gr {
   namespace uhd {
 
-    inline gr_io_signature_sptr
+    inline io_signature::sptr
     args_to_io_sig(const ::uhd::stream_args_t &args)
     {
       const size_t nchan = std::max<size_t>(args.channels.size(), 1);
@@ -43,7 +43,7 @@ namespace gr {
       if(args.cpu_format == "sc16")
         size = 4;
 #endif
-      return gr_make_io_signature(nchan, nchan, size);
+      return io_signature::make(nchan, nchan, size);
     }
 
     /***********************************************************************