diff --git a/include/ugv_sdk/details/interface/robot_interface.hpp b/include/ugv_sdk/details/interface/robot_common_interface.hpp
similarity index 97%
rename from include/ugv_sdk/details/interface/robot_interface.hpp
rename to include/ugv_sdk/details/interface/robot_common_interface.hpp
index c407731..fc4a1f7 100644
--- a/include/ugv_sdk/details/interface/robot_interface.hpp
+++ b/include/ugv_sdk/details/interface/robot_common_interface.hpp
@@ -34,9 +34,9 @@ struct ActuatorStateMsgGroup {
 
 struct CommonSensorStateMsgGroup {};
 
-class RobotInterface {
+class RobotCommonInterface {
  public:
-  ~RobotInterface() = default;
+  ~RobotCommonInterface() = default;
 
   // functions to be implemented by class AgilexBase
   virtual void EnableCommandedMode() = 0;
diff --git a/include/ugv_sdk/details/robot_base/agilex_base.hpp b/include/ugv_sdk/details/robot_base/agilex_base.hpp
index 4d42e3a..e4e17b3 100644
--- a/include/ugv_sdk/details/robot_base/agilex_base.hpp
+++ b/include/ugv_sdk/details/robot_base/agilex_base.hpp
@@ -24,11 +24,11 @@
 
 #include "ugv_sdk/details/stopwatch.hpp"
 #include "ugv_sdk/details/async_port/async_can.hpp"
-#include "ugv_sdk/details/interface/robot_interface.hpp"
+#include "ugv_sdk/details/interface/robot_common_interface.hpp"
 
 namespace westonrobot {
 template <typename ParserType>
-class AgilexBase : public RobotInterface {
+class AgilexBase : public RobotCommonInterface {
  public:
   AgilexBase() = default;
   virtual ~AgilexBase() { DisconnectPort(); }
diff --git a/include/ugv_sdk/mobile_robot/bunker_robot.hpp b/include/ugv_sdk/mobile_robot/bunker_robot.hpp
index 01bdce7..9deae3b 100644
--- a/include/ugv_sdk/mobile_robot/bunker_robot.hpp
+++ b/include/ugv_sdk/mobile_robot/bunker_robot.hpp
@@ -12,11 +12,11 @@
 
 #include <memory>
 
-#include "ugv_sdk/details/interface/robot_interface.hpp"
+#include "ugv_sdk/details/interface/robot_common_interface.hpp"
 #include "ugv_sdk/details/interface/bunker_interface.hpp"
 
 namespace westonrobot {
-class BunkerRobot : public RobotInterface, public BunkerInterface {
+class BunkerRobot : public RobotCommonInterface, public BunkerInterface {
  public:
   BunkerRobot(ProtocolVersion protocol = ProtocolVersion::AGX_V2);
   ~BunkerRobot();
@@ -35,7 +35,7 @@ class BunkerRobot : public RobotInterface, public BunkerInterface {
   BunkerCoreState GetRobotState() override;
 
  private:
-  RobotInterface* robot_;
+  RobotCommonInterface* robot_;
 };
 }  // namespace westonrobot
 
diff --git a/include/ugv_sdk/mobile_robot/hunter_robot.hpp b/include/ugv_sdk/mobile_robot/hunter_robot.hpp
index 30df4e4..f60ceab 100644
--- a/include/ugv_sdk/mobile_robot/hunter_robot.hpp
+++ b/include/ugv_sdk/mobile_robot/hunter_robot.hpp
@@ -12,11 +12,11 @@
 
 #include <memory>
 
-#include "ugv_sdk/details/interface/robot_interface.hpp"
+#include "ugv_sdk/details/interface/robot_common_interface.hpp"
 #include "ugv_sdk/details/interface/hunter_interface.hpp"
 
 namespace westonrobot {
-class HunterRobot : public RobotInterface, public HunterInterface {
+class HunterRobot : public RobotCommonInterface, public HunterInterface {
  public:
   HunterRobot(ProtocolVersion protocol = ProtocolVersion::AGX_V2);
   ~HunterRobot();
@@ -36,7 +36,7 @@ class HunterRobot : public RobotInterface, public HunterInterface {
   HunterActuatorState GetActuatorState() override;
 
  private:
-  RobotInterface* robot_;
+  RobotCommonInterface* robot_;
 };
 }  // namespace westonrobot
 
diff --git a/include/ugv_sdk/mobile_robot/scout_robot.hpp b/include/ugv_sdk/mobile_robot/scout_robot.hpp
index edfe0e6..4717832 100644
--- a/include/ugv_sdk/mobile_robot/scout_robot.hpp
+++ b/include/ugv_sdk/mobile_robot/scout_robot.hpp
@@ -12,11 +12,11 @@
 
 #include <memory>
 
-#include "ugv_sdk/details/interface/robot_interface.hpp"
+#include "ugv_sdk/details/interface/robot_common_interface.hpp"
 #include "ugv_sdk/details/interface/scout_interface.hpp"
 
 namespace westonrobot {
-class ScoutRobot : public RobotInterface, public ScoutInterface {
+class ScoutRobot : public RobotCommonInterface, public ScoutInterface {
  public:
   ScoutRobot(ProtocolVersion protocol = ProtocolVersion::AGX_V2,
              bool is_mini_model = false);
@@ -41,7 +41,7 @@ class ScoutRobot : public RobotInterface, public ScoutInterface {
   ScoutActuatorState GetActuatorState() override;
 
  private:
-  RobotInterface* robot_;
+  RobotCommonInterface* robot_;
 };
 }  // namespace westonrobot