10 files changed, 33 insertions, 33 deletions
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");
 }