diff --git a/build/BUILD.gn b/build/BUILD.gn
index d16d184..9c6ef44 100644
--- a/build/BUILD.gn
+++ b/build/BUILD.gn
@@ -87,7 +87,7 @@
     "//garnet/bin/sshd-host:sshd-host",
     "//garnet/tests/benchmarks/input_latency:garnet_input_latency_benchmarks",
     "//src/devices/tests/libdriver-integration-test",
-    "//src/devices/coordinator:coordinator_tests",
+    "//src/devices/driver_manager:coordinator_tests",
     "//src/sys/pkg/bin/system-update-checker:system-update-checker",
   ]
 }
diff --git a/garnet/drivers/gpu/msd-img-rgx/mtk/BUILD.gn b/garnet/drivers/gpu/msd-img-rgx/mtk/BUILD.gn
index be79d2d..5b6781dc 100644
--- a/garnet/drivers/gpu/msd-img-rgx/mtk/BUILD.gn
+++ b/garnet/drivers/gpu/msd-img-rgx/mtk/BUILD.gn
@@ -40,7 +40,7 @@
       "//garnet/lib/magma/src/sys_driver",
       "//garnet/lib/magma/tests/helper:platform_device_helper",
       "//sdk/fidl/fuchsia.gpu.magma:fuchsia.gpu.magma_c",
-      "//src/devices/host:driver",
+      "//src/devices:driver",
       "//third_party/imgtec-pvr-rgx-km:src",
       "//zircon/public/lib/ddk",
       "//zircon/public/lib/ddktl",
diff --git a/garnet/drivers/gpu/msd-img-rgx/no_hardware/BUILD.gn b/garnet/drivers/gpu/msd-img-rgx/no_hardware/BUILD.gn
index 9b3580f..487da5ac 100644
--- a/garnet/drivers/gpu/msd-img-rgx/no_hardware/BUILD.gn
+++ b/garnet/drivers/gpu/msd-img-rgx/no_hardware/BUILD.gn
@@ -30,7 +30,7 @@
     "//garnet/lib/magma/src/magma_util/platform:trace",
     "//garnet/lib/magma/src/sys_driver",
     "//sdk/fidl/fuchsia.gpu.magma:fuchsia.gpu.magma_c",
-    "//src/devices/host:driver",
+    "//src/devices:driver",
     "//third_party/imgtec-pvr-rgx-km:src_no_hardware",
     "//zircon/public/lib/ddk",
     "//zircon/public/lib/ddktl",
diff --git a/garnet/drivers/gpu/msd-intel-gen/BUILD.gn b/garnet/drivers/gpu/msd-intel-gen/BUILD.gn
index cf535d8..9c40fd0 100644
--- a/garnet/drivers/gpu/msd-intel-gen/BUILD.gn
+++ b/garnet/drivers/gpu/msd-intel-gen/BUILD.gn
@@ -47,7 +47,7 @@
     "//garnet/lib/magma/src/magma_util/platform:trace_provider_with_fdio",
     "//garnet/lib/magma/src/sys_driver",
     "//sdk/fidl/fuchsia.gpu.magma:fuchsia.gpu.magma_c",
-    "//src/devices/host:driver",
+    "//src/devices:driver",
     "//zircon/public/lib/ddk",
     "//zircon/public/lib/zx",
   ]
@@ -69,7 +69,7 @@
     "//garnet/lib/magma/src/magma_util/platform:trace_provider_with_fdio",
     "//garnet/lib/magma/src/sys_driver",
     "//sdk/fidl/fuchsia.gpu.magma:fuchsia.gpu.magma_c",
-    "//src/devices/host:driver",
+    "//src/devices:driver",
     "//zircon/public/lib/ddk",
     "//zircon/public/lib/zx",
   ]
diff --git a/garnet/drivers/video/amlogic-decoder/BUILD.gn b/garnet/drivers/video/amlogic-decoder/BUILD.gn
index ea2a018..2f2070f 100644
--- a/garnet/drivers/video/amlogic-decoder/BUILD.gn
+++ b/garnet/drivers/video/amlogic-decoder/BUILD.gn
@@ -54,7 +54,7 @@
 
   source_set("test_support") {
     deps = [
-      "//src/devices/host:driver",
+      "//src/devices:driver",
       "//zircon/public/lib/ddk",
     ]
     sources = [ "tests/test_support.h" ]
@@ -121,7 +121,7 @@
       "local_codec_factory.h",
     ]
     public_deps = [
-      "//src/devices/host:driver",
+      "//src/devices:driver",
       "//zircon/public/lib/async-cpp",
       "//zircon/public/lib/async-loop-cpp",
       "//zircon/public/lib/async-loop-default",
diff --git a/garnet/drivers/video/amlogic-encoder/BUILD.gn b/garnet/drivers/video/amlogic-encoder/BUILD.gn
index b0c241c..cef6b19 100644
--- a/garnet/drivers/video/amlogic-encoder/BUILD.gn
+++ b/garnet/drivers/video/amlogic-encoder/BUILD.gn
@@ -17,7 +17,7 @@
   ]
 
   deps = [
-    "//src/devices/host:driver",
+    "//src/devices:driver",
     "//zircon/public/lib/ddk",
     "//zircon/public/lib/fit",
   ]
diff --git a/garnet/lib/magma/src/magma_util/platform/zircon/BUILD.gn b/garnet/lib/magma/src/magma_util/platform/zircon/BUILD.gn
index 4575593..ffbb9bc 100644
--- a/garnet/lib/magma/src/magma_util/platform/zircon/BUILD.gn
+++ b/garnet/lib/magma/src/magma_util/platform/zircon/BUILD.gn
@@ -67,7 +67,7 @@
   "//garnet/lib/magma/src/magma_util:macros",
   "//garnet/lib/magma/src/sys_driver",
   "//sdk/fidl/fuchsia.gpu.magma:fuchsia.gpu.magma_c",
-  "//src/devices/host:driver",
+  "//src/devices:driver",
   "//zircon/public/lib/ddk",
   "//zircon/public/lib/zx",
   "//zircon/system/banjo/ddk.protocol.platform.device",
@@ -115,7 +115,7 @@
     "$magma_build_root/src/magma_util:macros",
     "$zircon_build_root/public/lib/zx",
     "..:device_header",
-    "//src/devices/host:driver",
+    "//src/devices:driver",
     "//zircon/public/lib/device-protocol-pci",
     "//zircon/public/lib/device-protocol-platform-device",
     "//zircon/system/banjo/ddk.protocol.composite",
diff --git a/garnet/lib/magma/src/tools/BUILD.gn b/garnet/lib/magma/src/tools/BUILD.gn
index 3bb114b7..57aa2f4 100644
--- a/garnet/lib/magma/src/tools/BUILD.gn
+++ b/garnet/lib/magma/src/tools/BUILD.gn
@@ -16,7 +16,7 @@
     "$zircon_build_root/public/lib/ddk",
     "$zircon_build_root/public/lib/fdio",
     "//sdk/fidl/fuchsia.gpu.magma:fuchsia.gpu.magma_c",
-    "//src/devices/host:driver",
+    "//src/devices:driver",
     "//src/lib/fxl",
   ]
 
