diff --git a/drm/drmconnector.cpp b/drm/DrmConnector.cpp
similarity index 99%
rename from drm/drmconnector.cpp
rename to drm/DrmConnector.cpp
index 81c2b98..8fa47f5 100644
--- a/drm/drmconnector.cpp
+++ b/drm/DrmConnector.cpp
@@ -16,17 +16,17 @@
 
 #define LOG_TAG "hwc-drm-connector"
 
-#include "drmconnector.h"
-#include "drmdevice.h"
+#include "DrmConnector.h"
 
 #include <errno.h>
+#include <log/log.h>
 #include <stdint.h>
+#include <xf86drmMode.h>
 
 #include <array>
 #include <sstream>
 
-#include <log/log.h>
-#include <xf86drmMode.h>
+#include "DrmDevice.h"
 
 namespace android {
 
diff --git a/drm/drmconnector.h b/drm/DrmConnector.h
similarity index 97%
rename from drm/drmconnector.h
rename to drm/DrmConnector.h
index 0c19c55..3fdf146 100644
--- a/drm/drmconnector.h
+++ b/drm/DrmConnector.h
@@ -23,9 +23,9 @@
 #include <string>
 #include <vector>
 
-#include "drmencoder.h"
-#include "drmmode.h"
-#include "drmproperty.h"
+#include "DrmEncoder.h"
+#include "DrmMode.h"
+#include "DrmProperty.h"
 
 namespace android {
 
diff --git a/drm/drmcrtc.cpp b/drm/DrmCrtc.cpp
similarity index 97%
rename from drm/drmcrtc.cpp
rename to drm/DrmCrtc.cpp
index b627291..4ce8cfc 100644
--- a/drm/drmcrtc.cpp
+++ b/drm/DrmCrtc.cpp
@@ -16,13 +16,13 @@
 
 #define LOG_TAG "hwc-drm-crtc"
 
-#include "drmcrtc.h"
-#include "drmdevice.h"
+#include "DrmCrtc.h"
 
+#include <log/log.h>
 #include <stdint.h>
 #include <xf86drmMode.h>
 
-#include <log/log.h>
+#include "DrmDevice.h"
 
 namespace android {
 
diff --git a/drm/drmcrtc.h b/drm/DrmCrtc.h
similarity index 96%
rename from drm/drmcrtc.h
rename to drm/DrmCrtc.h
index 132c2d3..7972bef 100644
--- a/drm/drmcrtc.h
+++ b/drm/DrmCrtc.h
@@ -20,8 +20,8 @@
 #include <stdint.h>
 #include <xf86drmMode.h>
 
-#include "drmmode.h"
-#include "drmproperty.h"
+#include "DrmMode.h"
+#include "DrmProperty.h"
 
 namespace android {
 
diff --git a/drm/drmdevice.cpp b/drm/DrmDevice.cpp
similarity index 99%
rename from drm/drmdevice.cpp
rename to drm/DrmDevice.cpp
index 18b5b62..28ecfda 100644
--- a/drm/drmdevice.cpp
+++ b/drm/DrmDevice.cpp
@@ -16,22 +16,21 @@
 
 #define LOG_TAG "hwc-drm-device"
 
-#include "drmdevice.h"
+#include "DrmDevice.h"
 
+#include <cutils/properties.h>
 #include <errno.h>
 #include <fcntl.h>
+#include <log/log.h>
 #include <stdint.h>
 #include <xf86drm.h>
 #include <xf86drmMode.h>
-#include <cinttypes>
 
 #include <algorithm>
 #include <array>
+#include <cinttypes>
 #include <string>
 
-#include <cutils/properties.h>
-#include <log/log.h>
-
 static void trim_left(std::string &str) {
   str.erase(std::begin(str),
             std::find_if(std::begin(str), std::end(str),
diff --git a/drm/drmdevice.h b/drm/DrmDevice.h
similarity index 96%
rename from drm/drmdevice.h
rename to drm/DrmDevice.h
index 6a8de47..d7ea359 100644
--- a/drm/drmdevice.h
+++ b/drm/DrmDevice.h
@@ -21,11 +21,11 @@
 
 #include <tuple>
 
-#include "drmconnector.h"
-#include "drmcrtc.h"
-#include "drmencoder.h"
-#include "drmeventlistener.h"
-#include "drmplane.h"
+#include "DrmConnector.h"
+#include "DrmCrtc.h"
+#include "DrmEncoder.h"
+#include "DrmEventListener.h"
+#include "DrmPlane.h"
 #include "platform/platform.h"
 
 namespace android {
diff --git a/drm/drmencoder.cpp b/drm/DrmEncoder.cpp
similarity index 96%
rename from drm/drmencoder.cpp
rename to drm/DrmEncoder.cpp
index 9aa6805..bcf0926 100644
--- a/drm/drmencoder.cpp
+++ b/drm/DrmEncoder.cpp
@@ -14,12 +14,13 @@
  * limitations under the License.
  */
 
-#include "drmencoder.h"
-#include "drmdevice.h"
+#include "DrmEncoder.h"
 
 #include <stdint.h>
 #include <xf86drmMode.h>
 
+#include "DrmDevice.h"
+
 namespace android {
 
 DrmEncoder::DrmEncoder(drmModeEncoderPtr e, DrmCrtc *current_crtc,
diff --git a/drm/drmencoder.h b/drm/DrmEncoder.h
similarity index 98%
rename from drm/drmencoder.h
rename to drm/DrmEncoder.h
index 4403d9f..f4464d0 100644
--- a/drm/drmencoder.h
+++ b/drm/DrmEncoder.h
@@ -23,7 +23,7 @@
 #include <set>
 #include <vector>
 
-#include "drmcrtc.h"
+#include "DrmCrtc.h"
 
 namespace android {
 
diff --git a/drm/drmeventlistener.cpp b/drm/DrmEventListener.cpp
similarity index 98%
rename from drm/drmeventlistener.cpp
rename to drm/DrmEventListener.cpp
index ccee0d6..3d95e28 100644
--- a/drm/drmeventlistener.cpp
+++ b/drm/DrmEventListener.cpp
@@ -16,19 +16,19 @@
 
 #define LOG_TAG "hwc-drm-event-listener"
 
-#include "drmeventlistener.h"
-#include "drmdevice.h"
+#include "DrmEventListener.h"
 
 #include <assert.h>
 #include <errno.h>
-#include <linux/netlink.h>
-#include <sys/socket.h>
-
 #include <hardware/hardware.h>
 #include <hardware/hwcomposer.h>
+#include <linux/netlink.h>
 #include <log/log.h>
+#include <sys/socket.h>
 #include <xf86drm.h>
 
+#include "DrmDevice.h"
+
 namespace android {
 
 DrmEventListener::DrmEventListener(DrmDevice *drm)
diff --git a/drm/drmeventlistener.h b/drm/DrmEventListener.h
similarity index 98%
rename from drm/drmeventlistener.h
rename to drm/DrmEventListener.h
index ff3b8e5..9f9a4ba 100644
--- a/drm/drmeventlistener.h
+++ b/drm/DrmEventListener.h
@@ -18,7 +18,7 @@
 #define ANDROID_DRM_EVENT_LISTENER_H_
 
 #include "autofd.h"
-#include "utils/worker.h"
+#include "utils/Worker.h"
 
 namespace android {
 
diff --git a/drm/drmmode.cpp b/drm/DrmMode.cpp
similarity index 98%
rename from drm/drmmode.cpp
rename to drm/DrmMode.cpp
index c1398ef..6de671a 100644
--- a/drm/drmmode.cpp
+++ b/drm/DrmMode.cpp
@@ -14,8 +14,9 @@
  * limitations under the License.
  */
 
-#include "drmmode.h"
-#include "drmdevice.h"
+#include "DrmMode.h"
+
+#include "DrmDevice.h"
 
 namespace android {
 
diff --git a/drm/drmmode.h b/drm/DrmMode.h
similarity index 100%
rename from drm/drmmode.h
rename to drm/DrmMode.h
diff --git a/drm/drmplane.cpp b/drm/DrmPlane.cpp
similarity index 98%
rename from drm/drmplane.cpp
rename to drm/DrmPlane.cpp
index f0c7559..1fb1316 100644
--- a/drm/drmplane.cpp
+++ b/drm/DrmPlane.cpp
@@ -16,14 +16,15 @@
 
 #define LOG_TAG "hwc-drm-plane"
 
-#include "drmplane.h"
-#include "drmdevice.h"
+#include "DrmPlane.h"
 
 #include <errno.h>
+#include <log/log.h>
 #include <stdint.h>
+
 #include <cinttypes>
 
-#include <log/log.h>
+#include "DrmDevice.h"
 
 namespace android {
 
diff --git a/drm/drmplane.h b/drm/DrmPlane.h
similarity index 97%
rename from drm/drmplane.h
rename to drm/DrmPlane.h
index 1a4dc91..d2f0601 100644
--- a/drm/drmplane.h
+++ b/drm/DrmPlane.h
@@ -22,8 +22,8 @@
 
 #include <vector>
 
-#include "drmcrtc.h"
-#include "drmproperty.h"
+#include "DrmCrtc.h"
+#include "DrmProperty.h"
 
 namespace android {
 
diff --git a/drm/drmproperty.cpp b/drm/DrmProperty.cpp
similarity index 98%
rename from drm/drmproperty.cpp
rename to drm/DrmProperty.cpp
index 3aeed13..b60a76e 100644
--- a/drm/drmproperty.cpp
+++ b/drm/DrmProperty.cpp
@@ -14,14 +14,15 @@
  * limitations under the License.
  */
 
-#include "drmproperty.h"
-#include "drmdevice.h"
+#include "DrmProperty.h"
 
 #include <errno.h>
 #include <stdint.h>
+#include <xf86drmMode.h>
+
 #include <string>
 
-#include <xf86drmMode.h>
+#include "DrmDevice.h"
 
 namespace android {
 
diff --git a/drm/drmproperty.h b/drm/DrmProperty.h
similarity index 100%
rename from drm/drmproperty.h
rename to drm/DrmProperty.h
diff --git a/drm/resourcemanager.cpp b/drm/ResourceManager.cpp
similarity index 99%
rename from drm/resourcemanager.cpp
rename to drm/ResourceManager.cpp
index 45fa818..67ef7f8 100644
--- a/drm/resourcemanager.cpp
+++ b/drm/ResourceManager.cpp
@@ -16,11 +16,12 @@
 
 #define LOG_TAG "hwc-resource-manager"
 
-#include "resourcemanager.h"
+#include "ResourceManager.h"
 
 #include <cutils/properties.h>
 #include <log/log.h>
 #include <sys/stat.h>
+
 #include <sstream>
 
 namespace android {
diff --git a/drm/resourcemanager.h b/drm/ResourceManager.h
similarity index 98%
rename from drm/resourcemanager.h
rename to drm/ResourceManager.h
index 4afa842..94ba43e 100644
--- a/drm/resourcemanager.h
+++ b/drm/ResourceManager.h
@@ -19,7 +19,7 @@
 
 #include <string.h>
 
-#include "drmdevice.h"
+#include "DrmDevice.h"
 #include "platform/platform.h"
 
 namespace android {
diff --git a/drm/vsyncworker.cpp b/drm/VSyncWorker.cpp
similarity index 99%
rename from drm/vsyncworker.cpp
rename to drm/VSyncWorker.cpp
index 55dbd26..dfbf8ce 100644
--- a/drm/vsyncworker.cpp
+++ b/drm/VSyncWorker.cpp
@@ -16,15 +16,14 @@
 
 #define LOG_TAG "hwc-vsync-worker"
 
-#include "vsyncworker.h"
+#include "VSyncWorker.h"
 
+#include <log/log.h>
 #include <stdlib.h>
 #include <time.h>
 #include <xf86drm.h>
 #include <xf86drmMode.h>
 
-#include <log/log.h>
-
 namespace android {
 
 VSyncWorker::VSyncWorker()
diff --git a/drm/vsyncworker.h b/drm/VSyncWorker.h
similarity index 96%
rename from drm/vsyncworker.h
rename to drm/VSyncWorker.h
index cbf4ffa..0121a6c 100644
--- a/drm/vsyncworker.h
+++ b/drm/VSyncWorker.h
@@ -23,8 +23,8 @@
 
 #include <map>
 
-#include "drmdevice.h"
-#include "utils/worker.h"
+#include "DrmDevice.h"
+#include "utils/Worker.h"
 
 namespace android {