diff --git a/include/ur_rtde_driver/bin_parser.h b/include/ur_rtde_driver/bin_parser.h
index 1915ddd..816be8f 100644
--- a/include/ur_rtde_driver/bin_parser.h
+++ b/include/ur_rtde_driver/bin_parser.h
@@ -29,7 +29,7 @@
 #include "ur_rtde_driver/log.h"
 #include "ur_rtde_driver/types.h"
 
-namespace ur_rtde_driver
+namespace ur_driver
 {
 class BinParser
 {
@@ -203,4 +203,4 @@ public:
     LOG_DEBUG("BinParser: %p - %p (%zu bytes)", buf_pos_, buf_end_, buf_end_ - buf_pos_);
   }
 };
-}  // namespace ur_rtde_driver
+}  // namespace ur_driver
diff --git a/include/ur_rtde_driver/comm/package.h b/include/ur_rtde_driver/comm/package.h
index a88b86f..e73ba4c 100644
--- a/include/ur_rtde_driver/comm/package.h
+++ b/include/ur_rtde_driver/comm/package.h
@@ -44,5 +44,5 @@ private:
   HeaderT header_;
 };
 }  // namespace comm
-}  // namespace ur_rtde_driver
+}  // namespace ur_driver
 #endif  // ifndef UR_RTDE_DRIVER_PACKAGE_H_INCLUDED
diff --git a/include/ur_rtde_driver/comm/parser.h b/include/ur_rtde_driver/comm/parser.h
index db3c0aa..97bc7d6 100644
--- a/include/ur_rtde_driver/comm/parser.h
+++ b/include/ur_rtde_driver/comm/parser.h
@@ -21,7 +21,7 @@
 #include "ur_rtde_driver/bin_parser.h"
 #include "ur_rtde_driver/comm/pipeline.h"
 
-namespace ur_rtde_driver
+namespace ur_driver
 {
 namespace comm
 {
@@ -33,4 +33,4 @@ public:
 };  // namespace commtemplate<typenameT>classURParser
 
 }  // namespace comm
-}  // namespace ur_rtde_driver
+}  // namespace ur_driver
diff --git a/include/ur_rtde_driver/comm/pipeline.h b/include/ur_rtde_driver/comm/pipeline.h
index 3e7cf30..b32145f 100644
--- a/include/ur_rtde_driver/comm/pipeline.h
+++ b/include/ur_rtde_driver/comm/pipeline.h
@@ -25,7 +25,7 @@
 #include "ur_rtde_driver/log.h"
 #include "ur_rtde_driver/queue/readerwriterqueue.h"
 
-namespace ur_rtde_driver
+namespace ur_driver
 {
 namespace comm
 {
@@ -235,4 +235,4 @@ public:
   }
 };
 }  // namespace comm
-}  // namespace ur_rtde_driver
+}  // namespace ur_driver
diff --git a/include/ur_rtde_driver/comm/stream.h b/include/ur_rtde_driver/comm/stream.h
index b70560b..9f8c3ff 100644
--- a/include/ur_rtde_driver/comm/stream.h
+++ b/include/ur_rtde_driver/comm/stream.h
@@ -26,7 +26,7 @@
 #include "ur_rtde_driver/log.h"
 #include "ur_rtde_driver/comm/tcp_socket.h"
 
-namespace ur_rtde_driver
+namespace ur_driver
 {
 namespace comm
 {
@@ -67,4 +67,4 @@ public:
   bool write(const uint8_t* buf, size_t buf_len, size_t& written);
 };
 }  // namespace comm
-}  // namespace ur_rtde_driver
+}  // namespace ur_driver
diff --git a/include/ur_rtde_driver/comm/tcp_socket.h b/include/ur_rtde_driver/comm/tcp_socket.h
index acf85dc..32c4b01 100644
--- a/include/ur_rtde_driver/comm/tcp_socket.h
+++ b/include/ur_rtde_driver/comm/tcp_socket.h
@@ -24,7 +24,7 @@
 #include <mutex>
 #include <string>
 
