56 files changed, 186 insertions, 186 deletions
diff --git a/.gitignore b/.gitignore
index e9db284b3..5d81aa58a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
-/usrp_uhd.pc
+/uhd.pc
 /Makefile
 /Makefile.in
 /aclocal.m4
diff --git a/Makefile.am b/Makefile.am
index a1f915f93..a76913311 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -23,13 +23,13 @@ SUBDIRS = include lib test apps
 ## Handle the pkgconfig file generation
 ########################################################################
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = usrp_uhd.pc
+pkgconfig_DATA = uhd.pc
 
-EXTRA_DIST = $(srcdir)/usrp_uhd.pc.in
-BUILT_SOURCES = usrp_uhd.pc
+EXTRA_DIST = $(srcdir)/uhd.pc.in
+BUILT_SOURCES = uhd.pc
 MOSTLYCLEANFILES = $(BUILT_SOURCES)
 
-usrp_uhd.pc: $(srcdir)/usrp_uhd.pc.in Makefile
+uhd.pc: $(srcdir)/uhd.pc.in Makefile
 	$(SED) \
 		-e 's|@prefix[@]|$(prefix)|g' \
 		-e 's|@exec_prefix[@]|$(exec_prefix)|g' \
diff --git a/Makefile.common b/Makefile.common
index 80ed49f2b..742a95b31 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -15,13 +15,13 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-USRP_UHD_LA = $(abs_top_builddir)/lib/libusrp_uhd.la
+UHD_LA = $(abs_top_builddir)/lib/libuhd.la
 
-USRP_UHD_USRP_LA = $(abs_top_builddir)/lib/usrp/lib.la
+UHD_USRP_LA = $(abs_top_builddir)/lib/usrp/lib.la
 
-USRP_UHD_USRP_DBOARD_LA = $(abs_top_builddir)/lib/usrp/dboard/lib.la
+UHD_USRP_DBOARD_LA = $(abs_top_builddir)/lib/usrp/dboard/lib.la
 
-USRP_UHD_USRP_MBOARD_LA = $(abs_top_builddir)/lib/usrp/mboard/lib.la
+UHD_USRP_MBOARD_LA = $(abs_top_builddir)/lib/usrp/mboard/lib.la
 
 GENERAL_CPPFLAGS = \
 	-I$(top_srcdir)/include \
diff --git a/apps/Makefile.am b/apps/Makefile.am
index c18b8c8f5..67ab6b0ed 100644
--- a/apps/Makefile.am
+++ b/apps/Makefile.am
@@ -23,7 +23,7 @@ AM_CPPFLAGS = $(GENERAL_CPPFLAGS)
 
 LDADD = \
 	$(GENERAL_LDDFLAGS) \
-	$(USRP_UHD_LA)
+	$(UHD_LA)
 
 noinst_PROGRAMS = discover_usrps
 
diff --git a/apps/discover_usrps.cpp b/apps/discover_usrps.cpp
index a8d82e015..036d6378a 100644
--- a/apps/discover_usrps.cpp
+++ b/apps/discover_usrps.cpp
@@ -15,13 +15,13 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-#include <usrp_uhd.hpp>
+#include <uhd.hpp>
 #include <boost/program_options.hpp>
 #include <boost/format.hpp>
 #include <iostream>
 
 namespace po = boost::program_options;