diff --git a/garnet/packages/experimental/BUILD.gn b/garnet/packages/experimental/BUILD.gn
index 3414c56..862beebf 100644
--- a/garnet/packages/experimental/BUILD.gn
+++ b/garnet/packages/experimental/BUILD.gn
@@ -32,7 +32,7 @@
 group("sys") {
   testonly = true
   public_deps = [
-    "//src/devices/coordinator",
+    "//src/devices/driver_manager",
     "//src/sys/component_manager",
     "//src/sys/dash",
   ]
diff --git a/src/connectivity/bluetooth/core/bt-host/BUILD.gn b/src/connectivity/bluetooth/core/bt-host/BUILD.gn
index e64c55b0..b12fab3 100644
--- a/src/connectivity/bluetooth/core/bt-host/BUILD.gn
+++ b/src/connectivity/bluetooth/core/bt-host/BUILD.gn
@@ -52,7 +52,7 @@
 
   deps = [
     "//src/devices:driver",
-    "//src/devices/host",
+    "//src/devices/driver_host",
   ]
   public_deps = [
     ":stack",
diff --git a/src/devices/BUILD.gn b/src/devices/BUILD.gn
index 7a97749..6c3d4a5 100644
--- a/src/devices/BUILD.gn
+++ b/src/devices/BUILD.gn
@@ -7,8 +7,8 @@
 group("devices") {
   testonly = true
   deps = [
-    "coordinator",
-    "host",
+    "driver_host",
+    "driver_manager",
     "tools",
   ]
 }
@@ -16,22 +16,22 @@
 group("tests") {
   testonly = true
   deps = [
-    "coordinator:coordinator_tests",
-    "host:tests",
+    "driver_host:tests",
+    "driver_manager:coordinator_tests",
     "tests",
     "tools:tests",
   ]
 }
 
 group("driver") {
-  deps = [ "host:driver" ]
+  deps = [ "driver_host:driver" ]
 }
 
 generate_manifest("devices.bootfs") {
   deps = [
-    "coordinator",
-    "host",
-    "host:driver",
+    "driver_host",
+    "driver_host:driver",
+    "driver_manager",
     "//src/bringup/virtcon:virtual-console",
     "//src/ui/drivers/hid-input-report",
   ]
diff --git a/src/devices/coordinator/env.h b/src/devices/coordinator/env.h
deleted file mode 100644
index ea3a6cdcb..0000000
--- a/src/devices/coordinator/env.h
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2018 The Fuchsia Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef SRC_DEVICES_COORDINATOR_ENV_H_
-#define SRC_DEVICES_COORDINATOR_ENV_H_
-
-namespace devmgr {
-
-// getenv_bool looks in the environment for |key|. If not found, it
-// returns |default_value|. If found, it returns false if the found
-// value matches "0", "off", or "false", otherwise it returns true.
-bool getenv_bool(const char* key, bool default_value);
-
-}  // namespace devmgr
-
-#endif  // SRC_DEVICES_COORDINATOR_ENV_H_
diff --git a/src/devices/coordinator/log.h b/src/devices/coordinator/log.h
deleted file mode 100644
index 19d9ff1..0000000
--- a/src/devices/coordinator/log.h
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright 2017 The Fuchsia Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef SRC_DEVICES_COORDINATOR_LOG_H_
-#define SRC_DEVICES_COORDINATOR_LOG_H_
-
-#include <stdint.h>
-#include <stdio.h>
-
-namespace devmgr {
-
-// clang-format off
-
-#define LOG_ERROR    0x001
-#define LOG_INFO     0x002
-#define LOG_TRACE    0x004
-#define LOG_SPEW     0x008
-#define LOG_RPC_IN   0x010
-#define LOG_RPC_OUT  0x020
-#define LOG_RPC_RIO  0x040
-#define LOG_RPC_SDW  0x080
-#define LOG_DEVFS    0x100
-#define LOG_DEVLC    0x200
-#define LOG_ALL      0x3ff
-
-// clang-format on
-
-extern uint32_t log_flags;
-
-#define log(flag, fmt...)                 \
-  do {                                    \
-    if (LOG_##flag & ::devmgr::log_flags) \
-      printf(fmt);                        \
-  } while (0)
-
-}  // namespace devmgr
-
-#endif  // SRC_DEVICES_COORDINATOR_LOG_H_
diff --git a/src/devices/host/BUILD.gn b/src/devices/driver_host/BUILD.gn
similarity index 98%
rename from src/devices/host/BUILD.gn
rename to src/devices/driver_host/BUILD.gn
index fdf419f..4462038 100644
--- a/src/devices/host/BUILD.gn
+++ b/src/devices/driver_host/BUILD.gn
@@ -7,7 +7,7 @@
 import("//build/testing/environments.gni")
 import("//src/lib/isolated_devmgr/devmgr_manifest.gni")
 
-group("host") {
+group("driver_host") {
   deps = [
     ":device-host",
     ":driver",
diff --git a/src/devices/host/api.cc b/src/devices/driver_host/api.cc
similarity index 100%
rename from src/devices/host/api.cc
rename to src/devices/driver_host/api.cc
diff --git a/src/devices/host/async-loop-owned-event-handler.h b/src/devices/driver_host/async-loop-owned-event-handler.h
similarity index 92%
rename from src/devices/host/async-loop-owned-event-handler.h
rename to src/devices/driver_host/async-loop-owned-event-handler.h
index cc449e2..6211f5c 100644
--- a/src/devices/host/async-loop-owned-event-handler.h
+++ b/src/devices/driver_host/async-loop-owned-event-handler.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SRC_DEVICES_HOST_ASYNC_LOOP_OWNED_EVENT_HANDLER_H_
-#define SRC_DEVICES_HOST_ASYNC_LOOP_OWNED_EVENT_HANDLER_H_
+#ifndef SRC_DEVICES_DRIVER_HOST_ASYNC_LOOP_OWNED_EVENT_HANDLER_H_
+#define SRC_DEVICES_DRIVER_HOST_ASYNC_LOOP_OWNED_EVENT_HANDLER_H_
 
 #include <lib/async/cpp/wait.h>
 #include <lib/zx/event.h>
@@ -76,4 +76,4 @@
 
 }  // namespace devmgr
 
-#endif  // SRC_DEVICES_HOST_ASYNC_LOOP_OWNED_EVENT_HANDLER_H_
+#endif  // SRC_DEVICES_DRIVER_HOST_ASYNC_LOOP_OWNED_EVENT_HANDLER_H_
diff --git a/src/devices/host/async-loop-owned-rpc-handler.h b/src/devices/driver_host/async-loop-owned-rpc-handler.h
similarity index 92%
rename from src/devices/host/async-loop-owned-rpc-handler.h
rename to src/devices/driver_host/async-loop-owned-rpc-handler.h
index 71aaa3c..4fe3bc6 100644
--- a/src/devices/host/async-loop-owned-rpc-handler.h
+++ b/src/devices/driver_host/async-loop-owned-rpc-handler.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SRC_DEVICES_HOST_ASYNC_LOOP_OWNED_RPC_HANDLER_H_
-#define SRC_DEVICES_HOST_ASYNC_LOOP_OWNED_RPC_HANDLER_H_
+#ifndef SRC_DEVICES_DRIVER_HOST_ASYNC_LOOP_OWNED_RPC_HANDLER_H_
+#define SRC_DEVICES_DRIVER_HOST_ASYNC_LOOP_OWNED_RPC_HANDLER_H_
 
 #include <lib/async/cpp/wait.h>
 #include <lib/zx/channel.h>
@@ -77,4 +77,4 @@
 
 }  // namespace devmgr
 
-#endif  // SRC_DEVICES_HOST_ASYNC_LOOP_OWNED_RPC_HANDLER_H_
+#endif  // SRC_DEVICES_DRIVER_HOST_ASYNC_LOOP_OWNED_RPC_HANDLER_H_
diff --git a/src/devices/coordinator/async-loop-ref-counted-rpc-handler.h b/src/devices/driver_host/async-loop-ref-counted-rpc-handler.h
similarity index 92%
rename from src/devices/coordinator/async-loop-ref-counted-rpc-handler.h
rename to src/devices/driver_host/async-loop-ref-counted-rpc-handler.h
index 39790cd..2c97c65 100644
--- a/src/devices/coordinator/async-loop-ref-counted-rpc-handler.h
+++ b/src/devices/driver_host/async-loop-ref-counted-rpc-handler.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SRC_DEVICES_COORDINATOR_ASYNC_LOOP_REF_COUNTED_RPC_HANDLER_H_
-#define SRC_DEVICES_COORDINATOR_ASYNC_LOOP_REF_COUNTED_RPC_HANDLER_H_
+#ifndef SRC_DEVICES_DRIVER_HOST_ASYNC_LOOP_REF_COUNTED_RPC_HANDLER_H_
+#define SRC_DEVICES_DRIVER_HOST_ASYNC_LOOP_REF_COUNTED_RPC_HANDLER_H_
 
 #include <lib/async/cpp/wait.h>
 #include <lib/zx/channel.h>
@@ -71,4 +71,4 @@
 
 }  // namespace devmgr
 
-#endif  // SRC_DEVICES_COORDINATOR_ASYNC_LOOP_REF_COUNTED_RPC_HANDLER_H_
+#endif  // SRC_DEVICES_DRIVER_HOST_ASYNC_LOOP_REF_COUNTED_RPC_HANDLER_H_
diff --git a/src/devices/host/composite-device.cc b/src/devices/driver_host/composite-device.cc
similarity index 100%
rename from src/devices/host/composite-device.cc
rename to src/devices/driver_host/composite-device.cc
diff --git a/src/devices/host/composite-device.h b/src/devices/driver_host/composite-device.h
similarity index 87%
rename from src/devices/host/composite-device.h
rename to src/devices/driver_host/composite-device.h
index f8f3db1..e33595e 100644
--- a/src/devices/host/composite-device.h
+++ b/src/devices/driver_host/composite-device.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SRC_DEVICES_HOST_COMPOSITE_DEVICE_H_
-#define SRC_DEVICES_HOST_COMPOSITE_DEVICE_H_
+#ifndef SRC_DEVICES_DRIVER_HOST_COMPOSITE_DEVICE_H_
+#define SRC_DEVICES_DRIVER_HOST_COMPOSITE_DEVICE_H_
 
 #include <ddk/driver.h>
 #include <fbl/array.h>
@@ -36,4 +36,4 @@
 
 }  // namespace devmgr
 
-#endif  // SRC_DEVICES_HOST_COMPOSITE_DEVICE_H_
+#endif  // SRC_DEVICES_DRIVER_HOST_COMPOSITE_DEVICE_H_
diff --git a/src/devices/host/connection-destroyer.cc b/src/devices/driver_host/connection-destroyer.cc
similarity index 100%
rename from src/devices/host/connection-destroyer.cc
rename to src/devices/driver_host/connection-destroyer.cc
diff --git a/src/devices/host/connection-destroyer.h b/src/devices/driver_host/connection-destroyer.h
similarity index 89%
rename from src/devices/host/connection-destroyer.h
rename to src/devices/driver_host/connection-destroyer.h
index 1657dc0..c28cc6e 100644
--- a/src/devices/host/connection-destroyer.h
+++ b/src/devices/driver_host/connection-destroyer.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SRC_DEVICES_HOST_CONNECTION_DESTROYER_H_
-#define SRC_DEVICES_HOST_CONNECTION_DESTROYER_H_
+#ifndef SRC_DEVICES_DRIVER_HOST_CONNECTION_DESTROYER_H_
+#define SRC_DEVICES_DRIVER_HOST_CONNECTION_DESTROYER_H_
 
 #include <lib/async/cpp/receiver.h>
 #include <zircon/syscalls.h>
@@ -49,4 +49,4 @@
 
 }  // namespace devmgr
 
-#endif  // SRC_DEVICES_HOST_CONNECTION_DESTROYER_H_
+#endif  // SRC_DEVICES_DRIVER_HOST_CONNECTION_DESTROYER_H_
diff --git a/src/devices/host/core-test.cc b/src/devices/driver_host/core-test.cc
similarity index 100%
rename from src/devices/host/core-test.cc
rename to src/devices/driver_host/core-test.cc
diff --git a/src/devices/host/core.cc b/src/devices/driver_host/core.cc
similarity index 100%
rename from src/devices/host/core.cc
rename to src/devices/driver_host/core.cc
diff --git a/src/devices/host/devfs-connection.cc b/src/devices/driver_host/devfs-connection.cc
similarity index 100%
rename from src/devices/host/devfs-connection.cc
rename to src/devices/driver_host/devfs-connection.cc
diff --git a/src/devices/host/devfs-connection.h b/src/devices/driver_host/devfs-connection.h
similarity index 97%
rename from src/devices/host/devfs-connection.h
rename to src/devices/driver_host/devfs-connection.h
index d0c4c33..81a75fa 100644
--- a/src/devices/host/devfs-connection.h
+++ b/src/devices/driver_host/devfs-connection.h
@@ -2,7 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#pragma once
+#ifndef SRC_DEVICES_DRIVER_HOST_DEVFS_CONNECTION_H_
+#define SRC_DEVICES_DRIVER_HOST_DEVFS_CONNECTION_H_
 
 #include <fuchsia/device/llcpp/fidl.h>
 #include <lib/async/cpp/wait.h>
@@ -202,3 +203,5 @@
 };
 
 }  // namespace devmgr