-namespace ur_rtde_driver
+namespace ur_driver
 {
 namespace comm
 {
@@ -75,4 +75,4 @@ public:
   void close();
 };
 }  // namespace comm
-}  // namespace ur_rtde_driver
+}  // namespace ur_driver
diff --git a/include/ur_rtde_driver/event_counter.h b/include/ur_rtde_driver/event_counter.h
index 46a25fd..dce873f 100644
--- a/include/ur_rtde_driver/event_counter.h
+++ b/include/ur_rtde_driver/event_counter.h
@@ -23,7 +23,7 @@
 #include "ur_rtde_driver/log.h"
 #include "ur_rtde_driver/ur/consumer.h"
 
-namespace ur_rtde_driver
+namespace ur_driver
 {
 class EventCounter : public URRTPacketConsumer
 {
@@ -102,4 +102,4 @@ public:
   {
   }
 };
-}  // namespace ur_rtde_driver
+}  // namespace ur_driver
diff --git a/include/ur_rtde_driver/ros/io_service.h b/include/ur_rtde_driver/ros/io_service.h
index 293ab9e..72e630c 100644
--- a/include/ur_rtde_driver/ros/io_service.h
+++ b/include/ur_rtde_driver/ros/io_service.h
@@ -28,7 +28,7 @@
 #include "ur_rtde_driver/log.h"
 #include "ur_rtde_driver/ur/commander.h"
 
-namespace ur_rtde_driver
+namespace ur_driver
 {
 class IOService
 {
@@ -79,4 +79,4 @@ public:
   {
   }
 };
-}  // namespace ur_rtde_driver
+}  // namespace ur_driver
diff --git a/include/ur_rtde_driver/ros/service_stopper.h b/include/ur_rtde_driver/ros/service_stopper.h
index bb5cac4..07dd3fb 100644
--- a/include/ur_rtde_driver/ros/service_stopper.h
+++ b/include/ur_rtde_driver/ros/service_stopper.h
@@ -22,7 +22,7 @@
 #include "ur_rtde_driver/log.h"
 #include "ur_rtde_driver/ur/consumer.h"
 
-namespace ur_rtde_driver
+namespace ur_driver
 {
 enum class RobotState
 {
@@ -88,4 +88,4 @@ public:
     return true;
   }
 };
-}  // namespace ur_rtde_driver
+}  // namespace ur_driver
diff --git a/include/ur_rtde_driver/test/random_data.h b/include/ur_rtde_driver/test/random_data.h
index a280588..9cde66e 100644
--- a/include/ur_rtde_driver/test/random_data.h
+++ b/include/ur_rtde_driver/test/random_data.h
@@ -26,7 +26,7 @@
 #include <random>
 #include "ur_rtde_driver/bin_parser.h"
 
-namespace ur_rtde_driver
+namespace ur_driver
 {
 class RandomDataTest
 {
@@ -80,4 +80,4 @@ public:
     bp_.consume(n);
   }
 };
-}  // namespace ur_rtde_driver
+}  // namespace ur_driver
diff --git a/include/ur_rtde_driver/types.h b/include/ur_rtde_driver/types.h
index b5f4f1e..e2c1fa6 100644
--- a/include/ur_rtde_driver/types.h
+++ b/include/ur_rtde_driver/types.h
@@ -20,7 +20,7 @@
 
 #include <inttypes.h>
 
