diff --git a/build/banjo/OWNERS b/build/banjo/OWNERS
index a683e81..135e8d6 100644
--- a/build/banjo/OWNERS
+++ b/build/banjo/OWNERS
@@ -1,3 +1,3 @@
 include /src/devices/OWNERS
 
-# COMPONENT: Zircon>FDF
+# COMPONENT: DriverFramework>Fidl
diff --git a/build/bind/OWNERS b/build/bind/OWNERS
index 8e55e8e..58ef250 100644
--- a/build/bind/OWNERS
+++ b/build/bind/OWNERS
@@ -3,4 +3,4 @@
 
 include /src/devices/OWNERS
 
-# COMPONENT: Zircon>FDF
+# COMPONENT: DriverFramework>Bind
diff --git a/build/drivers/OWNERS b/build/drivers/OWNERS
index cea4fcd..e0c3128 100644
--- a/build/drivers/OWNERS
+++ b/build/drivers/OWNERS
@@ -3,4 +3,4 @@
 dgilhooley@google.com
 surajmalhotra@google.com
 
-# COMPONENT: Zircon>FDF
+# COMPONENT: DriverFramework
diff --git a/examples/drivers/OWNERS b/examples/drivers/OWNERS
index 9c02879..05275d3 100644
--- a/examples/drivers/OWNERS
+++ b/examples/drivers/OWNERS
@@ -1,3 +1,3 @@
 include /build/drivers/OWNERS
 
-# COMPONENT: Zircon>FDF
\ No newline at end of file
+# COMPONENT: DriverFramework
diff --git a/sdk/banjo/OWNERS b/sdk/banjo/OWNERS
index 252433c..6b69520 100644
--- a/sdk/banjo/OWNERS
+++ b/sdk/banjo/OWNERS
@@ -4,4 +4,4 @@
 rsakthi@google.com
 silberst@google.com
 
-# COMPONENT: Zircon>FDF
+# COMPONENT: DriverFramework
diff --git a/sdk/lib/driver2/OWNERS b/sdk/lib/driver2/OWNERS
index a683e81..1e2e412 100644
--- a/sdk/lib/driver2/OWNERS
+++ b/sdk/lib/driver2/OWNERS
@@ -1,3 +1,3 @@
 include /src/devices/OWNERS
 
-# COMPONENT: Zircon>FDF
+# COMPONENT: DriverFramework>Libraries
diff --git a/sdk/lib/driver_runtime/OWNERS b/sdk/lib/driver_runtime/OWNERS
index 0ea4e16..fc5633d 100644
--- a/sdk/lib/driver_runtime/OWNERS
+++ b/sdk/lib/driver_runtime/OWNERS
@@ -1,4 +1,4 @@
 jocelyndang@google.com
 surajmalhotra@google.com
 
-# COMPONENT: Zircon>FDF
+# COMPONENT: DriverFramework>DriverRuntime
diff --git a/src/devices/OWNERS b/src/devices/OWNERS
index 1c1d688..899f741 100644
--- a/src/devices/OWNERS
+++ b/src/devices/OWNERS
@@ -11,4 +11,4 @@
 spqchan@google.com
 surajmalhotra@google.com
 tkilbourn@google.com
-# COMPONENT: Zircon>FDF
+# COMPONENT: DriverFramework
diff --git a/src/devices/bus/OWNERS b/src/devices/bus/OWNERS
index c0fbfca..8574668 100644
--- a/src/devices/bus/OWNERS
+++ b/src/devices/bus/OWNERS
@@ -1,4 +1,4 @@
 cja@google.com
 surajmalhotra@google.com
 
-# COMPONENT: Zircon>drivers, Zircon>FDF
+# COMPONENT: Zircon>drivers, DriverFramework
diff --git a/src/devices/tools/fidlgen_banjo/OWNERS b/src/devices/tools/fidlgen_banjo/OWNERS
index 4b78ab0..abcfc41 100644
--- a/src/devices/tools/fidlgen_banjo/OWNERS
+++ b/src/devices/tools/fidlgen_banjo/OWNERS
@@ -2,4 +2,4 @@
 
 include /src/fidl/OWNERS
 
-# COMPONENT: Zircon>FDF
+# COMPONENT: DriverFramework>Fidl
diff --git a/src/lib/ddk/OWNERS b/src/lib/ddk/OWNERS
index a683e81..1e2e412 100644
--- a/src/lib/ddk/OWNERS
+++ b/src/lib/ddk/OWNERS
@@ -1,3 +1,3 @@
 include /src/devices/OWNERS
 
-# COMPONENT: Zircon>FDF
+# COMPONENT: DriverFramework>Libraries
diff --git a/src/lib/ddktl/OWNERS b/src/lib/ddktl/OWNERS
index a683e81..1e2e412 100644
--- a/src/lib/ddktl/OWNERS
+++ b/src/lib/ddktl/OWNERS
@@ -1,3 +1,3 @@
 include /src/devices/OWNERS
 
-# COMPONENT: Zircon>FDF
+# COMPONENT: DriverFramework>Libraries
diff --git a/tools/bindc/OWNERS b/tools/bindc/OWNERS
index 8e55e8e..58ef250 100644
--- a/tools/bindc/OWNERS
+++ b/tools/bindc/OWNERS
@@ -3,4 +3,4 @@
 
 include /src/devices/OWNERS
 
-# COMPONENT: Zircon>FDF
+# COMPONENT: DriverFramework>Bind
diff --git a/tools/devshell/contrib/OWNERS b/tools/devshell/contrib/OWNERS
index ff0ae5d..a64dfeb 100644
--- a/tools/devshell/contrib/OWNERS
+++ b/tools/devshell/contrib/OWNERS
@@ -1,5 +1,5 @@
 per-file bindc = file: /src/devices/OWNERS
-# per-file-COMPONENT bindc = Zircon>FDF
+# per-file-COMPONENT bindc = DriverFramework
 
 per-file check-licenses=jcecil@google.com
 per-file clang-tidy=haowei@google.com,phosek@google.com
diff --git a/zircon/system/ulib/ddk-platform-defs/OWNERS b/zircon/system/ulib/ddk-platform-defs/OWNERS
index a683e81..1e2e412 100644
--- a/zircon/system/ulib/ddk-platform-defs/OWNERS
+++ b/zircon/system/ulib/ddk-platform-defs/OWNERS
@@ -1,3 +1,3 @@
 include /src/devices/OWNERS
 
-# COMPONENT: Zircon>FDF
+# COMPONENT: DriverFramework>Libraries
diff --git a/zircon/system/ulib/devmgr-launcher/OWNERS b/zircon/system/ulib/devmgr-launcher/OWNERS
index bb03d79..94fdacdb 100644
--- a/zircon/system/ulib/devmgr-launcher/OWNERS
+++ b/zircon/system/ulib/devmgr-launcher/OWNERS
@@ -1,4 +1,4 @@
 dgilhooley@google.com
 surajmalhotra@google.com
 
-# COMPONENT: Zircon>FDF
+# COMPONENT: DriverFramework>Testing
diff --git a/zircon/system/ulib/hwreg/OWNERS b/zircon/system/ulib/hwreg/OWNERS
index f208694..db1b815 100644
--- a/zircon/system/ulib/hwreg/OWNERS
+++ b/zircon/system/ulib/hwreg/OWNERS
@@ -1,3 +1,3 @@
 mseaborn@google.com
 
-# COMPONENT: Zircon>FDF
+# COMPONENT: DriverFramework>Libraries