+
+#endif  // SRC_DEVICES_DRIVER_HOST_DEVFS_CONNECTION_H_
diff --git a/src/devices/host/devhost-context.cc b/src/devices/driver_host/devhost-context.cc
similarity index 100%
rename from src/devices/host/devhost-context.cc
rename to src/devices/driver_host/devhost-context.cc
diff --git a/src/devices/host/devhost-context.h b/src/devices/driver_host/devhost-context.h
similarity index 94%
rename from src/devices/host/devhost-context.h
rename to src/devices/driver_host/devhost-context.h
index 1bd8134..ae4673a 100644
--- a/src/devices/host/devhost-context.h
+++ b/src/devices/driver_host/devhost-context.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SRC_DEVICES_HOST_DEVHOST_CONTEXT_H_
-#define SRC_DEVICES_HOST_DEVHOST_CONTEXT_H_
+#ifndef SRC_DEVICES_DRIVER_HOST_DEVHOST_CONTEXT_H_
+#define SRC_DEVICES_DRIVER_HOST_DEVHOST_CONTEXT_H_
 
 #include <lib/async-loop/cpp/loop.h>
 #include <lib/fit/function.h>
@@ -88,4 +88,4 @@
 
 }  // namespace devmgr
 
-#endif  // SRC_DEVICES_HOST_DEVHOST_CONTEXT_H_
+#endif  // SRC_DEVICES_DRIVER_HOST_DEVHOST_CONTEXT_H_
diff --git a/src/devices/host/devhost.cc b/src/devices/driver_host/devhost.cc
similarity index 99%
rename from src/devices/host/devhost.cc
rename to src/devices/driver_host/devhost.cc
index 5d4b854..d1466b5 100644
--- a/src/devices/host/devhost.cc
+++ b/src/devices/driver_host/devhost.cc
@@ -641,7 +641,8 @@
 
 void devhost_make_visible(const fbl::RefPtr<zx_device_t>& dev,
                           const device_make_visible_args_t* args) {
-  ZX_ASSERT_MSG(!dev->ops->init, "Cannot call device_make_visible if init hook is implemented."
+  ZX_ASSERT_MSG(!dev->ops->init,
+                "Cannot call device_make_visible if init hook is implemented."
                 "The device will automatically be made visible once the init hook is replied to.");
   const zx::channel& rpc = *dev->coordinator_rpc;
   if (!rpc.is_valid()) {
diff --git a/src/devices/host/devhost.h b/src/devices/driver_host/devhost.h
similarity index 98%
rename from src/devices/host/devhost.h
rename to src/devices/driver_host/devhost.h
index 5de5896..03a6b10 100644
--- a/src/devices/host/devhost.h
+++ b/src/devices/driver_host/devhost.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SRC_DEVICES_HOST_DEVHOST_H_
-#define SRC_DEVICES_HOST_DEVHOST_H_
+#ifndef SRC_DEVICES_DRIVER_HOST_DEVHOST_H_
+#define SRC_DEVICES_DRIVER_HOST_DEVHOST_H_
 
 #include <fuchsia/device/manager/llcpp/fidl.h>
 #include <lib/async-loop/cpp/loop.h>
@@ -273,4 +273,4 @@
 
 }  // namespace devmgr
 
-#endif  // SRC_DEVICES_HOST_DEVHOST_H_
+#endif  // SRC_DEVICES_DRIVER_HOST_DEVHOST_H_
diff --git a/src/devices/host/device-api-test.cc b/src/devices/driver_host/device-api-test.cc
similarity index 100%
rename from src/devices/host/device-api-test.cc
rename to src/devices/driver_host/device-api-test.cc
diff --git a/src/devices/host/device-controller-connection-test.cc b/src/devices/driver_host/device-controller-connection-test.cc
similarity index 100%
rename from src/devices/host/device-controller-connection-test.cc
rename to src/devices/driver_host/device-controller-connection-test.cc
diff --git a/src/devices/host/device-controller-connection.cc b/src/devices/driver_host/device-controller-connection.cc
similarity index 100%
rename from src/devices/host/device-controller-connection.cc
rename to src/devices/driver_host/device-controller-connection.cc
diff --git a/src/devices/host/device-controller-connection.h b/src/devices/driver_host/device-controller-connection.h
similarity index 94%
rename from src/devices/host/device-controller-connection.h
rename to src/devices/driver_host/device-controller-connection.h
index 3206a18..8fec7f1 100644
--- a/src/devices/host/device-controller-connection.h
+++ b/src/devices/driver_host/device-controller-connection.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SRC_DEVICES_HOST_DEVICE_CONTROLLER_CONNECTION_H_
-#define SRC_DEVICES_HOST_DEVICE_CONTROLLER_CONNECTION_H_
+#ifndef SRC_DEVICES_DRIVER_HOST_DEVICE_CONTROLLER_CONNECTION_H_
+#define SRC_DEVICES_DRIVER_HOST_DEVICE_CONTROLLER_CONNECTION_H_
 
 #include <fuchsia/device/manager/llcpp/fidl.h>
 #include <fuchsia/io/c/fidl.h>
@@ -85,4 +85,4 @@
 
 }  // namespace devmgr
 
-#endif  // SRC_DEVICES_HOST_DEVICE_CONTROLLER_CONNECTION_H_
+#endif  // SRC_DEVICES_DRIVER_HOST_DEVICE_CONTROLLER_CONNECTION_H_
diff --git a/src/devices/host/device-controller-integration-test.cc b/src/devices/driver_host/device-controller-integration-test.cc
similarity index 100%
rename from src/devices/host/device-controller-integration-test.cc
rename to src/devices/driver_host/device-controller-integration-test.cc
diff --git a/src/devices/host/env.cc b/src/devices/driver_host/env.cc
similarity index 100%
rename from src/devices/host/env.cc
rename to src/devices/driver_host/env.cc
diff --git a/src/devices/host/env.h b/src/devices/driver_host/env.h
similarity index 79%
rename from src/devices/host/env.h
rename to src/devices/driver_host/env.h
index b416b65..49d8290 100644
--- a/src/devices/host/env.h
+++ b/src/devices/driver_host/env.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SRC_DEVICES_HOST_ENV_H_
-#define SRC_DEVICES_HOST_ENV_H_
+#ifndef SRC_DEVICES_DRIVER_HOST_ENV_H_
+#define SRC_DEVICES_DRIVER_HOST_ENV_H_
 
 namespace devmgr {
 
@@ -14,4 +14,4 @@
 
 }  // namespace devmgr
 
-#endif  // SRC_DEVICES_HOST_ENV_H_
+#endif  // SRC_DEVICES_DRIVER_HOST_ENV_H_
diff --git a/src/devices/host/fidl_txn.h b/src/devices/driver_host/fidl_txn.h
similarity index 96%
rename from src/devices/host/fidl_txn.h
rename to src/devices/driver_host/fidl_txn.h
index acfb843..ea95fa0 100644
--- a/src/devices/host/fidl_txn.h
+++ b/src/devices/driver_host/fidl_txn.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SRC_DEVICES_HOST_FIDL_TXN_H_
-#define SRC_DEVICES_HOST_FIDL_TXN_H_
+#ifndef SRC_DEVICES_DRIVER_HOST_FIDL_TXN_H_
+#define SRC_DEVICES_DRIVER_HOST_FIDL_TXN_H_
 
 #include <lib/fidl/epitaph.h>
 #include <lib/fidl/llcpp/transaction.h>
@@ -113,4 +113,4 @@
 
 }  // namespace devmgr
 
-#endif  // SRC_DEVICES_HOST_FIDL_TXN_H_
+#endif  // SRC_DEVICES_DRIVER_HOST_FIDL_TXN_H_
diff --git a/src/devices/host/lock.h b/src/devices/driver_host/lock.h
similarity index 91%
rename from src/devices/host/lock.h
rename to src/devices/driver_host/lock.h
index 3bd3132..9bf2887 100644
--- a/src/devices/host/lock.h
+++ b/src/devices/driver_host/lock.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SRC_DEVICES_HOST_LOCK_H_
-#define SRC_DEVICES_HOST_LOCK_H_
+#ifndef SRC_DEVICES_DRIVER_HOST_LOCK_H_
+#define SRC_DEVICES_DRIVER_HOST_LOCK_H_
 
 #include <lib/zircon-internal/thread_annotations.h>
 #include <threads.h>
@@ -50,4 +50,4 @@
 
 }  // namespace devmgr
 
-#endif  // SRC_DEVICES_HOST_LOCK_H_
+#endif  // SRC_DEVICES_DRIVER_HOST_LOCK_H_
diff --git a/src/devices/host/log.h b/src/devices/driver_host/log.h
similarity index 86%
rename from src/devices/host/log.h
rename to src/devices/driver_host/log.h
index 57f588a..2bfae9e 100644
--- a/src/devices/host/log.h
+++ b/src/devices/driver_host/log.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SRC_DEVICES_HOST_LOG_H_
-#define SRC_DEVICES_HOST_LOG_H_
+#ifndef SRC_DEVICES_DRIVER_HOST_LOG_H_
+#define SRC_DEVICES_DRIVER_HOST_LOG_H_
 
 #include <stdint.h>
 #include <stdio.h>