-namespace ur_rtde_driver
+namespace ur_driver
 {
 struct double3_t
 {
@@ -42,4 +42,4 @@ inline bool operator==(const cartesian_coord_t& lhs, const cartesian_coord_t& rh
 {
   return lhs.position == rhs.position && lhs.rotation == rhs.rotation;
 }
-}  // namespace ur_rtde_driver
+}  // namespace ur_driver
diff --git a/include/ur_rtde_driver/ur/commander.h b/include/ur_rtde_driver/ur/commander.h
index c316d78..6aaff47 100644
--- a/include/ur_rtde_driver/ur/commander.h
+++ b/include/ur_rtde_driver/ur/commander.h
@@ -22,7 +22,7 @@
 #include <sstream>
 #include "ur_rtde_driver/comm/stream.h"
 
-namespace ur_rtde_driver
+namespace ur_driver
 {
 class URCommander
 {
@@ -93,4 +93,4 @@ public:
 
   virtual bool speedj(std::array<double, 6>& speeds, double acceleration);
 };
-}  // namespace ur_rtde_driver
+}  // namespace ur_driver
diff --git a/include/ur_rtde_driver/ur/consumer.h b/include/ur_rtde_driver/ur/consumer.h
index b3bd249..fb0a04c 100644
--- a/include/ur_rtde_driver/ur/consumer.h
+++ b/include/ur_rtde_driver/ur/consumer.h
@@ -25,7 +25,7 @@
 #include "ur_rtde_driver/ur/rt_state.h"
 #include "ur_rtde_driver/ur/state.h"
 
-namespace ur_rtde_driver
+namespace ur_driver
 {
 class URRTPacketConsumer : public comm::IConsumer<RTPacket>
 {
@@ -68,4 +68,4 @@ public:
 
   virtual bool consume(VersionMessage& message) = 0;
 };
-}  // namespace ur_rtde_driver
+}  // namespace ur_driver
diff --git a/include/ur_rtde_driver/ur/factory.h b/include/ur_rtde_driver/ur/factory.h
index ca52b02..2cbe47f 100644
--- a/include/ur_rtde_driver/ur/factory.h
+++ b/include/ur_rtde_driver/ur/factory.h
@@ -27,7 +27,7 @@
 #include "ur_rtde_driver/ur/rt_parser.h"
 #include "ur_rtde_driver/ur/state_parser.h"
 
-namespace ur_rtde_driver
+namespace ur_driver
 {
 static const int UR_PRIMARY_PORT = 30001;
 
@@ -141,4 +141,4 @@ public:
     }
   }
 };
-}  // namespace ur_rtde_driver
+}  // namespace ur_driver
diff --git a/include/ur_rtde_driver/ur/master_board.h b/include/ur_rtde_driver/ur/master_board.h
index 96fac79..617cca8 100644
--- a/include/ur_rtde_driver/ur/master_board.h
+++ b/include/ur_rtde_driver/ur/master_board.h
@@ -25,7 +25,7 @@
 #include "ur_rtde_driver/types.h"
 #include "ur_rtde_driver/ur/state.h"
 
-namespace ur_rtde_driver
+namespace ur_driver
 {
 class SharedMasterBoardData
 {
@@ -110,4 +110,4 @@ public:
 
   static const size_t SIZE = MasterBoardData_V3_0__1::SIZE + sizeof(uint8_t) * 2;
 };
-}  // namespace ur_rtde_driver
+}  // namespace ur_driver
diff --git a/include/ur_rtde_driver/ur/messages.h b/include/ur_rtde_driver/ur/messages.h
index 025a206..da06368 100644
--- a/include/ur_rtde_driver/ur/messages.h
+++ b/include/ur_rtde_driver/ur/messages.h
@@ -23,7 +23,7 @@
 #include "ur_rtde_driver/bin_parser.h"
 #include "ur_rtde_driver/comm/pipeline.h"
 
