compiling with master merge, renamed usrp1e to usrp_e

2 files changed, 11 insertions, 11 deletions

diff --git a/host/include/uhd/usrp/CMakeLists.txt b/host/include/uhd/usrp/CMakeLists.txt
index bab01fdeb..b9be370bd 100644
--- a/host/include/uhd/usrp/CMakeLists.txt
+++ b/host/include/uhd/usrp/CMakeLists.txt
@@ -21,7 +21,7 @@ INSTALL(FILES
     dboard_id.hpp
     dboard_interface.hpp
     dboard_manager.hpp
-    usrp1e.hpp
+    usrp_e.hpp
     usrp2.hpp
     DESTINATION ${INCLUDE_DIR}/uhd/usrp
 )
diff --git a/host/include/uhd/usrp/usrp1e.hpp b/host/include/uhd/usrp/usrp_e.hpp
index 75da58453..557058261 100644
--- a/host/include/uhd/usrp/usrp1e.hpp
+++ b/host/include/uhd/usrp/usrp_e.hpp
@@ -15,8 +15,8 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-#ifndef INCLUDED_UHD_USRP_USRP1E_HPP
-#define INCLUDED_UHD_USRP_USRP1E_HPP
+#ifndef INCLUDED_UHD_USRP_USRP_E_HPP
+#define INCLUDED_UHD_USRP_USRP_E_HPP
 
 #include <uhd/config.hpp>
 #include <uhd/device.hpp>
@@ -24,21 +24,21 @@
 namespace uhd{ namespace usrp{
 
 /*!
- * The usrp1e device class.
+ * The USRP-Embedded device class.
  */
-class UHD_API usrp1e : public device{
+class UHD_API usrp_e : public device{
 public:
     /*!
-     * Find usrp1e devices on the system via the device node.
-     * \param hint a device addr with the usrp1e address filled in
-     * \return a vector of device addresses for all usrp1es found
+     * Find usrp_e devices on the system via the device node.
+     * \param hint a device addr with the usrp_e address filled in
+     * \return a vector of device addresses for all usrp-e's found
      */
     static device_addrs_t find(const device_addr_t &hint);
 
     /*!
-     * Make a usrp1e from a device address.
+     * Make a usrp_e from a device address.
      * \param addr the device address
-     * \return a device sptr to a new usrp1e
+     * \return a device sptr to a new usrp_e
      */
     static device::sptr make(const device_addr_t &addr);
 
@@ -51,4 +51,4 @@ public:
 
 }} //namespace
 
-#endif /* INCLUDED_UHD_USRP_USRP1E_HPP */
+#endif /* INCLUDED_UHD_USRP_USRP_E_HPP */