@@ -36,4 +36,4 @@
 
 }  // namespace devmgr
 
-#endif  // SRC_DEVICES_HOST_LOG_H_
+#endif  // SRC_DEVICES_DRIVER_HOST_LOG_H_
diff --git a/src/devices/host/main.cc b/src/devices/driver_host/main.cc
similarity index 100%
rename from src/devices/host/main.cc
rename to src/devices/driver_host/main.cc
diff --git a/src/devices/host/main.h b/src/devices/driver_host/main.h
similarity index 65%
rename from src/devices/host/main.h
rename to src/devices/driver_host/main.h
index 54597b70..d577569 100644
--- a/src/devices/host/main.h
+++ b/src/devices/driver_host/main.h
@@ -2,9 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SRC_DEVICES_HOST_MAIN_H_
-#define SRC_DEVICES_HOST_MAIN_H_
+#ifndef SRC_DEVICES_DRIVER_HOST_MAIN_H_
+#define SRC_DEVICES_DRIVER_HOST_MAIN_H_
 
 extern "C" int devmgr_device_host_main(int argc, char** argv);
 
-#endif  // SRC_DEVICES_HOST_MAIN_H_
+#endif  // SRC_DEVICES_DRIVER_HOST_MAIN_H_
diff --git a/src/devices/host/meta/devhost-tests.cmx b/src/devices/driver_host/meta/devhost-tests.cmx
similarity index 100%
rename from src/devices/host/meta/devhost-tests.cmx
rename to src/devices/driver_host/meta/devhost-tests.cmx
diff --git a/src/devices/host/proxy-iostate-test.cc b/src/devices/driver_host/proxy-iostate-test.cc
similarity index 100%
rename from src/devices/host/proxy-iostate-test.cc
rename to src/devices/driver_host/proxy-iostate-test.cc
diff --git a/src/devices/host/proxy-iostate.cc b/src/devices/driver_host/proxy-iostate.cc
similarity index 100%
rename from src/devices/host/proxy-iostate.cc
rename to src/devices/driver_host/proxy-iostate.cc
diff --git a/src/devices/host/proxy-iostate.h b/src/devices/driver_host/proxy-iostate.h
similarity index 91%
rename from src/devices/host/proxy-iostate.h
rename to src/devices/driver_host/proxy-iostate.h
index 439a2e4..788f825 100644
--- a/src/devices/host/proxy-iostate.h
+++ b/src/devices/driver_host/proxy-iostate.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SRC_DEVICES_HOST_PROXY_IOSTATE_H_
-#define SRC_DEVICES_HOST_PROXY_IOSTATE_H_
+#ifndef SRC_DEVICES_DRIVER_HOST_PROXY_IOSTATE_H_
+#define SRC_DEVICES_DRIVER_HOST_PROXY_IOSTATE_H_
 
 #include <lib/async/cpp/wait.h>
 #include <lib/zircon-internal/thread_annotations.h>
@@ -46,4 +46,4 @@
 
 }  // namespace devmgr
 
-#endif  // SRC_DEVICES_HOST_PROXY_IOSTATE_H_
+#endif  // SRC_DEVICES_DRIVER_HOST_PROXY_IOSTATE_H_
diff --git a/src/devices/host/rpc-server.cc b/src/devices/driver_host/rpc-server.cc
similarity index 100%
rename from src/devices/host/rpc-server.cc
rename to src/devices/driver_host/rpc-server.cc
diff --git a/src/devices/host/scheduler_profile.cc b/src/devices/driver_host/scheduler_profile.cc
similarity index 100%
rename from src/devices/host/scheduler_profile.cc
rename to src/devices/driver_host/scheduler_profile.cc
diff --git a/src/devices/host/scheduler_profile.h b/src/devices/driver_host/scheduler_profile.h
similarity index 80%
rename from src/devices/host/scheduler_profile.h
rename to src/devices/driver_host/scheduler_profile.h
index ae0962e..e238602 100644
--- a/src/devices/host/scheduler_profile.h
+++ b/src/devices/driver_host/scheduler_profile.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SRC_DEVICES_HOST_SCHEDULER_PROFILE_H_
-#define SRC_DEVICES_HOST_SCHEDULER_PROFILE_H_
+#ifndef SRC_DEVICES_DRIVER_HOST_SCHEDULER_PROFILE_H_
+#define SRC_DEVICES_DRIVER_HOST_SCHEDULER_PROFILE_H_
 
 #include <zircon/types.h>
 
@@ -18,4 +18,4 @@
                                                    zx_handle_t* profile);
 }  // namespace devmgr
 
-#endif  // SRC_DEVICES_HOST_SCHEDULER_PROFILE_H_
+#endif  // SRC_DEVICES_DRIVER_HOST_SCHEDULER_PROFILE_H_
diff --git a/src/devices/host/tracing.cc b/src/devices/driver_host/tracing.cc
similarity index 100%
rename from src/devices/host/tracing.cc
rename to src/devices/driver_host/tracing.cc
diff --git a/src/devices/host/tracing.h b/src/devices/driver_host/tracing.h
similarity index 77%
rename from src/devices/host/tracing.h
rename to src/devices/driver_host/tracing.h
index 019f666..3a04cb4 100644
--- a/src/devices/host/tracing.h
+++ b/src/devices/driver_host/tracing.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SRC_DEVICES_HOST_TRACING_H_
-#define SRC_DEVICES_HOST_TRACING_H_
+#ifndef SRC_DEVICES_DRIVER_HOST_TRACING_H_
+#define SRC_DEVICES_DRIVER_HOST_TRACING_H_
 
 #include <zircon/types.h>
 
@@ -16,4 +16,4 @@
 
 }  // namespace devmgr
 
-#endif  // SRC_DEVICES_HOST_TRACING_H_
+#endif  // SRC_DEVICES_DRIVER_HOST_TRACING_H_
diff --git a/src/devices/host/zx-device.cc b/src/devices/driver_host/zx-device.cc
similarity index 100%
rename from src/devices/host/zx-device.cc
rename to src/devices/driver_host/zx-device.cc
diff --git a/src/devices/host/zx-device.h b/src/devices/driver_host/zx-device.h
similarity index 98%
rename from src/devices/host/zx-device.h
rename to src/devices/driver_host/zx-device.h
index db0ff1d..954536a 100644
--- a/src/devices/host/zx-device.h
+++ b/src/devices/driver_host/zx-device.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SRC_DEVICES_HOST_ZX_DEVICE_H_
-#define SRC_DEVICES_HOST_ZX_DEVICE_H_
+#ifndef SRC_DEVICES_DRIVER_HOST_ZX_DEVICE_H_
+#define SRC_DEVICES_DRIVER_HOST_ZX_DEVICE_H_
 
 #include <fuchsia/device/llcpp/fidl.h>
 #include <fuchsia/device/manager/c/fidl.h>
@@ -333,4 +333,4 @@
 // one created by device_open).
 zx_status_t device_close(fbl::RefPtr<zx_device_t> dev, uint32_t flags);
 
-#endif  // SRC_DEVICES_HOST_ZX_DEVICE_H_
+#endif  // SRC_DEVICES_DRIVER_HOST_ZX_DEVICE_H_
diff --git a/src/devices/coordinator/BUILD.gn b/src/devices/driver_manager/BUILD.gn
similarity index 98%
rename from src/devices/coordinator/BUILD.gn
rename to src/devices/driver_manager/BUILD.gn
index 87900d1..44b9b81 100644
--- a/src/devices/coordinator/BUILD.gn
+++ b/src/devices/driver_manager/BUILD.gn
@@ -7,6 +7,10 @@
 import("//build/test/test_package.gni")
 import("//build/testing/environments.gni")
 
+group("driver_manager") {
+  deps = [ ":coordinator" ]
+}
+
 # Common source files and dependencies between :coordinator and :test
 source_set("lib") {
   visibility = [ ":*" ]
diff --git a/src/devices/coordinator/async-loop-owned-rpc-handler.h b/src/devices/driver_manager/async-loop-owned-rpc-handler.h
similarity index 92%
rename from src/devices/coordinator/async-loop-owned-rpc-handler.h
rename to src/devices/driver_manager/async-loop-owned-rpc-handler.h
index 2c575c9..b74e718 100644
--- a/src/devices/coordinator/async-loop-owned-rpc-handler.h
+++ b/src/devices/driver_manager/async-loop-owned-rpc-handler.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SRC_DEVICES_COORDINATOR_ASYNC_LOOP_OWNED_RPC_HANDLER_H_
-#define SRC_DEVICES_COORDINATOR_ASYNC_LOOP_OWNED_RPC_HANDLER_H_
+#ifndef SRC_DEVICES_DRIVER_MANAGER_ASYNC_LOOP_OWNED_RPC_HANDLER_H_
+#define SRC_DEVICES_DRIVER_MANAGER_ASYNC_LOOP_OWNED_RPC_HANDLER_H_
 
 #include <lib/async/cpp/wait.h>
 #include <lib/zx/channel.h>
@@ -74,4 +74,4 @@
 
 }  // namespace devmgr
 