-namespace ur_rtde_driver
+namespace ur_driver
 {
 enum class robot_message_type : uint8_t
 {
@@ -69,4 +69,4 @@ public:
   int32_t svn_version;
   std::string build_date;
 };
-}  // namespace ur_rtde_driver
+}  // namespace ur_driver
diff --git a/include/ur_rtde_driver/ur/messages_parser.h b/include/ur_rtde_driver/ur/messages_parser.h
index 278d8d0..129890c 100644
--- a/include/ur_rtde_driver/ur/messages_parser.h
+++ b/include/ur_rtde_driver/ur/messages_parser.h
@@ -24,7 +24,7 @@
 #include "ur_rtde_driver/comm/pipeline.h"
 #include "ur_rtde_driver/ur/messages.h"
 
-namespace ur_rtde_driver
+namespace ur_driver
 {
 class URMessageParser : public comm::URParser<MessagePacket>
 {
@@ -71,4 +71,4 @@ public:
     return parsed;
   }
 };
-}  // namespace ur_rtde_driver
+}  // namespace ur_driver
diff --git a/include/ur_rtde_driver/ur/producer.h b/include/ur_rtde_driver/ur/producer.h
index e4626d5..186e8f9 100644
--- a/include/ur_rtde_driver/ur/producer.h
+++ b/include/ur_rtde_driver/ur/producer.h
@@ -22,7 +22,7 @@
 #include "ur_rtde_driver/comm/parser.h"
 #include "ur_rtde_driver/comm/stream.h"
 
-namespace ur_rtde_driver
+namespace ur_driver
 {
 template <typename T>
 class URProducer : public comm::IProducer<T>
@@ -83,4 +83,4 @@ public:
     return parser_.parse(bp, products);
   }
 };
-}  // namespace ur_rtde_driver
+}  // namespace ur_driver
diff --git a/include/ur_rtde_driver/ur/robot_mode.h b/include/ur_rtde_driver/ur/robot_mode.h
index 0f0e5a5..51e599f 100644
--- a/include/ur_rtde_driver/ur/robot_mode.h
+++ b/include/ur_rtde_driver/ur/robot_mode.h
@@ -24,7 +24,7 @@
 #include "ur_rtde_driver/types.h"
 #include "ur_rtde_driver/ur/state.h"
 
-namespace ur_rtde_driver
+namespace ur_driver
 {
 class SharedRobotModeData
 {
@@ -136,4 +136,4 @@ public:
 
   static_assert(RobotModeData_V3_5::SIZE == 42, "RobotModeData_V3_5 has missmatched size");
 };
-}  // namespace ur_rtde_driver
+}  // namespace ur_driver
diff --git a/include/ur_rtde_driver/ur/rt_parser.h b/include/ur_rtde_driver/ur/rt_parser.h
index f66dd32..ec05281 100644
--- a/include/ur_rtde_driver/ur/rt_parser.h
+++ b/include/ur_rtde_driver/ur/rt_parser.h
@@ -24,7 +24,7 @@
 #include "ur_rtde_driver/comm/parser.h"
 #include "ur_rtde_driver/ur/rt_state.h"
 
-namespace ur_rtde_driver
+namespace ur_driver
 {
 template <typename T>
 class URRTStateParser : public comm::URParser<RTPacket>
@@ -56,4 +56,4 @@ typedef URRTStateParser<RTState_V1_6__7> URRTStateParser_V1_6__7;
 typedef URRTStateParser<RTState_V1_8> URRTStateParser_V1_8;
 typedef URRTStateParser<RTState_V3_0__1> URRTStateParser_V3_0__1;
 typedef URRTStateParser<RTState_V3_2__3> URRTStateParser_V3_2__3;
-}  // namespace ur_rtde_driver
+}  // namespace ur_driver
diff --git a/include/ur_rtde_driver/ur/rt_state.h b/include/ur_rtde_driver/ur/rt_state.h
index bd50956..75be0f3 100644
--- a/include/ur_rtde_driver/ur/rt_state.h
+++ b/include/ur_rtde_driver/ur/rt_state.h
@@ -24,7 +24,7 @@
 #include "ur_rtde_driver/comm/pipeline.h"
 #include "ur_rtde_driver/types.h"
 
