diff --git a/Android.bp b/Android.bp
index ef8af52..4bd4586 100644
--- a/Android.bp
+++ b/Android.bp
@@ -18,7 +18,7 @@
 cc_library_static {
     name: "libdrmhwc_utils",
 
-    srcs: ["utils/worker.cpp"],
+    srcs: ["utils/Worker.cpp"],
 
     include_dirs: [
         "external/drm_hwcomposer/include",
@@ -80,31 +80,31 @@
     name: "drm_hwcomposer",
     defaults: ["hwcomposer.drm_defaults"],
     srcs: [
-        "drmhwctwo.cpp",
+        "DrmHwcTwo.cpp",
 
-        "compositor/drmdisplaycomposition.cpp",
-        "compositor/drmdisplaycompositor.cpp",
+        "compositor/DrmDisplayComposition.cpp",
+        "compositor/DrmDisplayCompositor.cpp",
 
-        "drm/drmconnector.cpp",
-        "drm/drmcrtc.cpp",
-        "drm/drmdevice.cpp",
-        "drm/drmencoder.cpp",
-        "drm/drmeventlistener.cpp",
-        "drm/drmmode.cpp",
-        "drm/drmplane.cpp",
-        "drm/drmproperty.cpp",
-        "drm/resourcemanager.cpp",
-        "drm/vsyncworker.cpp",
+        "drm/DrmConnector.cpp",
+        "drm/DrmCrtc.cpp",
+        "drm/DrmDevice.cpp",
+        "drm/DrmEncoder.cpp",
+        "drm/DrmEventListener.cpp",
+        "drm/DrmMode.cpp",
+        "drm/DrmPlane.cpp",
+        "drm/DrmProperty.cpp",
+        "drm/ResourceManager.cpp",
+        "drm/VSyncWorker.cpp",
 
         "platform/platform.cpp",
 
         "utils/autolock.cpp",
         "utils/hwcutils.cpp",
 
-        "backend/backendmanager.cpp",
-        "backend/backend.cpp",
-        "backend/backendclient.cpp",
-        "backend/backendrcardu.cpp",
+        "backend/BackendManager.cpp",
+        "backend/Backend.cpp",
+        "backend/BackendClient.cpp",
+        "backend/BackendRCarDu.cpp",
     ],
 }
 
diff --git a/drmhwctwo.cpp b/DrmHwcTwo.cpp
similarity index 99%
rename from drmhwctwo.cpp
rename to DrmHwcTwo.cpp
index c771022..15fa324 100644
--- a/drmhwctwo.cpp
+++ b/DrmHwcTwo.cpp
@@ -17,7 +17,7 @@
 #define ATRACE_TAG ATRACE_TAG_GRAPHICS
 #define LOG_TAG "hwc-drm-two"
 
-#include "drmhwctwo.h"
+#include "DrmHwcTwo.h"
 
 #include <cutils/properties.h>
 #include <hardware/hardware.h>
@@ -27,8 +27,8 @@
 
 #include <string>
 
-#include "backend/backendmanager.h"
-#include "compositor/drmdisplaycomposition.h"
+#include "backend/BackendManager.h"
+#include "compositor/DrmDisplayComposition.h"
 
 namespace android {
 
diff --git a/drmhwctwo.h b/DrmHwcTwo.h
similarity index 98%
rename from drmhwctwo.h
rename to DrmHwcTwo.h
index 94b13fc..ca7a00b 100644
--- a/drmhwctwo.h
+++ b/DrmHwcTwo.h
@@ -23,9 +23,9 @@
 #include <array>
 #include <map>
 
-#include "compositor/drmdisplaycompositor.h"
-#include "drm/resourcemanager.h"
-#include "drm/vsyncworker.h"
+#include "compositor/DrmDisplayCompositor.h"
+#include "drm/ResourceManager.h"
+#include "drm/VSyncWorker.h"
 #include "drmhwcomposer.h"
 #include "platform/platform.h"
 
diff --git a/backend/backend.cpp b/backend/Backend.cpp
similarity index 98%
rename from backend/backend.cpp
rename to backend/Backend.cpp
index e36c47e..50ef900 100644
--- a/backend/backend.cpp
+++ b/backend/Backend.cpp
@@ -14,8 +14,9 @@
  * limitations under the License.
  */
 
-#include "backend.h"
-#include "backendmanager.h"
+#include "Backend.h"
+
+#include "BackendManager.h"
 
 namespace android {
 
diff --git a/backend/backend.h b/backend/Backend.h
similarity index 98%
rename from backend/backend.h
rename to backend/Backend.h
index cd9d8cd..898fece 100644
--- a/backend/backend.h
+++ b/backend/Backend.h
@@ -17,7 +17,7 @@
 #ifndef ANDROID_BACKEND_H
 #define ANDROID_BACKEND_H
 
-#include "drmhwctwo.h"
+#include "DrmHwcTwo.h"
 
 namespace android {
 
diff --git a/backend/backendclient.cpp b/backend/BackendClient.cpp
similarity index 94%
rename from backend/backendclient.cpp
rename to backend/BackendClient.cpp
index a9418da..033a35c 100644
--- a/backend/backendclient.cpp
+++ b/backend/BackendClient.cpp
@@ -14,8 +14,9 @@
  * limitations under the License.
  */
 
-#include "backendclient.h"
-#include "backendmanager.h"
+#include "BackendClient.h"
+
+#include "BackendManager.h"
 
 namespace android {
 
diff --git a/backend/backendclient.h b/backend/BackendClient.h
similarity index 95%
rename from backend/backendclient.h
rename to backend/BackendClient.h
index 361160f..13543f1 100644
--- a/backend/backendclient.h
+++ b/backend/BackendClient.h
@@ -17,8 +17,7 @@
 #ifndef ANDROID_BACKEND_CLIENT_H
 #define ANDROID_BACKEND_CLIENT_H
 
-#include "backend.h"
-#include "drmhwctwo.h"
+#include "Backend.h"
 
 namespace android {
 
diff --git a/backend/backendmanager.cpp b/backend/BackendManager.cpp
similarity index 98%
rename from backend/backendmanager.cpp
rename to backend/BackendManager.cpp
index 03ad704..b7601ee 100644
--- a/backend/backendmanager.cpp
+++ b/backend/BackendManager.cpp
@@ -16,7 +16,7 @@
 
 #define LOG_TAG "hwc-backend"
 
-#include "backendmanager.h"
+#include "BackendManager.h"
 
 #include <cutils/properties.h>
 #include <log/log.h>
diff --git a/backend/backendmanager.h b/backend/BackendManager.h
similarity index 97%
rename from backend/backendmanager.h
rename to backend/BackendManager.h
index f18637d..e86c098 100644
--- a/backend/backendmanager.h
+++ b/backend/BackendManager.h
@@ -22,8 +22,7 @@
 #include <string>
 #include <vector>
 
-#include "backend.h"
-#include "drmhwctwo.h"
+#include "Backend.h"
 
 #define REGISTER_BACKEND(name_str_, backend_)                               \
   static int                                                                \
diff --git a/backend/backendrcardu.cpp b/backend/BackendRCarDu.cpp
similarity index 95%
rename from backend/backendrcardu.cpp
rename to backend/BackendRCarDu.cpp
index d6fe7bf..d52f0c3 100644
--- a/backend/backendrcardu.cpp
+++ b/backend/BackendRCarDu.cpp
@@ -14,8 +14,9 @@
  * limitations under the License.
  */
 
-#include "backendrcardu.h"
-#include "backendmanager.h"
+#include "BackendRCarDu.h"
+
+#include "BackendManager.h"
 #include "drm_fourcc.h"
 
 namespace android {
diff --git a/backend/backendrcardu.h b/backend/BackendRCarDu.h
similarity index 95%
rename from backend/backendrcardu.h
rename to backend/BackendRCarDu.h
index 29ccea9..8a1011a 100644
--- a/backend/backendrcardu.h
+++ b/backend/BackendRCarDu.h
@@ -17,8 +17,7 @@
 #ifndef HWC_DISPLAY_BACKEND_RCAR_DU_H
 #define HWC_DISPLAY_BACKEND_RCAR_DU_H
 
-#include "backend.h"
-#include "drmhwctwo.h"
+#include "Backend.h"
 
 namespace android {
 
diff --git a/compositor/drmdisplaycomposition.cpp b/compositor/DrmDisplayComposition.cpp
similarity index 98%
rename from compositor/drmdisplaycomposition.cpp
rename to compositor/DrmDisplayComposition.cpp
index 82d7194..79dd470 100644
--- a/compositor/drmdisplaycomposition.cpp
+++ b/compositor/DrmDisplayComposition.cpp
@@ -16,7 +16,7 @@
 
 #define LOG_TAG "hwc-drm-display-composition"
 
-#include "drmdisplaycomposition.h"
+#include "DrmDisplayComposition.h"
 
 #include <log/log.h>
 #include <stdlib.h>
@@ -26,8 +26,8 @@
 #include <algorithm>
 #include <unordered_set>
 
-#include "drm/drmdevice.h"
-#include "drmdisplaycompositor.h"
+#include "DrmDisplayCompositor.h"
+#include "drm/DrmDevice.h"
 #include "platform/platform.h"
 
 namespace android {
diff --git a/compositor/drmdisplaycomposition.h b/compositor/DrmDisplayComposition.h
similarity index 98%
rename from compositor/drmdisplaycomposition.h
rename to compositor/DrmDisplayComposition.h
index d8a668c..73a9024 100644
--- a/compositor/drmdisplaycomposition.h
+++ b/compositor/DrmDisplayComposition.h
@@ -23,8 +23,8 @@
 #include <sstream>
 #include <vector>
 
-#include "drm/drmcrtc.h"
-#include "drm/drmplane.h"
+#include "drm/DrmCrtc.h"
+#include "drm/DrmPlane.h"
 #include "drmhwcomposer.h"
 
 namespace android {
diff --git a/compositor/drmdisplaycompositor.cpp b/compositor/DrmDisplayCompositor.cpp
similarity index 99%
rename from compositor/drmdisplaycompositor.cpp
rename to compositor/DrmDisplayCompositor.cpp
index aed090a..467f8ba 100644
--- a/compositor/drmdisplaycompositor.cpp
+++ b/compositor/DrmDisplayCompositor.cpp
@@ -17,7 +17,7 @@
 #define ATRACE_TAG ATRACE_TAG_GRAPHICS
 #define LOG_TAG "hwc-drm-display-compositor"
 
-#include "drmdisplaycompositor.h"
+#include "DrmDisplayCompositor.h"
 
 #include <drm/drm_mode.h>
 #include <log/log.h>
@@ -32,9 +32,9 @@
 #include <sstream>
 #include <vector>
 
-#include "drm/drmcrtc.h"
-#include "drm/drmdevice.h"
-#include "drm/drmplane.h"
+#include "drm/DrmCrtc.h"
+#include "drm/DrmDevice.h"
+#include "drm/DrmPlane.h"
 #include "utils/autolock.h"
 
 static const uint32_t kWaitWritebackFence = 100;  // ms
diff --git a/compositor/drmdisplaycompositor.h b/compositor/DrmDisplayCompositor.h
similarity index 97%
rename from compositor/drmdisplaycompositor.h
rename to compositor/DrmDisplayCompositor.h
index 62dd04e..e500c9e 100644
--- a/compositor/drmdisplaycompositor.h
+++ b/compositor/DrmDisplayCompositor.h
@@ -25,10 +25,10 @@
 #include <sstream>
 #include <tuple>
 
-#include "drm/resourcemanager.h"
-#include "drm/vsyncworker.h"
-#include "drmdisplaycomposition.h"
-#include "drmframebuffer.h"
+#include "DrmDisplayComposition.h"
+#include "DrmFramebuffer.h"
+#include "drm/ResourceManager.h"
+#include "drm/VSyncWorker.h"
 #include "drmhwcomposer.h"
 
 // One for the front, one for the back, and one for cases where we need to
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 {
 
diff --git a/include/drmframebuffer.h b/include/DrmFramebuffer.h
similarity index 99%
rename from include/drmframebuffer.h
rename to include/DrmFramebuffer.h
index 9032d3a..33ca0db 100644
--- a/include/drmframebuffer.h
+++ b/include/DrmFramebuffer.h
@@ -18,9 +18,7 @@
 #define ANDROID_DRM_FRAMEBUFFER_
 
 #include <stdint.h>
-
 #include <sync/sync.h>
-
 #include <ui/GraphicBuffer.h>
 
 namespace android {
diff --git a/platform/platform.cpp b/platform/platform.cpp
index 9fb91e7..479e79e 100644
--- a/platform/platform.cpp
+++ b/platform/platform.cpp
@@ -20,7 +20,7 @@
 
 #include <log/log.h>
 
-#include "drm/drmdevice.h"
+#include "drm/DrmDevice.h"
 
 namespace android {
 
diff --git a/platform/platform.h b/platform/platform.h
index e0befdb..13dc360 100644
--- a/platform/platform.h
+++ b/platform/platform.h
@@ -23,7 +23,7 @@
 #include <map>
 #include <vector>
 
-#include "compositor/drmdisplaycomposition.h"
+#include "compositor/DrmDisplayComposition.h"
 #include "drmhwcomposer.h"
 
 namespace android {
diff --git a/platform/platformdrmgeneric.h b/platform/platformdrmgeneric.h
index 4284093..bb78c28 100644
--- a/platform/platformdrmgeneric.h
+++ b/platform/platformdrmgeneric.h
@@ -22,7 +22,7 @@
 
 #include <map>
 
-#include "drm/drmdevice.h"
+#include "drm/DrmDevice.h"
 #include "platform.h"
 
 #ifndef DRM_FORMAT_INVALID
diff --git a/tests/worker_test.cpp b/tests/worker_test.cpp
index ba89b6f..cb6275e 100644
--- a/tests/worker_test.cpp
+++ b/tests/worker_test.cpp
@@ -1,4 +1,4 @@
-#include "utils/worker.h"
+#include "utils/Worker.h"
 
 #include <gtest/gtest.h>
 #include <hardware/hardware.h>
diff --git a/utils/worker.cpp b/utils/Worker.cpp
similarity index 99%
rename from utils/worker.cpp
rename to utils/Worker.cpp
index 0dceb16..1f30588 100644
--- a/utils/worker.cpp
+++ b/utils/Worker.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "worker.h"
+#include "Worker.h"
 
 #include <sys/prctl.h>
 #include <sys/resource.h>
diff --git a/utils/worker.h b/utils/Worker.h
similarity index 100%
rename from utils/worker.h
rename to utils/Worker.h