diff --git a/system/core/devmgr/devmgr/binding.cpp b/system/core/devmgr/devmgr/binding.cpp
index 0812b4362a07b6392c327cff93d5029843e99708..b251a8c6e269cc25a6638740874bde57bc0d35e2 100644
--- a/system/core/devmgr/devmgr/binding.cpp
+++ b/system/core/devmgr/devmgr/binding.cpp
@@ -8,7 +8,7 @@
 
 #include <stdio.h>
 
-#include "devcoordinator.h"
+#include "coordinator.h"
 
 namespace devmgr {
 
diff --git a/system/core/devmgr/devmgr/coordinator.cpp b/system/core/devmgr/devmgr/coordinator.cpp
index 73c560ff5230d5dd66804a98b41b40b0723d683c..5f1397017f8d62b432f58cab80b94e3aecae3dfd 100644
--- a/system/core/devmgr/devmgr/coordinator.cpp
+++ b/system/core/devmgr/devmgr/coordinator.cpp
@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "coordinator.h"
+
 #include <ctype.h>
 #include <errno.h>
 #include <fcntl.h>
@@ -34,7 +36,6 @@
 
 #include <utility>
 
-#include "devcoordinator.h"
 #include "devmgr.h"
 #include "../shared/fdio.h"
 #include "../shared/fidl_txn.h"
diff --git a/system/core/devmgr/devmgr/devcoordinator.h b/system/core/devmgr/devmgr/coordinator.h
similarity index 100%
rename from system/core/devmgr/devmgr/devcoordinator.h
rename to system/core/devmgr/devmgr/coordinator.h
diff --git a/system/core/devmgr/devmgr/devfs.cpp b/system/core/devmgr/devmgr/devfs.cpp
index 26ef424d1919e0737750268621c7ed2b1ad2d70a..30b6ba39e9a0514479426a52b07deeec57c11adf 100644
--- a/system/core/devmgr/devmgr/devfs.cpp
+++ b/system/core/devmgr/devmgr/devfs.cpp
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "devcoordinator.h"
+#include "coordinator.h"
 #include "devmgr.h"
 #include "../shared/async-loop-owned-rpc-handler.h"
 #include "../shared/log.h"
diff --git a/system/core/devmgr/devmgr/drivers.cpp b/system/core/devmgr/devmgr/drivers.cpp
index 29d0b74c02eb1ad323394830998d70dadace1d5d..28b88e64c1850f6bfb113c151edcd7ec2687d5ef 100644
--- a/system/core/devmgr/devmgr/drivers.cpp
+++ b/system/core/devmgr/devmgr/drivers.cpp
@@ -10,8 +10,8 @@
 #include <string.h>
 #include <unistd.h>
 
+#include "coordinator.h"
 #include "devmgr.h"
-#include "devcoordinator.h"
 #include "../shared/fdio.h"
 #include "../shared/log.h"
 
diff --git a/system/core/devmgr/devmgr/fidl.cpp b/system/core/devmgr/devmgr/fidl.cpp
index d65fb360a0baca4a51b030f02270b23f3741d6f6..3efd7d9e79b358d12fa730c54db7090df3dab07a 100644
--- a/system/core/devmgr/devmgr/fidl.cpp
+++ b/system/core/devmgr/devmgr/fidl.cpp
@@ -7,7 +7,7 @@
 #include <lib/fidl/cpp/message.h>
 #include <lib/fidl/cpp/message_part.h>
 
-#include "devcoordinator.h"
+#include "coordinator.h"
 #include "../shared/log.h"
 
 namespace devmgr {