-namespace ur_rtde_driver
+namespace ur_driver
 {
 class URRTPacketConsumer;
 
@@ -137,4 +137,4 @@ public:
 
   static_assert(RTState_V3_2__3::SIZE == 936, "RTState_V3_2__3 has mismatched size!");
 };
-}  // namespace ur_rtde_driver
+}  // namespace ur_driver
diff --git a/include/ur_rtde_driver/ur/server.h b/include/ur_rtde_driver/ur/server.h
index 2d9c3a0..af687af 100644
--- a/include/ur_rtde_driver/ur/server.h
+++ b/include/ur_rtde_driver/ur/server.h
@@ -26,7 +26,7 @@
 #include <string>
 #include "ur_rtde_driver/comm/tcp_socket.h"
 
-namespace ur_rtde_driver
+namespace ur_driver
 {
 #define MAX_SERVER_BUF_LEN 50
 
@@ -49,4 +49,4 @@ public:
   bool readLine(char* buffer, size_t buf_len);
   bool write(const uint8_t* buf, size_t buf_len, size_t& written);
 };
-}  // namespace ur_rtde_driver
+}  // namespace ur_driver
diff --git a/include/ur_rtde_driver/ur/state.h b/include/ur_rtde_driver/ur/state.h
index cec1e52..c6e17ad 100644
--- a/include/ur_rtde_driver/ur/state.h
+++ b/include/ur_rtde_driver/ur/state.h
@@ -24,7 +24,7 @@
 #include "ur_rtde_driver/log.h"
 #include "ur_rtde_driver/comm/pipeline.h"
 
-namespace ur_rtde_driver
+namespace ur_driver
 {
 enum class package_type : uint8_t
 {
@@ -61,4 +61,4 @@ public:
   virtual bool parseWith(BinParser& bp) = 0;
   virtual bool consumeWith(URStatePacketConsumer& consumer) = 0;
 };
-}  // namespace ur_rtde_driver
+}  // namespace ur_driver
diff --git a/include/ur_rtde_driver/ur/state_parser.h b/include/ur_rtde_driver/ur/state_parser.h
index 40e00c2..b8675f1 100644
--- a/include/ur_rtde_driver/ur/state_parser.h
+++ b/include/ur_rtde_driver/ur/state_parser.h
@@ -26,7 +26,7 @@
 #include "ur_rtde_driver/ur/robot_mode.h"
 #include "ur_rtde_driver/ur/state.h"
 
-namespace ur_rtde_driver
+namespace ur_driver
 {
 template <typename RMD, typename MBD>
 class URStateParser : public comm::URParser<StatePacket>
@@ -117,4 +117,4 @@ typedef URStateParser<RobotModeData_V1_X, MasterBoardData_V1_X> URStateParser_V1
 typedef URStateParser<RobotModeData_V3_0__1, MasterBoardData_V3_0__1> URStateParser_V3_0__1;
 typedef URStateParser<RobotModeData_V3_2, MasterBoardData_V3_2> URStateParser_V3_2;
 typedef URStateParser<RobotModeData_V3_5, MasterBoardData_V3_2> URStateParser_V3_5;
-}  // namespace ur_rtde_driver
+}  // namespace ur_driver
diff --git a/src/comm/stream.cpp b/src/comm/stream.cpp
index a3536af..9ecb880 100644
--- a/src/comm/stream.cpp
+++ b/src/comm/stream.cpp
@@ -24,7 +24,7 @@
 #include "ur_rtde_driver/log.h"
 #include "ur_rtde_driver/comm/stream.h"
 
-namespace ur_rtde_driver
+namespace ur_driver
 {
 namespace comm
 {
@@ -65,4 +65,4 @@ bool URStream::read(uint8_t* buf, size_t buf_len, size_t& total)
   return remainder == 0;
 }
 }  // namespace comm