-#endif  // SRC_DEVICES_COORDINATOR_ASYNC_LOOP_OWNED_RPC_HANDLER_H_
+#endif  // SRC_DEVICES_DRIVER_MANAGER_ASYNC_LOOP_OWNED_RPC_HANDLER_H_
diff --git a/src/devices/coordinator/async-loop-ref-counted-rpc-handler.h b/src/devices/driver_manager/async-loop-ref-counted-rpc-handler.h
similarity index 91%
copy from src/devices/coordinator/async-loop-ref-counted-rpc-handler.h
copy to src/devices/driver_manager/async-loop-ref-counted-rpc-handler.h
index 39790cd..7362751 100644
--- a/src/devices/coordinator/async-loop-ref-counted-rpc-handler.h
+++ b/src/devices/driver_manager/async-loop-ref-counted-rpc-handler.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SRC_DEVICES_COORDINATOR_ASYNC_LOOP_REF_COUNTED_RPC_HANDLER_H_
-#define SRC_DEVICES_COORDINATOR_ASYNC_LOOP_REF_COUNTED_RPC_HANDLER_H_
+#ifndef SRC_DEVICES_DRIVER_MANAGER_ASYNC_LOOP_REF_COUNTED_RPC_HANDLER_H_
+#define SRC_DEVICES_DRIVER_MANAGER_ASYNC_LOOP_REF_COUNTED_RPC_HANDLER_H_
 
 #include <lib/async/cpp/wait.h>
 #include <lib/zx/channel.h>
@@ -71,4 +71,4 @@
 
 }  // namespace devmgr
 
-#endif  // SRC_DEVICES_COORDINATOR_ASYNC_LOOP_REF_COUNTED_RPC_HANDLER_H_
+#endif  // SRC_DEVICES_DRIVER_MANAGER_ASYNC_LOOP_REF_COUNTED_RPC_HANDLER_H_
diff --git a/src/devices/coordinator/binding-internal.h b/src/devices/driver_manager/binding-internal.h
similarity index 97%
rename from src/devices/coordinator/binding-internal.h
rename to src/devices/driver_manager/binding-internal.h
index 0b34a00..7d7b2de 100644
--- a/src/devices/coordinator/binding-internal.h
+++ b/src/devices/driver_manager/binding-internal.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SRC_DEVICES_COORDINATOR_BINDING_INTERNAL_H_
-#define SRC_DEVICES_COORDINATOR_BINDING_INTERNAL_H_
+#ifndef SRC_DEVICES_DRIVER_MANAGER_BINDING_INTERNAL_H_
+#define SRC_DEVICES_DRIVER_MANAGER_BINDING_INTERNAL_H_
 
 #include <stdio.h>
 
@@ -272,4 +272,4 @@
 
 }  // namespace devmgr
 
-#endif  // SRC_DEVICES_COORDINATOR_BINDING_INTERNAL_H_
+#endif  // SRC_DEVICES_DRIVER_MANAGER_BINDING_INTERNAL_H_
diff --git a/src/devices/coordinator/binding-test.cc b/src/devices/driver_manager/binding-test.cc
similarity index 100%
rename from src/devices/coordinator/binding-test.cc
rename to src/devices/driver_manager/binding-test.cc
diff --git a/src/devices/coordinator/binding.cc b/src/devices/driver_manager/binding.cc
similarity index 100%
rename from src/devices/coordinator/binding.cc
rename to src/devices/driver_manager/binding.cc
diff --git a/src/devices/coordinator/composite-device-tests.cc b/src/devices/driver_manager/composite-device-tests.cc
similarity index 100%
rename from src/devices/coordinator/composite-device-tests.cc
rename to src/devices/driver_manager/composite-device-tests.cc
diff --git a/src/devices/coordinator/composite-device.cc b/src/devices/driver_manager/composite-device.cc
similarity index 100%
rename from src/devices/coordinator/composite-device.cc
rename to src/devices/driver_manager/composite-device.cc
diff --git a/src/devices/coordinator/composite-device.h b/src/devices/driver_manager/composite-device.h
similarity index 97%
rename from src/devices/coordinator/composite-device.h
rename to src/devices/driver_manager/composite-device.h
index b7b8a01..4157186 100644
--- a/src/devices/coordinator/composite-device.h
+++ b/src/devices/driver_manager/composite-device.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SRC_DEVICES_COORDINATOR_COMPOSITE_DEVICE_H_
-#define SRC_DEVICES_COORDINATOR_COMPOSITE_DEVICE_H_
+#ifndef SRC_DEVICES_DRIVER_MANAGER_COMPOSITE_DEVICE_H_
+#define SRC_DEVICES_DRIVER_MANAGER_COMPOSITE_DEVICE_H_
 
 #include <fuchsia/device/manager/c/fidl.h>
 #include <fuchsia/device/manager/llcpp/fidl.h>
@@ -184,4 +184,4 @@
 
 }  // namespace devmgr
 
-#endif  // SRC_DEVICES_COORDINATOR_COMPOSITE_DEVICE_H_
+#endif  // SRC_DEVICES_DRIVER_MANAGER_COMPOSITE_DEVICE_H_
diff --git a/src/devices/coordinator/coordinator-test-utils.cc b/src/devices/driver_manager/coordinator-test-utils.cc
similarity index 100%
rename from src/devices/coordinator/coordinator-test-utils.cc
rename to src/devices/driver_manager/coordinator-test-utils.cc
diff --git a/src/devices/coordinator/coordinator-test-utils.h b/src/devices/driver_manager/coordinator-test-utils.h
similarity index 87%
rename from src/devices/coordinator/coordinator-test-utils.h
rename to src/devices/driver_manager/coordinator-test-utils.h
index 35c1a85..9603676 100644
--- a/src/devices/coordinator/coordinator-test-utils.h
+++ b/src/devices/driver_manager/coordinator-test-utils.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SRC_DEVICES_COORDINATOR_COORDINATOR_TEST_UTILS_H_
-#define SRC_DEVICES_COORDINATOR_COORDINATOR_TEST_UTILS_H_
+#ifndef SRC_DEVICES_DRIVER_MANAGER_COORDINATOR_TEST_UTILS_H_
+#define SRC_DEVICES_DRIVER_MANAGER_COORDINATOR_TEST_UTILS_H_
 
 #include <fuchsia/driver/test/c/fidl.h>
 #include <fuchsia/hardware/power/statecontrol/llcpp/fidl.h>
@@ -40,4 +40,4 @@
 
 void CheckBindDriverReceived(const zx::channel& remote, const char* expected_driver);
 
-#endif  // SRC_DEVICES_COORDINATOR_COORDINATOR_TEST_UTILS_H_
+#endif  // SRC_DEVICES_DRIVER_MANAGER_COORDINATOR_TEST_UTILS_H_
diff --git a/src/devices/coordinator/coordinator-test.h b/src/devices/driver_manager/coordinator-test.h
similarity index 87%
rename from src/devices/coordinator/coordinator-test.h
rename to src/devices/driver_manager/coordinator-test.h
index 1a0f02a..6c7074e 100644
--- a/src/devices/coordinator/coordinator-test.h
+++ b/src/devices/driver_manager/coordinator-test.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SRC_DEVICES_COORDINATOR_COORDINATOR_TEST_H_
-#define SRC_DEVICES_COORDINATOR_COORDINATOR_TEST_H_
+#ifndef SRC_DEVICES_DRIVER_MANAGER_COORDINATOR_TEST_H_
+#define SRC_DEVICES_DRIVER_MANAGER_COORDINATOR_TEST_H_
 
 #include <fuchsia/device/manager/c/fidl.h>
 #include <fuchsia/driver/test/c/fidl.h>
@@ -39,4 +39,4 @@
 
 void CheckBindDriverReceived(const zx::channel& remote, const char* expected_driver);
 
-#endif  // SRC_DEVICES_COORDINATOR_COORDINATOR_TEST_H_
+#endif  // SRC_DEVICES_DRIVER_MANAGER_COORDINATOR_TEST_H_
diff --git a/src/devices/coordinator/coordinator.cc b/src/devices/driver_manager/coordinator.cc
similarity index 100%
rename from src/devices/coordinator/coordinator.cc
rename to src/devices/driver_manager/coordinator.cc
diff --git a/src/devices/coordinator/coordinator.h b/src/devices/driver_manager/coordinator.h
similarity index 98%
rename from src/devices/coordinator/coordinator.h
rename to src/devices/driver_manager/coordinator.h
index d75ee98..00d527d 100644
--- a/src/devices/coordinator/coordinator.h
+++ b/src/devices/driver_manager/coordinator.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SRC_DEVICES_COORDINATOR_COORDINATOR_H_
-#define SRC_DEVICES_COORDINATOR_COORDINATOR_H_
+#ifndef SRC_DEVICES_DRIVER_MANAGER_COORDINATOR_H_
+#define SRC_DEVICES_DRIVER_MANAGER_COORDINATOR_H_
 
 #include <fuchsia/fshost/llcpp/fidl.h>
 #include <lib/async/cpp/wait.h>
@@ -429,4 +429,4 @@
 
 }  // namespace devmgr
 
-#endif  // SRC_DEVICES_COORDINATOR_COORDINATOR_H_
+#endif  // SRC_DEVICES_DRIVER_MANAGER_COORDINATOR_H_
diff --git a/src/devices/coordinator/devfs.cc b/src/devices/driver_manager/devfs.cc
similarity index 100%
rename from src/devices/coordinator/devfs.cc
rename to src/devices/driver_manager/devfs.cc
diff --git a/src/devices/coordinator/devfs.h b/src/devices/driver_manager/devfs.h
similarity index 91%
rename from src/devices/coordinator/devfs.h
rename to src/devices/driver_manager/devfs.h
index f41567e..48cb7f54 100644
--- a/src/devices/coordinator/devfs.h
+++ b/src/devices/driver_manager/devfs.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SRC_DEVICES_COORDINATOR_DEVFS_H_
-#define SRC_DEVICES_COORDINATOR_DEVFS_H_
+#ifndef SRC_DEVICES_DRIVER_MANAGER_DEVFS_H_
+#define SRC_DEVICES_DRIVER_MANAGER_DEVFS_H_
 
 #include <lib/async/dispatcher.h>
 #include <lib/zx/channel.h>
@@ -42,4 +42,4 @@
 
 }  // namespace devmgr
 
