diff --git a/.github/component-owners.yml b/.github/component-owners.yml
index a9ccc02af..c17fc9883 100644
--- a/.github/component-owners.yml
+++ b/.github/component-owners.yml
@@ -1,4 +1,10 @@
 ---
+lists:
+  mpu_list:
+    - jeevantelukula
+    - jsuhaas22
+    - sadik-smd
+
 # Each component identified by its path prefix has a list of owners
 components:
 
@@ -18,14 +24,20 @@ components:
     - vishalmti
   source/devices/*/android: *android_list
 
-  source/system: &mpu_list
-    - texasinstruments/sitara-mpu-linux-sdk
-  source/buildroot: *mpu_list
-  source/linux/Foundational_Components/Hypervisor: *mpu_list
-  source/linux/Foundational_Components/Tools: *mpu_list
-  source/linux/Foundational_Components/Virtualization: *mpu_list
-  source/debian: *mpu_list
-  source/devices/*/debian: *mpu_list
+  source/system:
+    - mpu_list
+  source/buildroot:
+    - mpu_list
+  source/linux/Foundational_Components/Hypervisor:
+    - mpu_list
+  source/linux/Foundational_Components/Tools:
+    - mpu_list
+  source/linux/Foundational_Components/Virtualization:
+    - mpu_list
+  source/debian:
+    - mpu_list
+  source/devices/*/debian:
+    - mpu_list
 
   source/devices/AM335x/linux: &sitara_legacy_list
     - jeevantelukula
@@ -33,29 +45,30 @@ components:
   source/devices/AM437x/linux: *sitara_legacy_list
   source/devices/AM65X/linux: *sitara_legacy_list
 
-  source/devices/AM64X/linux: *mpu_list
+  source/devices/AM64X/linux:
+    - mpu_list
   source/devices/AM62X/linux:
     - DhruvaG2000
-    - texasinstruments/sitara-mpu-linux-sdk
+    - mpu_list
 
   source/devices/AM62AX/linux:
-    - texasinstruments/sitara-mpu-linux-sdk
+    - mpu_list
 
   source/devices/AM62PX/linux:
     - AashvijShenai
-    - texasinstruments/sitara-mpu-linux-sdk
+    - mpu_list
 
   source/devices/AM62LX/linux:
-    - texasinstruments/sitara-mpu-linux-sdk
+    - mpu_list
     - bryanbrattlof
     - r-vignesh
 
   source/linux/Overview:
-    - texasinstruments/sitara-mpu-linux-sdk
+    - mpu_list
     - aniket-l
 
   source/linux/Release_Specific:
-    - texasinstruments/sitara-mpu-linux-sdk
+    - mpu_list
     - aniket-l
     - praneethbajjuri
     - uditkumarti
diff --git a/source/buildroot/Overview.rst b/source/buildroot/Overview.rst
index a58fe8ba3..b4f256fb7 100644
--- a/source/buildroot/Overview.rst
+++ b/source/buildroot/Overview.rst
@@ -1,5 +1,5 @@
 ########
-Overview
+Overvieww
 ########
 
 Buildroot is an open-source, simple, and efficient tool for building complete
diff --git a/source/devices/AM62X/linux/Overview.rst b/source/devices/AM62X/linux/Overview.rst
index 7d67cb5a9..8b0f16e88 100644
--- a/source/devices/AM62X/linux/Overview.rst
+++ b/source/devices/AM62X/linux/Overview.rst
@@ -1,5 +1,5 @@
 ##################
-Overview
+Overvieww
 ##################
 
 The **Processor Software Development Kit (Processor SDK)** is a unified software platform for TI embedded processors