-}  // namespace ur_rtde_driver
+}  // namespace ur_driver
diff --git a/src/comm/tcp_socket.cpp b/src/comm/tcp_socket.cpp
index b9c9c77..577fd4e 100644
--- a/src/comm/tcp_socket.cpp
+++ b/src/comm/tcp_socket.cpp
@@ -27,7 +27,7 @@
 #include "ur_rtde_driver/log.h"
 #include "ur_rtde_driver/comm/tcp_socket.h"
 
-namespace ur_rtde_driver
+namespace ur_driver
 {
 namespace comm
 {
@@ -189,4 +189,4 @@ bool TCPSocket::write(const uint8_t* buf, size_t buf_len, size_t& written)
   return true;
 }
 }  // namespace comm
-}  // namespace ur_rtde_driver
+}  // namespace ur_driver
diff --git a/src/ros/service_stopper.cpp b/src/ros/service_stopper.cpp
index bf6d750..4daa42f 100644
--- a/src/ros/service_stopper.cpp
+++ b/src/ros/service_stopper.cpp
@@ -18,7 +18,7 @@
 
 #include "ur_rtde_driver/ros/service_stopper.h"
 
-namespace ur_rtde_driver
+namespace ur_driver
 {
 ServiceStopper::ServiceStopper(std::vector<Service*> services)
   : enable_service_(nh_.advertiseService("ur_driver/robot_enable", &ServiceStopper::enableCallback, this))
@@ -94,4 +94,4 @@ bool ServiceStopper::handle(SharedRobotModeData& data, bool error)
 
   return true;
 }
-}  // namespace ur_rtde_driver
+}  // namespace ur_driver
diff --git a/src/ur/commander.cpp b/src/ur/commander.cpp
index 450b4a3..cf392eb 100644
--- a/src/ur/commander.cpp
+++ b/src/ur/commander.cpp
@@ -19,7 +19,7 @@
 #include "ur_rtde_driver/ur/commander.h"
 #include "ur_rtde_driver/log.h"
 
-namespace ur_rtde_driver
+namespace ur_driver
 {
 bool URCommander::write(const std::string& s)
 {
@@ -170,4 +170,4 @@ bool URCommander_V3_3::speedj(std::array<double, 6>& speeds, double acceleration
   std::string s(out.str());
   return write(s);
 }
-}  // namespace ur_rtde_driver
+}  // namespace ur_driver
diff --git a/src/ur/master_board.cpp b/src/ur/master_board.cpp
index 59918d3..f8e33a9 100644
--- a/src/ur/master_board.cpp
+++ b/src/ur/master_board.cpp
@@ -19,7 +19,7 @@
 #include "ur_rtde_driver/ur/master_board.h"
 #include "ur_rtde_driver/ur/consumer.h"
 
-namespace ur_rtde_driver
+namespace ur_driver
 {
 bool SharedMasterBoardData::parseWith(BinParser& bp)
 {
@@ -121,4 +121,4 @@ bool MasterBoardData_V3_2::consumeWith(URStatePacketConsumer& consumer)
 {
   return consumer.consume(*this);
 }
-}  // namespace ur_rtde_driver
+}  // namespace ur_driver
diff --git a/src/ur/messages.cpp b/src/ur/messages.cpp
index 9ef8837..d809353 100644
--- a/src/ur/messages.cpp
+++ b/src/ur/messages.cpp
@@ -19,7 +19,7 @@
 #include "ur_rtde_driver/ur/messages.h"
 #include "ur_rtde_driver/ur/consumer.h"
 
