diff --git a/FeedbackServo.h b/FeedbackServo.h
index 6d2085e..5201b9d 100644
--- a/FeedbackServo.h
+++ b/FeedbackServo.h
@@ -1,11 +1,11 @@
 #pragma once
 
-#include "Servo.h"
+#include "ServoMotor.h"
 
 namespace Passer {
 namespace RoboidContol {
 
-class FeedbackServo : public Servo {
+class FeedbackServo : public ServoMotor {
 public:
   FeedbackServo();
 
diff --git a/Servo.h b/ServoMotor.h
similarity index 82%
rename from Servo.h
rename to ServoMotor.h
index 27cd9e3..748d502 100644
--- a/Servo.h
+++ b/ServoMotor.h
@@ -5,9 +5,9 @@
 namespace Passer {
 namespace RoboidContol {
 
-class Servo : public Thing {
+class ServoMotor : public Thing {
 public:
-  Servo();
+  ServoMotor();
 
   virtual void SetTargetAngle(float angle) = 0;
 };