diff --git a/src/dawn/native/BUILD.gn b/src/dawn/native/BUILD.gn
index ff21df0..bc8abb8 100644
--- a/src/dawn/native/BUILD.gn
+++ b/src/dawn/native/BUILD.gn
@@ -700,33 +700,40 @@
       "vulkan/external_memory/MemoryService.h",
       "vulkan/external_semaphore/SemaphoreService.cpp",
       "vulkan/external_semaphore/SemaphoreService.h",
-      "vulkan/external_semaphore/ServiceImplementation.cpp",
-      "vulkan/external_semaphore/ServiceImplementation.h",
+      "vulkan/external_semaphore/SemaphoreServiceImplementation.cpp",
+      "vulkan/external_semaphore/SemaphoreServiceImplementation.h",
     ]
 
     if (is_android || is_linux || is_chromeos) {
       sources += [
-        "vulkan/external_semaphore/ServiceImplementationFD.cpp",
-        "vulkan/external_semaphore/ServiceImplementationFD.h",
+        "vulkan/external_semaphore/SemaphoreServiceImplementationFD.cpp",
+        "vulkan/external_semaphore/SemaphoreServiceImplementationFD.h",
       ]
     } else if (is_fuchsia) {
       sources += [
-        "vulkan/external_semaphore/ServiceImplementationZirconHandle.cpp",
-        "vulkan/external_semaphore/ServiceImplementationZirconHandle.h",
+        "vulkan/external_semaphore/SemaphoreServiceImplementationZirconHandle.cpp",
+        "vulkan/external_semaphore/SemaphoreServiceImplementationZirconHandle.h",
       ]
     }
 
     if (is_chromeos) {
-      sources += [ "vulkan/external_memory/MemoryServiceDmaBuf.cpp" ]
+      sources +=
+          [ "vulkan/external_memory/MemoryServiceImplementationDmaBuf.cpp" ]
     } else if (is_linux) {
-      sources += [ "vulkan/external_memory/MemoryServiceOpaqueFD.cpp" ]
+      sources +=
+          [ "vulkan/external_memory/MemoryServiceImplementationOpaqueFD.cpp" ]
     } else if (is_fuchsia) {
-      sources += [ "vulkan/external_memory/MemoryServiceZirconHandle.cpp" ]
+      sources += [
+        "vulkan/external_memory/MemoryServiceImplementationZirconHandle.cpp",
+      ]
     } else if (is_android) {
-      sources += [ "vulkan/external_memory/MemoryServiceAHardwareBuffer.cpp" ]
+      sources += [
+        "vulkan/external_memory/MemoryServiceImplementationAHardwareBuffer.cpp",
+      ]
     } else {
       sources += [ "vulkan/external_memory/MemoryServiceNull.cpp" ]
     }
+
     if (build_with_chromium && is_fuchsia) {
       # Necessary to ensure that the Vulkan libraries will be in the
       # final Fuchsia package.
diff --git a/src/dawn/native/CMakeLists.txt b/src/dawn/native/CMakeLists.txt
index 3ad2292..5136811 100644
--- a/src/dawn/native/CMakeLists.txt
+++ b/src/dawn/native/CMakeLists.txt
@@ -573,8 +573,8 @@
         "vulkan/external_memory/MemoryService.h"
         "vulkan/external_semaphore/SemaphoreService.cpp"
         "vulkan/external_semaphore/SemaphoreService.h"
-        "vulkan/external_semaphore/ServiceImplementation.cpp"
-        "vulkan/external_semaphore/ServiceImplementation.h"
+        "vulkan/external_semaphore/SemaphoreServiceImplementation.cpp"
+        "vulkan/external_semaphore/SemaphoreServiceImplementation.h"
     )
 
     target_link_libraries(dawn_native PUBLIC Vulkan-Headers)