-using namespace usrp_uhd;
+using namespace uhd;
 
 int main(int argc, char *argv[]){
     po::options_description desc("Allowed options");
@@ -41,7 +41,7 @@ int main(int argc, char *argv[]){
     }
 
     //extract the ip address (not optional for now)
-    usrp_uhd::device_addr_t device_addr(usrp_uhd::DEVICE_ADDR_TYPE_UDP);
+    uhd::device_addr_t device_addr(uhd::DEVICE_ADDR_TYPE_UDP);
     if (vm.count("ip-addr")) {
         device_addr.udp_args.addr = vm["ip-addr"].as<std::string>();
     } else {
@@ -50,7 +50,7 @@ int main(int argc, char *argv[]){
     }
 
     //discover the usrps
-    std::vector<usrp_uhd::device_addr_t> device_addrs = usrp_uhd::device::discover(device_addr);
+    std::vector<uhd::device_addr_t> device_addrs = uhd::device::discover(device_addr);
     for (size_t i = 0; i < device_addrs.size(); i++){
         std::cout << "--------------------------------------------------" << std::endl;
         std::cout << "-- USRP Device " << i << std::endl;
diff --git a/configure.ac b/configure.ac
index 64c50c7da..58648ce2d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,7 +20,7 @@
 ##################################################
 AC_PREREQ(2.60)
 AC_INIT
-AM_INIT_AUTOMAKE(usrp_uhd, 0)
+AM_INIT_AUTOMAKE(uhd, 0)
 
 ##################################################
 ## Setup C++ and Libtool
@@ -106,11 +106,11 @@ AC_CONFIG_FILES([ \
 	Makefile \
 	apps/Makefile \
 	include/Makefile \
-	include/usrp_uhd/Makefile \
-	include/usrp_uhd/usrp/Makefile \
-	include/usrp_uhd/usrp/dboard/Makefile \
-	include/usrp_uhd/usrp/mboard/Makefile \
-	include/usrp_uhd/quadradio/Makefile \
+	include/uhd/Makefile \
+	include/uhd/usrp/Makefile \
+	include/uhd/usrp/dboard/Makefile \
+	include/uhd/usrp/mboard/Makefile \
+	include/uhd/quadradio/Makefile \
 	lib/Makefile \
 	lib/usrp/Makefile \
 	lib/usrp/dboard/Makefile \
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
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 272d2c296..8ddc0e4be 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -21,17 +21,17 @@ SUBDIRS = usrp quadradio
 
 AM_CPPFLAGS = $(GENERAL_CPPFLAGS)
 
-lib_LTLIBRARIES = libusrp_uhd.la
+lib_LTLIBRARIES = libuhd.la
 
-libusrp_uhd_la_SOURCES = \
+libuhd_la_SOURCES = \
 	device.cpp \
 	device_addr.cpp \
 	gain_handler.cpp \
-	usrp_uhd.cpp \
+	uhd.cpp \
 	wax.cpp
 
-libusrp_uhd_la_LIBADD = \
+libuhd_la_LIBADD = \
 	$(GENERAL_LDDFLAGS) \
-	$(USRP_UHD_USRP_LA)
+	$(UHD_USRP_LA)
 
 noinst_HEADERS =
diff --git a/lib/device.cpp b/lib/device.cpp
index 5718c71e7..4b51a70d4 100644
--- a/lib/device.cpp
+++ b/lib/device.cpp
@@ -15,13 +15,13 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-#include <usrp_uhd/usrp/usrp.hpp>
-#include <usrp_uhd/usrp/mboard/usrp2.hpp>
-#include <usrp_uhd/device.hpp>
+#include <uhd/usrp/usrp.hpp>
+#include <uhd/usrp/mboard/usrp2.hpp>
+#include <uhd/device.hpp>
 #include <boost/format.hpp>
 #include <stdexcept>
 
-using namespace usrp_uhd;
+using namespace uhd;
 
 std::vector<device_addr_t> device::discover(const device_addr_t & hint = device_addr_t()){
     std::vector<device_addr_t> device_addrs;
@@ -58,7 +58,7 @@ device::sptr device::make(const device_addr_t & hint, size_t which){
     //create the new device with the discovered address
     //TODO only a usrp device will be made (until others are supported)
     if (true){
-        return sptr(new usrp_uhd::usrp::usrp(device_addrs.at(which)));
+        return sptr(new uhd::usrp::usrp(device_addrs.at(which)));
     }
     throw std::runtime_error("cant make a device");
 }
diff --git a/lib/device_addr.cpp b/lib/device_addr.cpp
index e11d51580..ee6dbbbc8 100644
--- a/lib/device_addr.cpp
+++ b/lib/device_addr.cpp
@@ -15,7 +15,7 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-#include <usrp_uhd/device_addr.hpp>
+#include <uhd/device_addr.hpp>
 #include <sstream>
 #include <cstring>
 #include <stdexcept>
@@ -23,7 +23,7 @@
 #include <boost/algorithm/string.hpp>
 
 //----------------------- u2 mac addr wrapper ------------------------//
-usrp_uhd::mac_addr_t::mac_addr_t(const std::string &mac_addr_str_){
+uhd::mac_addr_t::mac_addr_t(const std::string &mac_addr_str_){
     std::string mac_addr_str = (mac_addr_str_ == "")? "ff:ff:ff:ff:ff:ff" : mac_addr_str_;
 
     //ether_aton_r(str.c_str(), &mac_addr);
@@ -55,7 +55,7 @@ usrp_uhd::mac_addr_t::mac_addr_t(const std::string &mac_addr_str_){
     memcpy(&mac_addr, p, sizeof(mac_addr));
 }
 
-std::string usrp_uhd::mac_addr_t::to_string(void) const{
+std::string uhd::mac_addr_t::to_string(void) const{
     //ether_ntoa_r(&mac_addr, addr_buf);
     const uint8_t *p = reinterpret_cast<const uint8_t *>(&mac_addr);
     return str(
@@ -65,13 +65,13 @@ std::string usrp_uhd::mac_addr_t::to_string(void) const{
     );
 }
 
-std::ostream& operator<<(std::ostream &os, const usrp_uhd::mac_addr_t &x){
+std::ostream& operator<<(std::ostream &os, const uhd::mac_addr_t &x){
     os << x.to_string();
     return os;
 }
 
 //----------------------- usrp device_addr_t wrapper -------------------------//
-usrp_uhd::device_addr_t::device_addr_t(device_addr_type_t device_addr_type){
+uhd::device_addr_t::device_addr_t(device_addr_type_t device_addr_type){
     type = device_addr_type;
     virtual_args.num_rx_dsps = 0;
     virtual_args.num_tx_dsps = 0;
@@ -84,7 +84,7 @@ usrp_uhd::device_addr_t::device_addr_t(device_addr_type_t device_addr_type){
     discovery_args.mboard_id = ~0;
 }
 
-std::string usrp_uhd::device_addr_t::to_string(void) const{
+std::string uhd::device_addr_t::to_string(void) const{
     std::ostringstream out;
     out << "USRP Type: ";
     switch(type){
@@ -121,7 +121,7 @@ std::string usrp_uhd::device_addr_t::to_string(void) const{
     return out.str();
 }
 
-std::ostream& operator<<(std::ostream &os, const usrp_uhd::device_addr_t &x)
+std::ostream& operator<<(std::ostream &os, const uhd::device_addr_t &x)
 {
   os << x.to_string();
   return os;
diff --git a/lib/gain_handler.cpp b/lib/gain_handler.cpp
index 8713ad766..85cacd2a5 100644
--- a/lib/gain_handler.cpp
+++ b/lib/gain_handler.cpp
@@ -15,14 +15,14 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-#include <usrp_uhd/gain_handler.hpp>
-#include <usrp_uhd/utils.hpp>
+#include <uhd/gain_handler.hpp>
+#include <uhd/utils.hpp>
 #include <boost/assign/list_of.hpp>
 #include <boost/foreach.hpp>
 #include <boost/format.hpp>
 #include <vector>
 
-using namespace usrp_uhd;
+using namespace uhd;
 
 /***********************************************************************
  * Helper functions and macros
diff --git a/lib/usrp_uhd.cpp b/lib/uhd.cpp
index 7a9748954..5e250c76f 100644
--- a/lib/usrp_uhd.cpp
+++ b/lib/uhd.cpp
@@ -15,6 +15,6 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-#include <usrp_uhd.hpp>
+#include <uhd.hpp>
 
 //nothing here, just includes the header so the compiler can check
diff --git a/lib/usrp/Makefile.am b/lib/usrp/Makefile.am
index bc279402c..ec4300159 100644
--- a/lib/usrp/Makefile.am
+++ b/lib/usrp/Makefile.am
@@ -28,5 +28,5 @@ lib_la_SOURCES = \
 
 lib_la_LIBADD = \
 	$(GENERAL_LDDFLAGS) \
-	$(USRP_UHD_USRP_DBOARD_LA) \
-	$(USRP_UHD_USRP_MBOARD_LA)
+	$(UHD_USRP_DBOARD_LA) \
+	$(UHD_USRP_MBOARD_LA)
diff --git a/lib/usrp/dboard/base.cpp b/lib/usrp/dboard/base.cpp
index 18489f3b2..de8db323a 100644
--- a/lib/usrp/dboard/base.cpp
+++ b/lib/usrp/dboard/base.cpp
@@ -15,10 +15,10 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-#include <usrp_uhd/usrp/dboard/base.hpp>
+#include <uhd/usrp/dboard/base.hpp>
 #include <stdexcept>
 
-using namespace usrp_uhd::usrp::dboard;
+using namespace uhd::usrp::dboard;
 
 /***********************************************************************
  * base dboard base class
diff --git a/lib/usrp/dboard/dboards.hpp b/lib/usrp/dboard/dboards.hpp
index 218849eb6..0e740856f 100644
--- a/lib/usrp/dboard/dboards.hpp
+++ b/lib/usrp/dboard/dboards.hpp
@@ -18,9 +18,9 @@
 #ifndef INCLUDED_LOCAL_DBOARDS_HPP
 #define INCLUDED_LOCAL_DBOARDS_HPP
 
-#include <usrp_uhd/usrp/dboard/base.hpp>
+#include <uhd/usrp/dboard/base.hpp>
 
-using namespace usrp_uhd::usrp::dboard;
+using namespace uhd::usrp::dboard;
 
 /***********************************************************************
  * The basic boards:
diff --git a/lib/usrp/dboard/id.cpp b/lib/usrp/dboard/id.cpp
index 6f545d4e4..b55028a11 100644
--- a/lib/usrp/dboard/id.cpp
+++ b/lib/usrp/dboard/id.cpp
@@ -15,12 +15,12 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-#include <usrp_uhd/usrp/dboard/id.hpp>
+#include <uhd/usrp/dboard/id.hpp>
 #include <boost/assign/list_of.hpp>
 #include <boost/format.hpp>
 #include <map>
 
-using namespace usrp_uhd::usrp::dboard;
+using namespace uhd::usrp::dboard;
 
 std::ostream& operator<<(std::ostream &os, const dboard_id_t &id){
     //map the dboard ids to string representations
diff --git a/lib/usrp/dboard/interface.cpp b/lib/usrp/dboard/interface.cpp
index dff90ffa4..837c76d0a 100644
--- a/lib/usrp/dboard/interface.cpp
+++ b/lib/usrp/dboard/interface.cpp
@@ -15,9 +15,9 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-#include <usrp_uhd/usrp/dboard/interface.hpp>
+#include <uhd/usrp/dboard/interface.hpp>
 
-using namespace usrp_uhd::usrp::dboard;
+using namespace uhd::usrp::dboard;
 
 interface::interface(void){
     /* NOP */
diff --git a/lib/usrp/dboard/manager.cpp b/lib/usrp/dboard/manager.cpp
index 759cb20b8..5005301ba 100644
--- a/lib/usrp/dboard/manager.cpp
+++ b/lib/usrp/dboard/manager.cpp
@@ -15,15 +15,15 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-#include <usrp_uhd/usrp/dboard/manager.hpp>
-#include <usrp_uhd/utils.hpp>
+#include <uhd/usrp/dboard/manager.hpp>
+#include <uhd/utils.hpp>
 #include <boost/assign/list_of.hpp>
 #include <boost/format.hpp>
 #include <boost/foreach.hpp>
 #include "dboards.hpp"
 
-using namespace usrp_uhd;
-using namespace usrp_uhd::usrp::dboard;
+using namespace uhd;
+using namespace uhd::usrp::dboard;
 using namespace boost::assign;
 
 /***********************************************************************
diff --git a/lib/usrp/mboard/base.cpp b/lib/usrp/mboard/base.cpp
index 3baf4c0a4..f4f0324f3 100644
--- a/lib/usrp/mboard/base.cpp
+++ b/lib/usrp/mboard/base.cpp
@@ -15,10 +15,10 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-#include <usrp_uhd/usrp/mboard/base.hpp>
+#include <uhd/usrp/mboard/base.hpp>
 #include <stdexcept>
 
-using namespace usrp_uhd::usrp::mboard;
+using namespace uhd::usrp::mboard;
 
 base::base(void){
     /* NOP */
diff --git a/lib/usrp/mboard/test.cpp b/lib/usrp/mboard/test.cpp
index b54d66408..9ad11c046 100644
--- a/lib/usrp/mboard/test.cpp
+++ b/lib/usrp/mboard/test.cpp
@@ -15,21 +15,21 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-#include <usrp_uhd/usrp/mboard/test.hpp>
-#include <usrp_uhd/utils.hpp>
-#include <usrp_uhd/props.hpp>
+#include <uhd/usrp/mboard/test.hpp>
+#include <uhd/utils.hpp>
+#include <uhd/props.hpp>
 #include <boost/lexical_cast.hpp>
 #include <boost/format.hpp>
 #include <stdexcept>
 
-using namespace usrp_uhd;
-using namespace usrp_uhd::usrp;
-using namespace usrp_uhd::usrp::mboard;
+using namespace uhd;
+using namespace uhd::usrp;
+using namespace uhd::usrp::mboard;
 
 /***********************************************************************
  * dummy interface for dboards
  **********************************************************************/
-class dummy_interface : public usrp_uhd::usrp::dboard::interface{
+class dummy_interface : public uhd::usrp::dboard::interface{
 public:
     dummy_interface(void){}
     ~dummy_interface(void){}
diff --git a/lib/usrp/mboard/usrp2.cpp b/lib/usrp/mboard/usrp2.cpp
index 7064f1460..ffbfe69fc 100644
--- a/lib/usrp/mboard/usrp2.cpp
+++ b/lib/usrp/mboard/usrp2.cpp
@@ -15,9 +15,9 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-#include <usrp_uhd/usrp/mboard/usrp2.hpp>
+#include <uhd/usrp/mboard/usrp2.hpp>
 #include "usrp2_fw_common.h"
-#include <usrp_uhd/device.hpp>
+#include <uhd/device.hpp>
 #include <boost/asio.hpp>
 #include <boost/thread.hpp>
 #include <boost/format.hpp>
@@ -25,8 +25,8 @@
 #include <boost/lexical_cast.hpp>
 #include <netinet/in.h>
 
-using namespace usrp_uhd;
-using namespace usrp_uhd::usrp::mboard;
+using namespace uhd;
+using namespace uhd::usrp::mboard;
 using boost::asio::ip::udp;
 
 /***********************************************************************
diff --git a/lib/usrp/usrp.cpp b/lib/usrp/usrp.cpp
index e3016be5f..59dd49dd1 100644
--- a/lib/usrp/usrp.cpp
+++ b/lib/usrp/usrp.cpp
@@ -15,24 +15,24 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-#include <usrp_uhd/usrp/usrp.hpp>
-#include <usrp_uhd/usrp/mboard/test.hpp>
-#include <usrp_uhd/utils.hpp>
+#include <uhd/usrp/usrp.hpp>
+#include <uhd/usrp/mboard/test.hpp>
+#include <uhd/utils.hpp>
 #include <boost/format.hpp>
 #include <boost/bind.hpp>
 #include <stdexcept>
 
-using namespace usrp_uhd::usrp;
+using namespace uhd::usrp;
 
 /***********************************************************************
  * default callbacks for the send and recv
  * these should be replaced with callbacks from the mboard object
  **********************************************************************/
-static void send_raw_default(const usrp_uhd::device::send_args_t &){
+static void send_raw_default(const uhd::device::send_args_t &){
     throw std::runtime_error("No callback registered for send raw");
 }
 
-static void recv_raw_default(const usrp_uhd::device::recv_args_t &){
+static void recv_raw_default(const uhd::device::recv_args_t &){
     throw std::runtime_error("No callback registered for recv raw");
 }
 
diff --git a/lib/wax.cpp b/lib/wax.cpp
index ce9705b1e..24f89288c 100644
--- a/lib/wax.cpp
+++ b/lib/wax.cpp
@@ -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/format.hpp>
 #include <stdexcept>
 
diff --git a/test/Makefile.am b/test/Makefile.am
index 83214efec..a010c15cb 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -26,7 +26,7 @@ AM_CPPFLAGS = $(GENERAL_CPPFLAGS)
 LDADD = \
 	$(GENERAL_LDDFLAGS) \
 	$(BOOST_UNIT_TEST_FRAMEWORK_LIB) \
-	$(USRP_UHD_LA)
+	$(UHD_LA)
 
 noinst_PROGRAMS = main_test
 
diff --git a/test/addr_test.cpp b/test/addr_test.cpp
index c5823cc65..148aee015 100644
--- a/test/addr_test.cpp
+++ b/test/addr_test.cpp
@@ -16,12 +16,12 @@
 //
 
 #include <boost/test/unit_test.hpp>
-#include <usrp_uhd/device_addr.hpp>
+#include <uhd/device_addr.hpp>
 
 BOOST_AUTO_TEST_CASE(test_mac_addr){
     std::cout << "Testing mac addr..." << std::endl;
     const std::string mac_addr_str("00:01:23:45:67:89");
-    usrp_uhd::mac_addr_t mac_addr(mac_addr_str);
+    uhd::mac_addr_t mac_addr(mac_addr_str);
     std::cout << "Input: " << mac_addr_str << std::endl;
     std::cout << "Output: " << mac_addr << std::endl;
     BOOST_CHECK_EQUAL(mac_addr_str, mac_addr.to_string());
diff --git a/test/device_test.cpp b/test/device_test.cpp
index 328ea9c0c..a868cf9f6 100644
--- a/test/device_test.cpp
+++ b/test/device_test.cpp
@@ -16,9 +16,9 @@
 //
 
 #include <boost/test/unit_test.hpp>
-#include <usrp_uhd/device.hpp>
+#include <uhd/device.hpp>
 
-using namespace usrp_uhd;
+using namespace uhd;
 
 BOOST_AUTO_TEST_CASE(test_device){
     device_addr_t device_addr(DEVICE_ADDR_TYPE_VIRTUAL);
diff --git a/test/gain_handler_test.cpp b/test/gain_handler_test.cpp
index 074a67ec8..30e88c445 100644
--- a/test/gain_handler_test.cpp
+++ b/test/gain_handler_test.cpp
@@ -16,11 +16,11 @@
 //
 
 #include <boost/test/unit_test.hpp>
-#include <usrp_uhd/gain_handler.hpp>
-#include <usrp_uhd/utils.hpp>
+#include <uhd/gain_handler.hpp>
+#include <uhd/utils.hpp>
 #include <iostream>
 
-using namespace usrp_uhd;
+using namespace uhd;
 
 enum prop_t{
     PROP_GAIN,
diff --git a/test/usrp_dboard_test.cpp b/test/usrp_dboard_test.cpp
index 5bd086dc1..a66dfd190 100644
--- a/test/usrp_dboard_test.cpp
+++ b/test/usrp_dboard_test.cpp
@@ -16,9 +16,9 @@
 //
 
 #include <boost/test/unit_test.hpp>
-#include <usrp_uhd/usrp/dboard/manager.hpp>
+#include <uhd/usrp/dboard/manager.hpp>
 
-using namespace usrp_uhd::usrp::dboard;
+using namespace uhd::usrp::dboard;
 
 /***********************************************************************
  * dummy interface for dboards
diff --git a/test/wax_test.cpp b/test/wax_test.cpp
index de66a9f64..f51860c13 100644
--- a/test/wax_test.cpp
+++ b/test/wax_test.cpp
@@ -16,7 +16,7 @@
 //
 
 #include <boost/test/unit_test.hpp>
-#include <usrp_uhd/wax.hpp>
+#include <uhd/wax.hpp>
 
 enum opt_a_t{OPTION_A_0, OPTION_A_1};
 enum opt_b_t{OPTION_B_0, OPTION_B_1};
diff --git a/usrp_uhd.pc.in b/uhd.pc.in
index 18194a741..58516c025 100644
--- a/usrp_uhd.pc.in
+++ b/uhd.pc.in
@@ -3,9 +3,9 @@ exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@
 
-Name: usrp_uhd
+Name: uhd
 Description: Universal Software Radio Peripheral - Unified Hardware Driver
 Requires: 
 Version: @VERSION@
-Libs: -L${libdir} -lusrp_uhd
+Libs: -L${libdir} -luhd
 Cflags: -I${includedir}