27 files changed, 98 insertions, 98 deletions
diff --git a/include/Makefile.am b/include/Makefile.am
index 35f492461..d1011b41d 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -17,8 +17,8 @@
 
 include $(top_srcdir)/Makefile.common
 
-SUBDIRS = usrp_uhd
+SUBDIRS = uhd
 
 this_includedir = $(includedir)
 this_include_HEADERS = \
-	usrp_uhd.hpp
+	uhd.hpp
diff --git a/include/usrp_uhd.hpp b/include/uhd.hpp
index 7f1be473c..ee8c13dfe 100644
--- a/include/usrp_uhd.hpp
+++ b/include/uhd.hpp
@@ -15,10 +15,10 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-#ifndef INCLUDED_USRP_UHD_HPP
-#define INCLUDED_USRP_UHD_HPP
+#ifndef INCLUDED_UHD_HPP
+#define INCLUDED_UHD_HPP
 
 //include convenience headers
-#include <usrp_uhd/device.hpp>
+#include <uhd/device.hpp>
 
-#endif /* INCLUDED_USRP_UHD_HPP */
+#endif /* INCLUDED_UHD_HPP */
diff --git a/include/usrp_uhd/.gitignore b/include/uhd/.gitignore
index b336cc7ce..b336cc7ce 100644
--- a/include/usrp_uhd/.gitignore
+++ b/include/uhd/.gitignore
diff --git a/include/usrp_uhd/Makefile.am b/include/uhd/Makefile.am
index 143fb5b7a..00691d920 100644
--- a/include/usrp_uhd/Makefile.am
+++ b/include/uhd/Makefile.am
@@ -19,7 +19,7 @@ include $(top_srcdir)/Makefile.common
 
 SUBDIRS = usrp quadradio
 
-this_includedir = $(includedir)/usrp_uhd
+this_includedir = $(includedir)/uhd
 this_include_HEADERS = \
 	device.hpp \
 	device_addr.hpp \
diff --git a/include/usrp_uhd/device.hpp b/include/uhd/device.hpp
index e0356feb0..63f897f97 100644
--- a/include/usrp_uhd/device.hpp
+++ b/include/uhd/device.hpp
@@ -15,19 +15,19 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-#ifndef INCLUDED_USRP_UHD_DEVICE_HPP
-#define INCLUDED_USRP_UHD_DEVICE_HPP
+#ifndef INCLUDED_UHD_DEVICE_HPP
+#define INCLUDED_UHD_DEVICE_HPP
 
-#include <usrp_uhd/device_addr.hpp>
-#include <usrp_uhd/props.hpp>
-#include <usrp_uhd/wax.hpp>
+#include <uhd/device_addr.hpp>
+#include <uhd/props.hpp>
+#include <uhd/wax.hpp>
 #include <boost/utility.hpp>
 #include <boost/shared_ptr.hpp>
 #include <boost/function.hpp>
 #include <boost/asio/buffer.hpp>
 #include <vector>
 