-namespace ur_rtde_driver
+namespace ur_driver
 {
 bool VersionMessage::parseWith(BinParser& bp)
 {
@@ -37,4 +37,4 @@ bool VersionMessage::consumeWith(URMessagePacketConsumer& consumer)
 {
   return consumer.consume(*this);
 }
-}  // namespace ur_rtde_driver
+}  // namespace ur_driver
diff --git a/src/ur/robot_mode.cpp b/src/ur/robot_mode.cpp
index 4771c50..e66bbbd 100644
--- a/src/ur/robot_mode.cpp
+++ b/src/ur/robot_mode.cpp
@@ -19,7 +19,7 @@
 #include "ur_rtde_driver/ur/robot_mode.h"
 #include "ur_rtde_driver/ur/consumer.h"
 
-namespace ur_rtde_driver
+namespace ur_driver
 {
 bool SharedRobotModeData::parseWith(BinParser& bp)
 {
@@ -102,4 +102,4 @@ bool RobotModeData_V3_5::consumeWith(URStatePacketConsumer& consumer)
 {
   return consumer.consume(*this);
 }
-}  // namespace ur_rtde_driver
+}  // namespace ur_driver
diff --git a/src/ur/rt_state.cpp b/src/ur/rt_state.cpp
index ef545bc..e7b15ed 100644
--- a/src/ur/rt_state.cpp
+++ b/src/ur/rt_state.cpp
@@ -19,7 +19,7 @@
 #include "ur_rtde_driver/ur/rt_state.h"
 #include "ur_rtde_driver/ur/consumer.h"
 
-namespace ur_rtde_driver
+namespace ur_driver
 {
 void RTShared::parse_shared1(BinParser& bp)
 {
@@ -135,4 +135,4 @@ bool RTState_V3_2__3::consumeWith(URRTPacketConsumer& consumer)
 {
   return consumer.consume(*this);
 }
-}  // namespace ur_rtde_driver
+}  // namespace ur_driver
diff --git a/src/ur/server.cpp b/src/ur/server.cpp
index 9e21865..40e72c0 100644
--- a/src/ur/server.cpp
+++ b/src/ur/server.cpp
@@ -25,7 +25,7 @@
 #include <cstring>
 #include "ur_rtde_driver/log.h"
 
-namespace ur_rtde_driver
+namespace ur_driver
 {
 URServer::URServer(int port) : port_(port)
 {
@@ -151,4 +151,4 @@ bool URServer::readLine(char* buffer, size_t buf_len)
   *current_pointer = '\0';
   return true;
 }
-}  // namespace ur_rtde_driver
+}  // namespace ur_driver
diff --git a/tests/ur/master_board.cpp b/tests/ur/master_board.cpp
index 2b024ee..c211763 100644
--- a/tests/ur/master_board.cpp
+++ b/tests/ur/master_board.cpp
@@ -22,7 +22,7 @@
 #include "ur_rtde_driver/test/utils.h"
 #include "ur_rtde_driver/types.h"
 
-using namespace ur_rtde_driver;
+using namespace ur_driver;
 
 TEST(MasterBoardData_V1_X, testRandomDataParsing)
 {
diff --git a/tests/ur/robot_mode.cpp b/tests/ur/robot_mode.cpp
index abb01bb..7c4652c 100644
--- a/tests/ur/robot_mode.cpp
+++ b/tests/ur/robot_mode.cpp
@@ -22,7 +22,7 @@
 #include "ur_rtde_driver/test/utils.h"
 #include "ur_rtde_driver/types.h"
 
-using namespace ur_rtde_driver;
+using namespace ur_driver;
 TEST(RobotModeData_V1_X, testRandomDataParsing)
 {
   RandomDataTest rdt(24);
diff --git a/tests/ur/rt_state.cpp b/tests/ur/rt_state.cpp
index 45ac796..8dc78ee 100644
--- a/tests/ur/rt_state.cpp
+++ b/tests/ur/rt_state.cpp
@@ -22,7 +22,7 @@
 #include "ur_rtde_driver/test/utils.h"
 #include "ur_rtde_driver/types.h"
 
-using namespace ur_rtde_driver;
+using namespace ur_driver;
 
 TEST(RTState_V1_6__7, testRandomDataParsing)
 {