@@ -582,9 +582,9 @@
 
     if (UNIX AND NOT APPLE)
         target_sources(dawn_native PRIVATE
-            "vulkan/external_memory/MemoryServiceOpaqueFD.cpp"
-            "vulkan/external_semaphore/ServiceImplementationFD.cpp"
-            "vulkan/external_semaphore/ServiceImplementationFD.h"
+            "vulkan/external_memory/MemoryServiceImplementationOpaqueFD.cpp"
+            "vulkan/external_semaphore/SemaphoreServiceImplementationFD.cpp"
+            "vulkan/external_semaphore/SemaphoreServiceImplementationFD.h"
         )
     else()
         target_sources(dawn_native PRIVATE
diff --git a/src/dawn/native/vulkan/external_memory/MemoryServiceAHardwareBuffer.cpp b/src/dawn/native/vulkan/external_memory/MemoryServiceImplementationAHardwareBuffer.cpp
similarity index 100%
rename from src/dawn/native/vulkan/external_memory/MemoryServiceAHardwareBuffer.cpp
rename to src/dawn/native/vulkan/external_memory/MemoryServiceImplementationAHardwareBuffer.cpp
diff --git a/src/dawn/native/vulkan/external_memory/MemoryServiceDmaBuf.cpp b/src/dawn/native/vulkan/external_memory/MemoryServiceImplementationDmaBuf.cpp
similarity index 100%
rename from src/dawn/native/vulkan/external_memory/MemoryServiceDmaBuf.cpp
rename to src/dawn/native/vulkan/external_memory/MemoryServiceImplementationDmaBuf.cpp
diff --git a/src/dawn/native/vulkan/external_memory/MemoryServiceOpaqueFD.cpp b/src/dawn/native/vulkan/external_memory/MemoryServiceImplementationOpaqueFD.cpp
similarity index 100%
rename from src/dawn/native/vulkan/external_memory/MemoryServiceOpaqueFD.cpp
rename to src/dawn/native/vulkan/external_memory/MemoryServiceImplementationOpaqueFD.cpp
diff --git a/src/dawn/native/vulkan/external_memory/MemoryServiceZirconHandle.cpp b/src/dawn/native/vulkan/external_memory/MemoryServiceImplementationZirconHandle.cpp
similarity index 100%
rename from src/dawn/native/vulkan/external_memory/MemoryServiceZirconHandle.cpp
rename to src/dawn/native/vulkan/external_memory/MemoryServiceImplementationZirconHandle.cpp
diff --git a/src/dawn/native/vulkan/external_semaphore/SemaphoreService.cpp b/src/dawn/native/vulkan/external_semaphore/SemaphoreService.cpp
index bf0a10e..cca1f93 100644
--- a/src/dawn/native/vulkan/external_semaphore/SemaphoreService.cpp
+++ b/src/dawn/native/vulkan/external_semaphore/SemaphoreService.cpp
@@ -15,15 +15,15 @@
 #include "dawn/native/vulkan/external_semaphore/SemaphoreService.h"
 #include "dawn/native/vulkan/VulkanFunctions.h"
 #include "dawn/native/vulkan/VulkanInfo.h"
-#include "dawn/native/vulkan/external_semaphore/ServiceImplementation.h"
+#include "dawn/native/vulkan/external_semaphore/SemaphoreServiceImplementation.h"
 
 #if DAWN_PLATFORM_IS(FUCHSIA)
-#include "dawn/native/vulkan/external_semaphore/ServiceImplementationZirconHandle.h"
+#include "dawn/native/vulkan/external_semaphore/SemaphoreServiceImplementationZirconHandle.h"
 #endif  // DAWN_PLATFORM_IS(FUCHSIA)
 
 // Android, ChromeOS and Linux
 #if DAWN_PLATFORM_IS(LINUX)
-#include "dawn/native/vulkan/external_semaphore/ServiceImplementationFD.h"
+#include "dawn/native/vulkan/external_semaphore/SemaphoreServiceImplementationFD.h"
 #endif  // DAWN_PLATFORM_IS(LINUX)
 
 namespace dawn::native::vulkan::external_semaphore {
diff --git a/src/dawn/native/vulkan/external_semaphore/ServiceImplementation.cpp b/src/dawn/native/vulkan/external_semaphore/SemaphoreServiceImplementation.cpp
similarity index 91%
rename from src/dawn/native/vulkan/external_semaphore/ServiceImplementation.cpp
rename to src/dawn/native/vulkan/external_semaphore/SemaphoreServiceImplementation.cpp
index d7f9a4b..79dc44f 100644
--- a/src/dawn/native/vulkan/external_semaphore/ServiceImplementation.cpp
+++ b/src/dawn/native/vulkan/external_semaphore/SemaphoreServiceImplementation.cpp
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "dawn/native/vulkan/external_semaphore/ServiceImplementation.h"
+#include "dawn/native/vulkan/external_semaphore/SemaphoreServiceImplementation.h"
 
 namespace dawn::native::vulkan::external_semaphore {
 
diff --git a/src/dawn/native/vulkan/external_semaphore/ServiceImplementation.h b/src/dawn/native/vulkan/external_semaphore/SemaphoreServiceImplementation.h
similarity index 87%
rename from src/dawn/native/vulkan/external_semaphore/ServiceImplementation.h
rename to src/dawn/native/vulkan/external_semaphore/SemaphoreServiceImplementation.h
index ac636c2..af15d59 100644
--- a/src/dawn/native/vulkan/external_semaphore/ServiceImplementation.h
+++ b/src/dawn/native/vulkan/external_semaphore/SemaphoreServiceImplementation.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef SRC_DAWN_NATIVE_VULKAN_EXTERNAL_SEMAPHORE_SERVICEIMPLEMENTATION_H_
-#define SRC_DAWN_NATIVE_VULKAN_EXTERNAL_SEMAPHORE_SERVICEIMPLEMENTATION_H_
+#ifndef SRC_DAWN_NATIVE_VULKAN_EXTERNAL_SEMAPHORE_SEMAPHORESERVICEIMPLEMENTATION_H_
+#define SRC_DAWN_NATIVE_VULKAN_EXTERNAL_SEMAPHORE_SEMAPHORESERVICEIMPLEMENTATION_H_
 
 #include "dawn/native/Error.h"
 #include "dawn/native/vulkan/ExternalHandle.h"
@@ -53,4 +53,4 @@
 
 }  // namespace dawn::native::vulkan::external_semaphore
 
-#endif  // SRC_DAWN_NATIVE_VULKAN_EXTERNAL_SEMAPHORE_SERVICEIMPLEMENTATION_H_
+#endif  // SRC_DAWN_NATIVE_VULKAN_EXTERNAL_SEMAPHORE_SEMAPHORESERVICEIMPLEMENTATION_H_
diff --git a/src/dawn/native/vulkan/external_semaphore/ServiceImplementationFD.cpp b/src/dawn/native/vulkan/external_semaphore/SemaphoreServiceImplementationFD.cpp
similarity index 97%
rename from src/dawn/native/vulkan/external_semaphore/ServiceImplementationFD.cpp
rename to src/dawn/native/vulkan/external_semaphore/SemaphoreServiceImplementationFD.cpp
index 6b402c5..5e0bbf8 100644
--- a/src/dawn/native/vulkan/external_semaphore/ServiceImplementationFD.cpp
+++ b/src/dawn/native/vulkan/external_semaphore/SemaphoreServiceImplementationFD.cpp
@@ -19,8 +19,8 @@
 #include "dawn/native/vulkan/BackendVk.h"
 #include "dawn/native/vulkan/DeviceVk.h"
 #include "dawn/native/vulkan/VulkanError.h"
-#include "dawn/native/vulkan/external_semaphore/ServiceImplementation.h"
-#include "dawn/native/vulkan/external_semaphore/ServiceImplementationFD.h"
+#include "dawn/native/vulkan/external_semaphore/SemaphoreServiceImplementation.h"
+#include "dawn/native/vulkan/external_semaphore/SemaphoreServiceImplementationFD.h"
 
 static constexpr VkExternalSemaphoreHandleTypeFlagBits kHandleType =
 #if DAWN_PLATFORM_IS(ANDROID) || DAWN_PLATFORM_IS(CHROMEOS)
diff --git a/src/dawn/native/vulkan/external_semaphore/ServiceImplementationFD.h b/src/dawn/native/vulkan/external_semaphore/SemaphoreServiceImplementationFD.h
similarity index 100%
rename from src/dawn/native/vulkan/external_semaphore/ServiceImplementationFD.h
rename to src/dawn/native/vulkan/external_semaphore/SemaphoreServiceImplementationFD.h
diff --git a/src/dawn/native/vulkan/external_semaphore/ServiceImplementationZirconHandle.cpp b/src/dawn/native/vulkan/external_semaphore/SemaphoreServiceImplementationZirconHandle.cpp
similarity index 97%
rename from src/dawn/native/vulkan/external_semaphore/ServiceImplementationZirconHandle.cpp
rename to src/dawn/native/vulkan/external_semaphore/SemaphoreServiceImplementationZirconHandle.cpp
index c2ed196..612761d 100644
--- a/src/dawn/native/vulkan/external_semaphore/ServiceImplementationZirconHandle.cpp
+++ b/src/dawn/native/vulkan/external_semaphore/SemaphoreServiceImplementationZirconHandle.cpp
@@ -19,8 +19,8 @@
 #include "dawn/native/vulkan/BackendVk.h"
 #include "dawn/native/vulkan/DeviceVk.h"
 #include "dawn/native/vulkan/VulkanError.h"
-#include "dawn/native/vulkan/external_semaphore/ServiceImplementation.h"
-#include "dawn/native/vulkan/external_semaphore/ServiceImplementationZirconHandle.h"
+#include "dawn/native/vulkan/external_semaphore/SemaphoreServiceImplementation.h"
+#include "dawn/native/vulkan/external_semaphore/SemaphoreServiceImplementationZirconHandle.h"
 
 namespace dawn::native::vulkan::external_semaphore {
 
diff --git a/src/dawn/native/vulkan/external_semaphore/ServiceImplementationZirconHandle.h b/src/dawn/native/vulkan/external_semaphore/SemaphoreServiceImplementationZirconHandle.h
similarity index 80%
rename from src/dawn/native/vulkan/external_semaphore/ServiceImplementationZirconHandle.h
rename to src/dawn/native/vulkan/external_semaphore/SemaphoreServiceImplementationZirconHandle.h
index b07585f..ca3a243 100644
--- a/src/dawn/native/vulkan/external_semaphore/ServiceImplementationZirconHandle.h
+++ b/src/dawn/native/vulkan/external_semaphore/SemaphoreServiceImplementationZirconHandle.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef SRC_DAWN_NATIVE_VULKAN_EXTERNAL_SEMAPHORE_SERVICEIMPLEMENTATIONZIRCONHANDLE_H_
-#define SRC_DAWN_NATIVE_VULKAN_EXTERNAL_SEMAPHORE_SERVICEIMPLEMENTATIONZIRCONHANDLE_H_
+#ifndef SRC_DAWN_NATIVE_VULKAN_EXTERNAL_SEMAPHORE_SEMAPHORESERVICEIMPLEMENTATIONZIRCONHANDLE_H_
+#define SRC_DAWN_NATIVE_VULKAN_EXTERNAL_SEMAPHORE_SEMAPHORESERVICEIMPLEMENTATIONZIRCONHANDLE_H_
 
 #include <memory>
 
@@ -33,4 +33,4 @@
 
 }  // namespace dawn::native::vulkan::external_semaphore
 
-#endif  // SRC_DAWN_NATIVE_VULKAN_EXTERNAL_SEMAPHORE_SERVICEIMPLEMENTATIONZIRCONHANDLE_H_
+#endif  // SRC_DAWN_NATIVE_VULKAN_EXTERNAL_SEMAPHORE_SEMAPHORESERVICEIMPLEMENTATIONZIRCONHANDLE_H_