diff --git a/services/surfaceflinger/DisplayHardware/DisplayHardwareBase.cpp b/services/surfaceflinger/DisplayHardware/DisplayDeviceBase.cpp
similarity index 72%
rename from services/surfaceflinger/DisplayHardware/DisplayHardwareBase.cpp
rename to services/surfaceflinger/DisplayHardware/DisplayDeviceBase.cpp
index 4141181..e0a4de6 100644
--- a/services/surfaceflinger/DisplayHardware/DisplayHardwareBase.cpp
+++ b/services/surfaceflinger/DisplayHardware/DisplayDeviceBase.cpp
@@ -17,31 +17,31 @@
 #include <stdint.h>
 #include <sys/types.h>
 
-#include "DisplayHardware/DisplayHardwareBase.h"
+#include "DisplayHardware/DisplayDeviceBase.h"
 
 // ----------------------------------------------------------------------------
 namespace android {
 
-DisplayHardwareBase::DisplayHardwareBase(uint32_t displayIndex) {
+DisplayDeviceBase::DisplayDeviceBase(uint32_t displayIndex) {
     mScreenAcquired = true;
 }
 
-DisplayHardwareBase::~DisplayHardwareBase() {
+DisplayDeviceBase::~DisplayDeviceBase() {
 }
 
-bool DisplayHardwareBase::canDraw() const {
+bool DisplayDeviceBase::canDraw() const {
     return mScreenAcquired;
 }
 
-void DisplayHardwareBase::releaseScreen() const {
+void DisplayDeviceBase::releaseScreen() const {
     mScreenAcquired = false;
 }
 
-void DisplayHardwareBase::acquireScreen() const {
+void DisplayDeviceBase::acquireScreen() const {
     mScreenAcquired = true;
 }
 
-bool DisplayHardwareBase::isScreenAcquired() const {
+bool DisplayDeviceBase::isScreenAcquired() const {
     return mScreenAcquired;
 }
 
diff --git a/services/surfaceflinger/DisplayHardware/DisplayHardwareBase.h b/services/surfaceflinger/DisplayHardware/DisplayDeviceBase.h
similarity index 90%
rename from services/surfaceflinger/DisplayHardware/DisplayHardwareBase.h
rename to services/surfaceflinger/DisplayHardware/DisplayDeviceBase.h
index e6eb2b5..9432cf2 100644
--- a/services/surfaceflinger/DisplayHardware/DisplayHardwareBase.h
+++ b/services/surfaceflinger/DisplayHardware/DisplayDeviceBase.h
@@ -21,10 +21,10 @@
 
 namespace android {
 
-class DisplayHardwareBase {
+class DisplayDeviceBase {
 public:
-    DisplayHardwareBase(uint32_t displayIndex);
-    ~DisplayHardwareBase();
+    DisplayDeviceBase(uint32_t displayIndex);
+    ~DisplayDeviceBase();
 
     // console management
     void releaseScreen() const;