-namespace usrp_uhd{
+namespace uhd{
 
 /*!
  * The usrp device interface represents the usrp hardware.
@@ -85,6 +85,6 @@ public:
     void connect(const wax::obj &src, const wax::obj &sink);
 };
 
-} //namespace usrp_uhd
+} //namespace uhd
 
-#endif /* INCLUDED_USRP_UHD_DEVICE_HPP */
+#endif /* INCLUDED_UHD_DEVICE_HPP */
diff --git a/include/usrp_uhd/device_addr.hpp b/include/uhd/device_addr.hpp
index 011e474df..84ae60881 100644
--- a/include/usrp_uhd/device_addr.hpp
+++ b/include/uhd/device_addr.hpp
@@ -15,15 +15,15 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-#ifndef INCLUDED_USRP_UHD_DEVICE_ADDR_HPP
-#define INCLUDED_USRP_UHD_DEVICE_ADDR_HPP
+#ifndef INCLUDED_UHD_DEVICE_ADDR_HPP
+#define INCLUDED_UHD_DEVICE_ADDR_HPP
 
 #include <string>
 #include <iostream>
 #include <netinet/ether.h>
 #include <stdint.h>
 
-namespace usrp_uhd{
+namespace uhd{
 
     /*!
     * Wrapper for an ethernet mac address.
@@ -88,10 +88,10 @@ namespace usrp_uhd{
         device_addr_t(device_addr_type_t device_addr_type = DEVICE_ADDR_TYPE_AUTO);
     };
 
-} //namespace usrp_uhd
+} //namespace uhd
 
 //ability to use types with stream operators
-std::ostream& operator<<(std::ostream &os, const usrp_uhd::device_addr_t &x);
-std::ostream& operator<<(std::ostream &os, const usrp_uhd::mac_addr_t &x);
+std::ostream& operator<<(std::ostream &os, const uhd::device_addr_t &x);
+std::ostream& operator<<(std::ostream &os, const uhd::mac_addr_t &x);
 
-#endif /* INCLUDED_USRP_UHD_DEVICE_ADDR_HPP */
+#endif /* INCLUDED_UHD_DEVICE_ADDR_HPP */
diff --git a/include/usrp_uhd/gain_handler.hpp b/include/uhd/gain_handler.hpp
index 786db993b..06800315a 100644
--- a/include/usrp_uhd/gain_handler.hpp
+++ b/include/uhd/gain_handler.hpp
@@ -16,15 +16,15 @@
 //
 
 #include <boost/shared_ptr.hpp>
-#include <usrp_uhd/wax.hpp>
-#include <usrp_uhd/props.hpp>
+#include <uhd/wax.hpp>
+#include <uhd/props.hpp>
 #include <boost/function.hpp>
 #include <boost/bind.hpp>
 
-#ifndef INCLUDED_USRP_UHD_GAIN_HANDLER_HPP
-#define INCLUDED_USRP_UHD_GAIN_HANDLER_HPP
+#ifndef INCLUDED_UHD_GAIN_HANDLER_HPP
+#define INCLUDED_UHD_GAIN_HANDLER_HPP
 
-namespace usrp_uhd{
+namespace uhd{
 
 class gain_handler{
 public:
@@ -95,7 +95,7 @@ private:
 
 };
 
-} //namespace usrp_uhd
+} //namespace uhd
 
-#endif /* INCLUDED_USRP_UHD_GAIN_HANDLER_HPP */
+#endif /* INCLUDED_UHD_GAIN_HANDLER_HPP */
 
diff --git a/include/usrp_uhd/props.hpp b/include/uhd/props.hpp
index de3280969..5e49ab521 100644
--- a/include/usrp_uhd/props.hpp
+++ b/include/uhd/props.hpp
@@ -16,15 +16,15 @@
 //
 
 #include <boost/tuple/tuple.hpp>
-#include <usrp_uhd/time_spec.hpp>
-#include <usrp_uhd/wax.hpp>
+#include <uhd/time_spec.hpp>
+#include <uhd/wax.hpp>
 #include <complex>
 #include <vector>
 
-#ifndef INCLUDED_USRP_UHD_PROPS_HPP
-#define INCLUDED_USRP_UHD_PROPS_HPP
+#ifndef INCLUDED_UHD_PROPS_HPP
+#define INCLUDED_UHD_PROPS_HPP
 
-namespace usrp_uhd{
+namespace uhd{
 
     //common typedefs for board properties
     typedef float gain_t;
@@ -160,6 +160,6 @@ namespace usrp_uhd{
         SUBDEV_PROP_BANDWIDTH          //rw, freq_t
     };
 
-} //namespace usrp_uhd
+} //namespace uhd
 
-#endif /* INCLUDED_USRP_UHD_PROPS_HPP */
+#endif /* INCLUDED_UHD_PROPS_HPP */
diff --git a/include/usrp_uhd/quadradio/.gitignore b/include/uhd/quadradio/.gitignore
index b336cc7ce..b336cc7ce 100644
--- a/include/usrp_uhd/quadradio/.gitignore
+++ b/include/uhd/quadradio/.gitignore
diff --git a/include/usrp_uhd/quadradio/Makefile.am b/include/uhd/quadradio/Makefile.am
index 8acd4b6be..8acd4b6be 100644
--- a/include/usrp_uhd/quadradio/Makefile.am
+++ b/include/uhd/quadradio/Makefile.am
diff --git a/include/usrp_uhd/time_spec.hpp b/include/uhd/time_spec.hpp
index 1a84aa7fb..e5657e555 100644
--- a/include/usrp_uhd/time_spec.hpp
+++ b/include/uhd/time_spec.hpp
@@ -17,10 +17,10 @@
 
 #include <stdint.h>
 
-#ifndef INCLUDED_USRP_UHD_TIME_SPEC_HPP
-#define INCLUDED_USRP_UHD_TIME_SPEC_HPP
+#ifndef INCLUDED_UHD_TIME_SPEC_HPP
+#define INCLUDED_UHD_TIME_SPEC_HPP
 
-namespace usrp_uhd{
+namespace uhd{
 
     /*!
      * A time_spec_t holds a seconds and ticks time value.
@@ -52,6 +52,6 @@ namespace usrp_uhd{
         }
     };
 
-} //namespace usrp_uhd
+} //namespace uhd
 
-#endif /* INCLUDED_USRP_UHD_TIME_SPEC_HPP */
+#endif /* INCLUDED_UHD_TIME_SPEC_HPP */
diff --git a/include/usrp_uhd/usrp/.gitignore b/include/uhd/usrp/.gitignore
index b336cc7ce..b336cc7ce 100644
--- a/include/usrp_uhd/usrp/.gitignore
+++ b/include/uhd/usrp/.gitignore
diff --git a/include/usrp_uhd/usrp/Makefile.am b/include/uhd/usrp/Makefile.am
index a96cd67d2..72c37a414 100644
--- a/include/usrp_uhd/usrp/Makefile.am
+++ b/include/uhd/usrp/Makefile.am
@@ -19,6 +19,6 @@ include $(top_srcdir)/Makefile.common
 
 SUBDIRS = mboard dboard
 
-this_includedir = $(includedir)/usrp_uhd/usrp
+this_includedir = $(includedir)/uhd/usrp
 this_include_HEADERS = \
 	usrp.hpp
diff --git a/include/usrp_uhd/usrp/dboard/.gitignore b/include/uhd/usrp/dboard/.gitignore
index b336cc7ce..b336cc7ce 100644
--- a/include/usrp_uhd/usrp/dboard/.gitignore
+++ b/include/uhd/usrp/dboard/.gitignore
diff --git a/include/usrp_uhd/usrp/dboard/Makefile.am b/include/uhd/usrp/dboard/Makefile.am
index a07ec3160..83bbf8c67 100644
--- a/include/usrp_uhd/usrp/dboard/Makefile.am
+++ b/include/uhd/usrp/dboard/Makefile.am
@@ -19,7 +19,7 @@ include $(top_srcdir)/Makefile.common
 
 SUBDIRS =
 
-this_includedir = $(includedir)/usrp_uhd/usrp/dboard
+this_includedir = $(includedir)/uhd/usrp/dboard
 this_include_HEADERS = \
 	base.hpp \
 	id.hpp \
diff --git a/include/usrp_uhd/usrp/dboard/base.hpp b/include/uhd/usrp/dboard/base.hpp
index 50896b9a8..845e2f669 100644
--- a/include/usrp_uhd/usrp/dboard/base.hpp
+++ b/include/uhd/usrp/dboard/base.hpp
@@ -15,16 +15,16 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-#ifndef INCLUDED_USRP_UHD_USRP_DBOARD_BASE_HPP
-#define INCLUDED_USRP_UHD_USRP_DBOARD_BASE_HPP
+#ifndef INCLUDED_UHD_USRP_DBOARD_BASE_HPP
+#define INCLUDED_UHD_USRP_DBOARD_BASE_HPP
 
-#include <usrp_uhd/wax.hpp>
+#include <uhd/wax.hpp>
 #include <boost/utility.hpp>
 #include <boost/shared_ptr.hpp>
 #include <boost/tuple/tuple.hpp>
-#include <usrp_uhd/usrp/dboard/interface.hpp>
+#include <uhd/usrp/dboard/interface.hpp>
 
-namespace usrp_uhd{ namespace usrp{ namespace dboard{
+namespace uhd{ namespace usrp{ namespace dboard{
 
 /*!
  * A daughter board base class for all dboards.
@@ -108,4 +108,4 @@ public:
 
 }}} //namespace
 
-#endif /* INCLUDED_USRP_UHD_USRP_DBOARD_BASE_HPP */
+#endif /* INCLUDED_UHD_USRP_DBOARD_BASE_HPP */
diff --git a/include/usrp_uhd/usrp/dboard/id.hpp b/include/uhd/usrp/dboard/id.hpp
index 8369841bf..bedc01f48 100644
--- a/include/usrp_uhd/usrp/dboard/id.hpp
+++ b/include/uhd/usrp/dboard/id.hpp
@@ -17,10 +17,10 @@
 
 #include <iostream>
 
-#ifndef INCLUDED_USRP_UHD_USRP_DBOARD_ID_HPP
-#define INCLUDED_USRP_UHD_USRP_DBOARD_ID_HPP
+#ifndef INCLUDED_UHD_USRP_DBOARD_ID_HPP
+#define INCLUDED_UHD_USRP_DBOARD_ID_HPP
 
-namespace usrp_uhd{ namespace usrp{ namespace dboard{
+namespace uhd{ namespace usrp{ namespace dboard{
 
 enum dboard_id_t{
     ID_BASIC_TX = 0x0000,
@@ -29,6 +29,6 @@ enum dboard_id_t{
 
 }}} //namespace
 
-std::ostream& operator<<(std::ostream &, const usrp_uhd::usrp::dboard::dboard_id_t &);
+std::ostream& operator<<(std::ostream &, const uhd::usrp::dboard::dboard_id_t &);
 
-#endif /* INCLUDED_USRP_UHD_USRP_DBOARD_ID_HPP */
+#endif /* INCLUDED_UHD_USRP_DBOARD_ID_HPP */
diff --git a/include/usrp_uhd/usrp/dboard/interface.hpp b/include/uhd/usrp/dboard/interface.hpp
index 15621d0fc..c18247564 100644
--- a/include/usrp_uhd/usrp/dboard/interface.hpp
+++ b/include/uhd/usrp/dboard/interface.hpp
@@ -15,13 +15,13 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-#ifndef INCLUDED_USRP_UHD_USRP_DBOARD_INTERFACE_HPP
-#define INCLUDED_USRP_UHD_USRP_DBOARD_INTERFACE_HPP
+#ifndef INCLUDED_UHD_USRP_DBOARD_INTERFACE_HPP
+#define INCLUDED_UHD_USRP_DBOARD_INTERFACE_HPP
 
 #include <boost/shared_ptr.hpp>
 #include <stdint.h>
 
-namespace usrp_uhd{ namespace usrp{ namespace dboard{
+namespace uhd{ namespace usrp{ namespace dboard{
 
 /*!
  * The daughter board interface to be subclassed.
@@ -164,4 +164,4 @@ public:
 
 }}} //namespace
 
-#endif /* INCLUDED_USRP_UHD_USRP_DBOARD_INTERFACE_HPP */
+#endif /* INCLUDED_UHD_USRP_DBOARD_INTERFACE_HPP */
diff --git a/include/usrp_uhd/usrp/dboard/manager.hpp b/include/uhd/usrp/dboard/manager.hpp
index 8cc5658d9..5934efedc 100644
--- a/include/usrp_uhd/usrp/dboard/manager.hpp
+++ b/include/uhd/usrp/dboard/manager.hpp
@@ -15,18 +15,18 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-#ifndef INCLUDED_USRP_UHD_USRP_DBOARD_MANAGER_HPP
-#define INCLUDED_USRP_UHD_USRP_DBOARD_MANAGER_HPP
+#ifndef INCLUDED_UHD_USRP_DBOARD_MANAGER_HPP
+#define INCLUDED_UHD_USRP_DBOARD_MANAGER_HPP
 
 #include <map>
-#include <usrp_uhd/wax.hpp>
-#include <usrp_uhd/props.hpp>
+#include <uhd/wax.hpp>
+#include <uhd/props.hpp>
 #include <boost/utility.hpp>
 #include <boost/shared_ptr.hpp>
-#include <usrp_uhd/usrp/dboard/base.hpp>
-#include <usrp_uhd/usrp/dboard/id.hpp>
+#include <uhd/usrp/dboard/base.hpp>
+#include <uhd/usrp/dboard/id.hpp>
 
-namespace usrp_uhd{ namespace usrp{ namespace dboard{
+namespace uhd{ namespace usrp{ namespace dboard{
 
 /*!
  * A daughter board subdev manager class.
@@ -79,4 +79,4 @@ private:
 
 }}} //namespace
 
-#endif /* INCLUDED_USRP_UHD_USRP_DBOARD_MANAGER_HPP */
+#endif /* INCLUDED_UHD_USRP_DBOARD_MANAGER_HPP */
diff --git a/include/usrp_uhd/usrp/mboard/.gitignore b/include/uhd/usrp/mboard/.gitignore
index b336cc7ce..b336cc7ce 100644
--- a/include/usrp_uhd/usrp/mboard/.gitignore
+++ b/include/uhd/usrp/mboard/.gitignore
diff --git a/include/usrp_uhd/usrp/mboard/Makefile.am b/include/uhd/usrp/mboard/Makefile.am
index bcc6b832c..6a85d354e 100644
--- a/include/usrp_uhd/usrp/mboard/Makefile.am
+++ b/include/uhd/usrp/mboard/Makefile.am
@@ -19,7 +19,7 @@ include $(top_srcdir)/Makefile.common
 
 SUBDIRS =
 
-this_includedir = $(includedir)/usrp_uhd/usrp/mboard
+this_includedir = $(includedir)/uhd/usrp/mboard
 this_include_HEADERS = \
 	base.hpp \
 	test.hpp \
diff --git a/include/usrp_uhd/usrp/mboard/base.hpp b/include/uhd/usrp/mboard/base.hpp
index 65810f329..a8de81a7e 100644
--- a/include/usrp_uhd/usrp/mboard/base.hpp
+++ b/include/uhd/usrp/mboard/base.hpp
@@ -15,14 +15,14 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-#ifndef INCLUDED_USRP_UHD_USRP_MBOARD_BASE_HPP
-#define INCLUDED_USRP_UHD_USRP_MBOARD_BASE_HPP
+#ifndef INCLUDED_UHD_USRP_MBOARD_BASE_HPP
+#define INCLUDED_UHD_USRP_MBOARD_BASE_HPP
 
-#include <usrp_uhd/wax.hpp>
+#include <uhd/wax.hpp>
 #include <boost/utility.hpp>
 #include <boost/shared_ptr.hpp>
 
-namespace usrp_uhd{ namespace usrp{ namespace mboard{
+namespace uhd{ namespace usrp{ namespace mboard{
 
 /*!
  * A base class for usrp mboard objects.
@@ -42,4 +42,4 @@ private:
 
 }}} //namespace
 
-#endif /* INCLUDED_USRP_UHD_USRP_MBOARD_BASE_HPP */
+#endif /* INCLUDED_UHD_USRP_MBOARD_BASE_HPP */
diff --git a/include/usrp_uhd/usrp/mboard/test.hpp b/include/uhd/usrp/mboard/test.hpp
index fc1ea6e70..be435930b 100644
--- a/include/usrp_uhd/usrp/mboard/test.hpp
+++ b/include/uhd/usrp/mboard/test.hpp
@@ -15,15 +15,15 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-#ifndef INCLUDED_USRP_UHD_USRP_MBOARD_TEST_HPP
-#define INCLUDED_USRP_UHD_USRP_MBOARD_TEST_HPP
+#ifndef INCLUDED_UHD_USRP_MBOARD_TEST_HPP
+#define INCLUDED_UHD_USRP_MBOARD_TEST_HPP
 
-#include <usrp_uhd/usrp/mboard/base.hpp>
-#include <usrp_uhd/device_addr.hpp>
-#include <usrp_uhd/usrp/dboard/manager.hpp>
+#include <uhd/usrp/mboard/base.hpp>
+#include <uhd/device_addr.hpp>
+#include <uhd/usrp/dboard/manager.hpp>
 #include <map>
 
-namespace usrp_uhd{ namespace usrp{ namespace mboard{
+namespace uhd{ namespace usrp{ namespace mboard{
 
 /*!
  * A test usrp mboard object.
@@ -43,4 +43,4 @@ private:
 
 }}} //namespace
 
-#endif /* INCLUDED_USRP_UHD_USRP_MBOARD_TEST_HPP */
+#endif /* INCLUDED_UHD_USRP_MBOARD_TEST_HPP */
diff --git a/include/usrp_uhd/usrp/mboard/usrp2.hpp b/include/uhd/usrp/mboard/usrp2.hpp
index a8e950d93..8c2430dbd 100644
--- a/include/usrp_uhd/usrp/mboard/usrp2.hpp
+++ b/include/uhd/usrp/mboard/usrp2.hpp
@@ -15,15 +15,15 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-#ifndef INCLUDED_USRP_UHD_USRP_MBOARD_USRP2_HPP
-#define INCLUDED_USRP_UHD_USRP_MBOARD_USRP2_HPP
+#ifndef INCLUDED_UHD_USRP_MBOARD_USRP2_HPP
+#define INCLUDED_UHD_USRP_MBOARD_USRP2_HPP
 
-#include <usrp_uhd/usrp/mboard/base.hpp>
-#include <usrp_uhd/device_addr.hpp>
-#include <usrp_uhd/usrp/dboard/manager.hpp>
+#include <uhd/usrp/mboard/base.hpp>
+#include <uhd/device_addr.hpp>
+#include <uhd/usrp/dboard/manager.hpp>
 #include <map>
 
-namespace usrp_uhd{ namespace usrp{ namespace mboard{
+namespace uhd{ namespace usrp{ namespace mboard{
 
 /*!
  * The usrp2 mboard class.
@@ -50,4 +50,4 @@ private:
 
 }}} //namespace
 
-#endif /* INCLUDED_USRP_UHD_USRP_MBOARD_USRP2_HPP */
+#endif /* INCLUDED_UHD_USRP_MBOARD_USRP2_HPP */
diff --git a/include/usrp_uhd/usrp/usrp.hpp b/include/uhd/usrp/usrp.hpp
index a8a052b52..eda8f5fc1 100644
--- a/include/usrp_uhd/usrp/usrp.hpp
+++ b/include/uhd/usrp/usrp.hpp
@@ -15,14 +15,14 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-#include <usrp_uhd/device.hpp>
-#include <usrp_uhd/usrp/mboard/base.hpp>
+#include <uhd/device.hpp>
+#include <uhd/usrp/mboard/base.hpp>
 #include <map>
 
-#ifndef INCLUDED_USRP_UHD_USRP_USRP_HPP
-#define INCLUDED_USRP_UHD_USRP_USRP_HPP
+#ifndef INCLUDED_UHD_USRP_USRP_HPP
+#define INCLUDED_UHD_USRP_USRP_HPP
 
-namespace usrp_uhd{ namespace usrp{
+namespace uhd{ namespace usrp{
 
 /*!
  * A usrp device provides a device-level interface to usrp mboards.
@@ -49,4 +49,4 @@ private:
 
 }} //namespace
 
-#endif /* INCLUDED_USRP_UHD_USRP_USRP_HPP */
+#endif /* INCLUDED_UHD_USRP_USRP_HPP */
diff --git a/include/usrp_uhd/utils.hpp b/include/uhd/utils.hpp
index a8f1c132d..b080516a5 100644
--- a/include/usrp_uhd/utils.hpp
+++ b/include/uhd/utils.hpp
@@ -15,7 +15,7 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-#include <usrp_uhd/wax.hpp>
+#include <uhd/wax.hpp>
 #include <boost/foreach.hpp>
 #include <boost/format.hpp>
 #include <boost/function.hpp>
@@ -24,10 +24,10 @@
 #include <vector>
 #include <map>
 
-#ifndef INCLUDED_USRP_UHD_UTILS_HPP
-#define INCLUDED_USRP_UHD_UTILS_HPP
+#ifndef INCLUDED_UHD_UTILS_HPP
+#define INCLUDED_UHD_UTILS_HPP
 
-namespace usrp_uhd{
+namespace uhd{
 
 template <class Key, class T> //TODO template this better
 std::vector<Key> get_map_keys(const std::map<Key, T> &m){
@@ -89,7 +89,7 @@ inline void tune(
     //return some kind of tune result tuple/struct
 }
 
-} //namespace usrp_uhd
+} //namespace uhd
 
 /*!
  * Useful templated functions and classes that I like to pretend are part of stl
@@ -128,4 +128,4 @@ namespace std{
 
 }//namespace std
 
-#endif /* INCLUDED_USRP_UHD_UTILS_HPP */
+#endif /* INCLUDED_UHD_UTILS_HPP */
diff --git a/include/usrp_uhd/wax.hpp b/include/uhd/wax.hpp
index 29a96cdb6..29a96cdb6 100644
--- a/include/usrp_uhd/wax.hpp
+++ b/include/uhd/wax.hpp