-#endif  // SRC_DEVICES_COORDINATOR_DEVFS_H_
+#endif  // SRC_DEVICES_DRIVER_MANAGER_DEVFS_H_
diff --git a/src/devices/coordinator/devhost-loader-service.cc b/src/devices/driver_manager/devhost-loader-service.cc
similarity index 100%
rename from src/devices/coordinator/devhost-loader-service.cc
rename to src/devices/driver_manager/devhost-loader-service.cc
diff --git a/src/devices/coordinator/devhost-loader-service.h b/src/devices/driver_manager/devhost-loader-service.h
similarity index 85%
rename from src/devices/coordinator/devhost-loader-service.h
rename to src/devices/driver_manager/devhost-loader-service.h
index 80d9363d..23371e8 100644
--- a/src/devices/coordinator/devhost-loader-service.h
+++ b/src/devices/driver_manager/devhost-loader-service.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SRC_DEVICES_COORDINATOR_DEVHOST_LOADER_SERVICE_H_
-#define SRC_DEVICES_COORDINATOR_DEVHOST_LOADER_SERVICE_H_
+#ifndef SRC_DEVICES_DRIVER_MANAGER_DEVHOST_LOADER_SERVICE_H_
+#define SRC_DEVICES_DRIVER_MANAGER_DEVHOST_LOADER_SERVICE_H_
 
 #include <lib/fdio/namespace.h>
 #include <lib/zx/channel.h>
@@ -39,4 +39,4 @@
 
 }  // namespace devmgr
 
-#endif  // SRC_DEVICES_COORDINATOR_DEVHOST_LOADER_SERVICE_H_
+#endif  // SRC_DEVICES_DRIVER_MANAGER_DEVHOST_LOADER_SERVICE_H_
diff --git a/src/devices/coordinator/devhost.h b/src/devices/driver_manager/devhost.h
similarity index 94%
rename from src/devices/coordinator/devhost.h
rename to src/devices/driver_manager/devhost.h
index d6bc719..d964b13 100644
--- a/src/devices/coordinator/devhost.h
+++ b/src/devices/driver_manager/devhost.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SRC_DEVICES_COORDINATOR_DEVHOST_H_
-#define SRC_DEVICES_COORDINATOR_DEVHOST_H_
+#ifndef SRC_DEVICES_DRIVER_MANAGER_DEVHOST_H_
+#define SRC_DEVICES_DRIVER_MANAGER_DEVHOST_H_
 
 #include <lib/async/cpp/wait.h>
 #include <lib/zx/process.h>
@@ -91,4 +91,4 @@
 
 }  // namespace devmgr
 
-#endif  // SRC_DEVICES_COORDINATOR_DEVHOST_H_
+#endif  // SRC_DEVICES_DRIVER_MANAGER_DEVHOST_H_
diff --git a/src/devices/coordinator/device.cc b/src/devices/driver_manager/device.cc
similarity index 100%
rename from src/devices/coordinator/device.cc
rename to src/devices/driver_manager/device.cc
diff --git a/src/devices/coordinator/device.h b/src/devices/driver_manager/device.h
similarity index 99%
rename from src/devices/coordinator/device.h
rename to src/devices/driver_manager/device.h
index d91b1bb..ffc7c34 100644
--- a/src/devices/coordinator/device.h
+++ b/src/devices/driver_manager/device.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SRC_DEVICES_COORDINATOR_DEVICE_H_
-#define SRC_DEVICES_COORDINATOR_DEVICE_H_
+#ifndef SRC_DEVICES_DRIVER_MANAGER_DEVICE_H_
+#define SRC_DEVICES_DRIVER_MANAGER_DEVICE_H_
 
 #include <fuchsia/device/manager/c/fidl.h>
 #include <fuchsia/device/manager/cpp/fidl.h>
@@ -654,4 +654,4 @@
 
 }  // namespace devmgr
 
-#endif  // SRC_DEVICES_COORDINATOR_DEVICE_H_
+#endif  // SRC_DEVICES_DRIVER_MANAGER_DEVICE_H_
diff --git a/src/devices/coordinator/driver-test-reporter.cc b/src/devices/driver_manager/driver-test-reporter.cc
similarity index 100%
rename from src/devices/coordinator/driver-test-reporter.cc
rename to src/devices/driver_manager/driver-test-reporter.cc
diff --git a/src/devices/coordinator/driver-test-reporter.h b/src/devices/driver_manager/driver-test-reporter.h
similarity index 83%
rename from src/devices/coordinator/driver-test-reporter.h
rename to src/devices/driver_manager/driver-test-reporter.h
index c27a566..bfed2df 100644
--- a/src/devices/coordinator/driver-test-reporter.h
+++ b/src/devices/driver_manager/driver-test-reporter.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SRC_DEVICES_COORDINATOR_DRIVER_TEST_REPORTER_H_
-#define SRC_DEVICES_COORDINATOR_DRIVER_TEST_REPORTER_H_
+#ifndef SRC_DEVICES_DRIVER_MANAGER_DRIVER_TEST_REPORTER_H_
+#define SRC_DEVICES_DRIVER_MANAGER_DRIVER_TEST_REPORTER_H_
 
 #include <fuchsia/driver/test/c/fidl.h>
 
@@ -34,4 +34,4 @@
 
 }  // namespace devmgr
 
-#endif  // SRC_DEVICES_COORDINATOR_DRIVER_TEST_REPORTER_H_
+#endif  // SRC_DEVICES_DRIVER_MANAGER_DRIVER_TEST_REPORTER_H_
diff --git a/src/devices/coordinator/driver.cc b/src/devices/driver_manager/driver.cc
similarity index 100%
rename from src/devices/coordinator/driver.cc
rename to src/devices/driver_manager/driver.cc
diff --git a/src/devices/coordinator/driver.h b/src/devices/driver_manager/driver.h
similarity index 89%
rename from src/devices/coordinator/driver.h
rename to src/devices/driver_manager/driver.h
index 37b2c60..011bed5 100644
--- a/src/devices/coordinator/driver.h
+++ b/src/devices/driver_manager/driver.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SRC_DEVICES_COORDINATOR_DRIVER_H_
-#define SRC_DEVICES_COORDINATOR_DRIVER_H_
+#ifndef SRC_DEVICES_DRIVER_MANAGER_DRIVER_H_
+#define SRC_DEVICES_DRIVER_MANAGER_DRIVER_H_
 
 #include <lib/fit/function.h>
 #include <lib/zx/vmo.h>
@@ -47,4 +47,4 @@
 
 }  // namespace devmgr
 
-#endif  // SRC_DEVICES_COORDINATOR_DRIVER_H_
+#endif  // SRC_DEVICES_DRIVER_MANAGER_DRIVER_H_
diff --git a/src/devices/coordinator/env.cc b/src/devices/driver_manager/env.cc
similarity index 100%
rename from src/devices/coordinator/env.cc
rename to src/devices/driver_manager/env.cc
diff --git a/src/devices/host/env.h b/src/devices/driver_manager/env.h
similarity index 78%
copy from src/devices/host/env.h
copy to src/devices/driver_manager/env.h
index b416b65..a8e9297 100644
--- a/src/devices/host/env.h
+++ b/src/devices/driver_manager/env.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SRC_DEVICES_HOST_ENV_H_
-#define SRC_DEVICES_HOST_ENV_H_
+#ifndef SRC_DEVICES_DRIVER_MANAGER_ENV_H_
+#define SRC_DEVICES_DRIVER_MANAGER_ENV_H_
 
 namespace devmgr {
 
@@ -14,4 +14,4 @@
 
 }  // namespace devmgr
 
-#endif  // SRC_DEVICES_HOST_ENV_H_
+#endif  // SRC_DEVICES_DRIVER_MANAGER_ENV_H_
diff --git a/src/devices/coordinator/fdio.cc b/src/devices/driver_manager/fdio.cc
similarity index 100%
rename from src/devices/coordinator/fdio.cc
rename to src/devices/driver_manager/fdio.cc
diff --git a/src/devices/coordinator/fdio.h b/src/devices/driver_manager/fdio.h
similarity index 96%
rename from src/devices/coordinator/fdio.h
rename to src/devices/driver_manager/fdio.h
index 65c98ab..94ca53f 100644
--- a/src/devices/coordinator/fdio.h
+++ b/src/devices/driver_manager/fdio.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SRC_DEVICES_COORDINATOR_FDIO_H_
-#define SRC_DEVICES_COORDINATOR_FDIO_H_
+#ifndef SRC_DEVICES_DRIVER_MANAGER_FDIO_H_
+#define SRC_DEVICES_DRIVER_MANAGER_FDIO_H_
 
 #include <lib/zx/channel.h>
 #include <lib/zx/job.h>
@@ -108,4 +108,4 @@
 
 }  // namespace devmgr
 
-#endif  // SRC_DEVICES_COORDINATOR_FDIO_H_
+#endif  // SRC_DEVICES_DRIVER_MANAGER_FDIO_H_
diff --git a/src/devices/coordinator/fidl.cc b/src/devices/driver_manager/fidl.cc
similarity index 100%
rename from src/devices/coordinator/fidl.cc
rename to src/devices/driver_manager/fidl.cc
diff --git a/src/devices/coordinator/fidl.h b/src/devices/driver_manager/fidl.h
similarity index 92%
rename from src/devices/coordinator/fidl.h
rename to src/devices/driver_manager/fidl.h
index 71a94c6..de7e5ae 100644
--- a/src/devices/coordinator/fidl.h
+++ b/src/devices/driver_manager/fidl.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SRC_DEVICES_COORDINATOR_FIDL_H_
-#define SRC_DEVICES_COORDINATOR_FIDL_H_
+#ifndef SRC_DEVICES_DRIVER_MANAGER_FIDL_H_
+#define SRC_DEVICES_DRIVER_MANAGER_FIDL_H_
 
 #include <lib/zx/channel.h>
 #include <lib/zx/vmo.h>
@@ -37,4 +37,4 @@
 
 }  // namespace devmgr
 
-#endif  // SRC_DEVICES_COORDINATOR_FIDL_H_
+#endif  // SRC_DEVICES_DRIVER_MANAGER_FIDL_H_
diff --git a/src/devices/coordinator/fidl_txn.h b/src/devices/driver_manager/fidl_txn.h
similarity index 95%
rename from src/devices/coordinator/fidl_txn.h
rename to src/devices/driver_manager/fidl_txn.h
index ec6320a..bde2454 100644
--- a/src/devices/coordinator/fidl_txn.h
+++ b/src/devices/driver_manager/fidl_txn.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SRC_DEVICES_COORDINATOR_FIDL_TXN_H_
-#define SRC_DEVICES_COORDINATOR_FIDL_TXN_H_
+#ifndef SRC_DEVICES_DRIVER_MANAGER_FIDL_TXN_H_
+#define SRC_DEVICES_DRIVER_MANAGER_FIDL_TXN_H_
 
 #include <lib/fidl/epitaph.h>
 #include <lib/fidl/llcpp/transaction.h>
@@ -117,4 +117,4 @@
 
 }  // namespace devmgr
 
-#endif  // SRC_DEVICES_COORDINATOR_FIDL_TXN_H_
+#endif  // SRC_DEVICES_DRIVER_MANAGER_FIDL_TXN_H_
diff --git a/src/devices/coordinator/init-task.cc b/src/devices/driver_manager/init-task.cc
similarity index 100%
rename from src/devices/coordinator/init-task.cc
rename to src/devices/driver_manager/init-task.cc
diff --git a/src/devices/coordinator/init-task.h b/src/devices/driver_manager/init-task.h
similarity index 80%
rename from src/devices/coordinator/init-task.h
rename to src/devices/driver_manager/init-task.h
index 7bcbf66..995a02ee 100644
--- a/src/devices/coordinator/init-task.h
+++ b/src/devices/driver_manager/init-task.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SRC_DEVICES_COORDINATOR_INIT_TASK_H_
-#define SRC_DEVICES_COORDINATOR_INIT_TASK_H_
+#ifndef SRC_DEVICES_DRIVER_MANAGER_INIT_TASK_H_
+#define SRC_DEVICES_DRIVER_MANAGER_INIT_TASK_H_
 
 #include "device.h"
 #include "task.h"
@@ -28,4 +28,4 @@
 
 }  // namespace devmgr
 
-#endif  // SRC_DEVICES_COORDINATOR_INIT_TASK_H_
+#endif  // SRC_DEVICES_DRIVER_MANAGER_INIT_TASK_H_
diff --git a/src/devices/coordinator/init-tests.cc b/src/devices/driver_manager/init-tests.cc
similarity index 100%
rename from src/devices/coordinator/init-tests.cc
rename to src/devices/driver_manager/init-tests.cc
diff --git a/src/devices/host/log.h b/src/devices/driver_manager/log.h
similarity index 85%
copy from src/devices/host/log.h
copy to src/devices/driver_manager/log.h
index 57f588a..756390b 100644
--- a/src/devices/host/log.h
+++ b/src/devices/driver_manager/log.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SRC_DEVICES_HOST_LOG_H_
-#define SRC_DEVICES_HOST_LOG_H_
+#ifndef SRC_DEVICES_DRIVER_MANAGER_LOG_H_
+#define SRC_DEVICES_DRIVER_MANAGER_LOG_H_
 
 #include <stdint.h>
 #include <stdio.h>
@@ -36,4 +36,4 @@
 
 }  // namespace devmgr
 
-#endif  // SRC_DEVICES_HOST_LOG_H_
+#endif  // SRC_DEVICES_DRIVER_MANAGER_LOG_H_
diff --git a/src/devices/coordinator/main.cc b/src/devices/driver_manager/main.cc
similarity index 100%
rename from src/devices/coordinator/main.cc
rename to src/devices/driver_manager/main.cc
diff --git a/src/devices/coordinator/meta/devcoordinator-test.cmx b/src/devices/driver_manager/meta/devcoordinator-test.cmx
similarity index 100%
rename from src/devices/coordinator/meta/devcoordinator-test.cmx
rename to src/devices/driver_manager/meta/devcoordinator-test.cmx
diff --git a/src/devices/coordinator/metadata.h b/src/devices/driver_manager/metadata.h
similarity index 90%
rename from src/devices/coordinator/metadata.h
rename to src/devices/driver_manager/metadata.h
index 71bef70..88e6627 100644
--- a/src/devices/coordinator/metadata.h
+++ b/src/devices/driver_manager/metadata.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SRC_DEVICES_COORDINATOR_METADATA_H_
-#define SRC_DEVICES_COORDINATOR_METADATA_H_
+#ifndef SRC_DEVICES_DRIVER_MANAGER_METADATA_H_
+#define SRC_DEVICES_DRIVER_MANAGER_METADATA_H_
 
 #include <stdint.h>
 
@@ -57,4 +57,4 @@
 
 }  // namespace devmgr
 
-#endif  // SRC_DEVICES_COORDINATOR_METADATA_H_
+#endif  // SRC_DEVICES_DRIVER_MANAGER_METADATA_H_
diff --git a/src/devices/coordinator/misc-tests.cc b/src/devices/driver_manager/misc-tests.cc
similarity index 100%
rename from src/devices/coordinator/misc-tests.cc
rename to src/devices/driver_manager/misc-tests.cc
diff --git a/src/devices/coordinator/multiple-device-test-utils.cc b/src/devices/driver_manager/multiple-device-test-utils.cc
similarity index 100%
rename from src/devices/coordinator/multiple-device-test-utils.cc
rename to src/devices/driver_manager/multiple-device-test-utils.cc
diff --git a/src/devices/coordinator/multiple-device-test.cc b/src/devices/driver_manager/multiple-device-test.cc
similarity index 100%
rename from src/devices/coordinator/multiple-device-test.cc
rename to src/devices/driver_manager/multiple-device-test.cc
diff --git a/src/devices/coordinator/multiple-device-test.h b/src/devices/driver_manager/multiple-device-test.h
similarity index 97%
rename from src/devices/coordinator/multiple-device-test.h
rename to src/devices/driver_manager/multiple-device-test.h
index 9ac753b..398b9e0 100644
--- a/src/devices/coordinator/multiple-device-test.h
+++ b/src/devices/driver_manager/multiple-device-test.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SRC_DEVICES_COORDINATOR_MULTIPLE_DEVICE_TEST_H_
-#define SRC_DEVICES_COORDINATOR_MULTIPLE_DEVICE_TEST_H_
+#ifndef SRC_DEVICES_DRIVER_MANAGER_MULTIPLE_DEVICE_TEST_H_
+#define SRC_DEVICES_DRIVER_MANAGER_MULTIPLE_DEVICE_TEST_H_
 
 #include <fuchsia/fshost/llcpp/fidl.h>
 #include <lib/fidl-async/cpp/bind.h>
@@ -166,4 +166,4 @@
   fbl::Vector<DeviceState> devices_;
 };
 
-#endif  // SRC_DEVICES_COORDINATOR_MULTIPLE_DEVICE_TEST_H_
+#endif  // SRC_DEVICES_DRIVER_MANAGER_MULTIPLE_DEVICE_TEST_H_
diff --git a/src/devices/coordinator/resume-task.cc b/src/devices/driver_manager/resume-task.cc
similarity index 100%
rename from src/devices/coordinator/resume-task.cc
rename to src/devices/driver_manager/resume-task.cc
diff --git a/src/devices/coordinator/resume-task.h b/src/devices/driver_manager/resume-task.h
similarity index 86%
rename from src/devices/coordinator/resume-task.h
rename to src/devices/driver_manager/resume-task.h
index 9ad75bb..f85fd28 100644
--- a/src/devices/coordinator/resume-task.h
+++ b/src/devices/driver_manager/resume-task.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SRC_DEVICES_COORDINATOR_RESUME_TASK_H_
-#define SRC_DEVICES_COORDINATOR_RESUME_TASK_H_
+#ifndef SRC_DEVICES_DRIVER_MANAGER_RESUME_TASK_H_
+#define SRC_DEVICES_DRIVER_MANAGER_RESUME_TASK_H_
 
 #include "device.h"
 #include "task.h"
@@ -37,4 +37,4 @@
 
 }  // namespace devmgr
 
-#endif  // SRC_DEVICES_COORDINATOR_RESUME_TASK_H_
+#endif  // SRC_DEVICES_DRIVER_MANAGER_RESUME_TASK_H_
diff --git a/src/devices/coordinator/resume-tests.cc b/src/devices/driver_manager/resume-tests.cc
similarity index 100%
rename from src/devices/coordinator/resume-tests.cc
rename to src/devices/driver_manager/resume-tests.cc
diff --git a/src/devices/coordinator/suspend-task.cc b/src/devices/driver_manager/suspend-task.cc
similarity index 100%
rename from src/devices/coordinator/suspend-task.cc
rename to src/devices/driver_manager/suspend-task.cc
diff --git a/src/devices/coordinator/suspend-task.h b/src/devices/driver_manager/suspend-task.h
similarity index 84%
rename from src/devices/coordinator/suspend-task.h
rename to src/devices/driver_manager/suspend-task.h
index 3f42621..2c7f39a 100644
--- a/src/devices/coordinator/suspend-task.h
+++ b/src/devices/driver_manager/suspend-task.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SRC_DEVICES_COORDINATOR_SUSPEND_TASK_H_
-#define SRC_DEVICES_COORDINATOR_SUSPEND_TASK_H_
+#ifndef SRC_DEVICES_DRIVER_MANAGER_SUSPEND_TASK_H_
+#define SRC_DEVICES_DRIVER_MANAGER_SUSPEND_TASK_H_
 
 #include "device.h"
 #include "task.h"
@@ -35,4 +35,4 @@
 
 }  // namespace devmgr
 
-#endif  // SRC_DEVICES_COORDINATOR_SUSPEND_TASK_H_
+#endif  // SRC_DEVICES_DRIVER_MANAGER_SUSPEND_TASK_H_
diff --git a/src/devices/coordinator/suspend-tests.cc b/src/devices/driver_manager/suspend-tests.cc
similarity index 100%
rename from src/devices/coordinator/suspend-tests.cc
rename to src/devices/driver_manager/suspend-tests.cc
diff --git a/src/devices/coordinator/system-instance-test.cc b/src/devices/driver_manager/system-instance-test.cc
similarity index 100%
rename from src/devices/coordinator/system-instance-test.cc
rename to src/devices/driver_manager/system-instance-test.cc
diff --git a/src/devices/coordinator/system-instance.cc b/src/devices/driver_manager/system-instance.cc
similarity index 100%
rename from src/devices/coordinator/system-instance.cc
rename to src/devices/driver_manager/system-instance.cc
diff --git a/src/devices/coordinator/system-instance.h b/src/devices/driver_manager/system-instance.h
similarity index 94%
rename from src/devices/coordinator/system-instance.h
rename to src/devices/driver_manager/system-instance.h
index 547de6b..163d090 100644
--- a/src/devices/coordinator/system-instance.h
+++ b/src/devices/driver_manager/system-instance.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SRC_DEVICES_COORDINATOR_SYSTEM_INSTANCE_H_
-#define SRC_DEVICES_COORDINATOR_SYSTEM_INSTANCE_H_
+#ifndef SRC_DEVICES_DRIVER_MANAGER_SYSTEM_INSTANCE_H_
+#define SRC_DEVICES_DRIVER_MANAGER_SYSTEM_INSTANCE_H_
 
 #include <fuchsia/boot/c/fidl.h>
 #include <fuchsia/ldsvc/llcpp/fidl.h>
@@ -97,4 +97,4 @@
   devmgr::DevmgrLauncher launcher_;
 };
 
-#endif  // SRC_DEVICES_COORDINATOR_SYSTEM_INSTANCE_H_
+#endif  // SRC_DEVICES_DRIVER_MANAGER_SYSTEM_INSTANCE_H_
diff --git a/src/devices/coordinator/task-test.cc b/src/devices/driver_manager/task-test.cc
similarity index 100%
rename from src/devices/coordinator/task-test.cc
rename to src/devices/driver_manager/task-test.cc
diff --git a/src/devices/coordinator/task.cc b/src/devices/driver_manager/task.cc
similarity index 100%
rename from src/devices/coordinator/task.cc
rename to src/devices/driver_manager/task.cc
diff --git a/src/devices/coordinator/task.h b/src/devices/driver_manager/task.h
similarity index 96%
rename from src/devices/coordinator/task.h
rename to src/devices/driver_manager/task.h
index 2ea7867..a253f34 100644
--- a/src/devices/coordinator/task.h
+++ b/src/devices/driver_manager/task.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SRC_DEVICES_COORDINATOR_TASK_H_
-#define SRC_DEVICES_COORDINATOR_TASK_H_
+#ifndef SRC_DEVICES_DRIVER_MANAGER_TASK_H_
+#define SRC_DEVICES_DRIVER_MANAGER_TASK_H_
 
 #include <lib/async/cpp/task.h>
 #include <lib/fit/function.h>
@@ -100,4 +100,4 @@
 
 }  // namespace devmgr
 
-#endif  // SRC_DEVICES_COORDINATOR_TASK_H_
+#endif  // SRC_DEVICES_DRIVER_MANAGER_TASK_H_
diff --git a/src/devices/coordinator/unbind-task.cc b/src/devices/driver_manager/unbind-task.cc
similarity index 100%
rename from src/devices/coordinator/unbind-task.cc
rename to src/devices/driver_manager/unbind-task.cc
diff --git a/src/devices/coordinator/unbind-task.h b/src/devices/driver_manager/unbind-task.h
similarity index 93%
rename from src/devices/coordinator/unbind-task.h
rename to src/devices/driver_manager/unbind-task.h
index 04d39b2..3a2f696 100644
--- a/src/devices/coordinator/unbind-task.h
+++ b/src/devices/driver_manager/unbind-task.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SRC_DEVICES_COORDINATOR_UNBIND_TASK_H_
-#define SRC_DEVICES_COORDINATOR_UNBIND_TASK_H_
+#ifndef SRC_DEVICES_DRIVER_MANAGER_UNBIND_TASK_H_
+#define SRC_DEVICES_DRIVER_MANAGER_UNBIND_TASK_H_
 
 #include "device.h"
 #include "task.h"
@@ -74,4 +74,4 @@
 
 }  // namespace devmgr
 
-#endif  // SRC_DEVICES_COORDINATOR_UNBIND_TASK_H_
+#endif  // SRC_DEVICES_DRIVER_MANAGER_UNBIND_TASK_H_
diff --git a/src/devices/coordinator/unbind-tests.cc b/src/devices/driver_manager/unbind-tests.cc
similarity index 100%
rename from src/devices/coordinator/unbind-tests.cc
rename to src/devices/driver_manager/unbind-tests.cc
diff --git a/src/devices/coordinator/vmo-writer.cc b/src/devices/driver_manager/vmo-writer.cc
similarity index 100%
rename from src/devices/coordinator/vmo-writer.cc
rename to src/devices/driver_manager/vmo-writer.cc
diff --git a/src/devices/coordinator/vmo-writer.h b/src/devices/driver_manager/vmo-writer.h
similarity index 84%
rename from src/devices/coordinator/vmo-writer.h
rename to src/devices/driver_manager/vmo-writer.h
index 1640871..4a4b3458 100644
--- a/src/devices/coordinator/vmo-writer.h
+++ b/src/devices/driver_manager/vmo-writer.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SRC_DEVICES_COORDINATOR_VMO_WRITER_H_
-#define SRC_DEVICES_COORDINATOR_VMO_WRITER_H_
+#ifndef SRC_DEVICES_DRIVER_MANAGER_VMO_WRITER_H_
+#define SRC_DEVICES_DRIVER_MANAGER_VMO_WRITER_H_
 
 #include <lib/zx/vmo.h>
 
@@ -34,4 +34,4 @@
 
 }  // namespace devmgr
 
-#endif  // SRC_DEVICES_COORDINATOR_VMO_WRITER_H_
+#endif  // SRC_DEVICES_DRIVER_MANAGER_VMO_WRITER_H_
diff --git a/src/devices/host/async-loop-ref-counted-rpc-handler.h b/src/devices/host/async-loop-ref-counted-rpc-handler.h
deleted file mode 100644
index f1e9cf1..0000000
--- a/src/devices/host/async-loop-ref-counted-rpc-handler.h
+++ /dev/null
@@ -1,74 +0,0 @@
-// Copyright 2018 The Fuchsia Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef SRC_DEVICES_HOST_ASYNC_LOOP_REF_COUNTED_RPC_HANDLER_H_
-#define SRC_DEVICES_HOST_ASYNC_LOOP_REF_COUNTED_RPC_HANDLER_H_
-
-#include <lib/async/cpp/wait.h>
-#include <lib/zx/channel.h>
-
-#include <utility>
-
-#include <fbl/ref_ptr.h>
-
-namespace devmgr {
-
-// Mixin for representing a type that represents an RPC handler and that has a
-// reference owned by an async loop.  The loop will own both the wrapped type and the RPC
-// connection handle.
-//
-// Deriving classes should define and implement this function:
-// static void HandleRpc(fbl::RefPtr<T>&& conn,
-//                       async_dispatcher_t* dispatcher, async::WaitBase* wait, zx_status_t status,
-//                       const zx_packet_signal_t* signal);
-template <typename T>
-class AsyncLoopRefCountedRpcHandler {
- public:
-  ~AsyncLoopRefCountedRpcHandler() {
-    zx_status_t status = wait_.Cancel();
-    ZX_ASSERT(status == ZX_OK || status == ZX_ERR_NOT_FOUND);
-
-    zx_handle_close(wait_.object());
-  }
-
-  // Begins waiting in |dispatcher| on |conn->wait|.  This transfers ownership
-  // of a reference to |conn| to the dispatcher.  The dispatcher returns ownership when the
-  // handler is invoked.
-  static zx_status_t BeginWait(fbl::RefPtr<T> conn, async_dispatcher_t* dispatcher) {
-    zx_status_t status = conn->wait_.Begin(dispatcher);
-    if (status == ZX_OK) {
-      // This reference will be recovered by MakeRefPtrNoAdopt in
-      // HandleRpcEntry
-      __UNUSED auto ptr = fbl::ExportToRawPtr(&conn);
-    }
-    return status;
-  }
-
-  // Entrypoint for the RPC handler that captures the pointer ownership
-  // semantics.
-  void HandleRpcEntry(async_dispatcher_t* dispatcher, async::WaitBase* wait, zx_status_t status,
-                      const zx_packet_signal_t* signal) {
-    auto self = fbl::ImportFromRawPtr(static_cast<T*>(this));
-    T::HandleRpc(std::move(self), dispatcher, wait, status, signal);
-  }
-
-  zx::unowned_channel channel() const { return zx::unowned_channel(wait_.object()); }
-
-  // Sets the channel to the given handle and returns the old value
-  zx::channel set_channel(zx::channel h) {
-    zx::channel old(wait_.object());
-    wait_.set_object(h.release());
-    return old;
-  }
-
-  using WaitType = async::WaitMethod<AsyncLoopRefCountedRpcHandler<T>,
-                                     &AsyncLoopRefCountedRpcHandler<T>::HandleRpcEntry>;
-
- private:
-  WaitType wait_{this, ZX_HANDLE_INVALID, ZX_CHANNEL_READABLE | ZX_CHANNEL_PEER_CLOSED};
-};
-
-}  // namespace devmgr
-
-#endif  // SRC_DEVICES_HOST_ASYNC_LOOP_REF_COUNTED_RPC_HANDLER_H_