diff --git a/docs/appendix/local-configuration-file.md b/docs/appendix/local-configuration-file.md
index 93162e5570..4d9a08e347 100644
--- a/docs/appendix/local-configuration-file.md
+++ b/docs/appendix/local-configuration-file.md
@@ -78,8 +78,9 @@ This file contains some basic example [component](/components/) and [service](/s
   "components": [
     {
       "name": "arm1",
-      "type": "arm",
       "model": "fake",
+      "type": "arm",
+      "namespace": "rdk",
       "attributes": {
         "arm-model": "xArm6"
       }
@@ -96,8 +97,9 @@ This file contains some basic example [component](/components/) and [service](/s
     },
     {
       "name": "board1",
-      "type": "board",
       "model": "fake",
+      "type": "board",
+      "namespace": "rdk",
       "attributes": {
         "analogs": [
           {
@@ -120,8 +122,9 @@ This file contains some basic example [component](/components/) and [service](/s
     },
     {
       "name": "encoder1",
-      "type": "encoder",
       "model": "fake",
+      "type": "encoder",
+      "namespace": "rdk",
       "attributes": {
         "update_rate_msec": 200
       }
@@ -148,8 +151,9 @@ This file contains some basic example [component](/components/) and [service](/s
     },
     {
       "name": "motor1",
-      "type": "motor",
       "model": "fake",
+      "type": "motor",
+      "namespace": "rdk",
       "attributes": {
         "encoder": "encoder1",
         "pins": {
diff --git a/docs/components/arm/eva.md b/docs/components/arm/eva.md
index 5863c459fc..6523aea9a9 100644
--- a/docs/components/arm/eva.md
+++ b/docs/components/arm/eva.md
@@ -20,8 +20,9 @@ Configure an `eva` arm as follows:
 ```json {class="line-numbers linkable-line-numbers"}
 {
   "name": "<arm_name>",
-  "type": "arm",
   "model": "eva",
+  "type": "arm",
+  "namespace": "rdk",
   "attributes": {}
 }
 ```
diff --git a/docs/components/arm/yahboom-dofbot.md b/docs/components/arm/yahboom-dofbot.md
index 0f64f6721c..5d0559af68 100644
--- a/docs/components/arm/yahboom-dofbot.md
+++ b/docs/components/arm/yahboom-dofbot.md
@@ -51,8 +51,9 @@ Edit and fill in the attributes as applicable.
   "components": [
     {
       "name": "myarm",
-      "type": "arm",
       "model": "yahboom-dofbot",
+      "type": "arm",
+      "namespace": "rdk",
       "attributes": {},
       "depends_on": []
     }
diff --git a/docs/components/base/boat.md b/docs/components/base/boat.md
index 6b7b0f18e6..4fc6cff38c 100644
--- a/docs/components/base/boat.md
+++ b/docs/components/base/boat.md
@@ -31,8 +31,9 @@ Edit and fill in the attributes as applicable.
   "components": [
     {
       "name": "base",
-      "type": "base",
       "model": "boat",
+      "type": "base",
+      "namespace": "rdk",
       "attributes": {
         "drive_mode": "<a_drive_mode_option>",
         "serial_path": "</dev/ttyXXXX>"
diff --git a/docs/components/camera/calibrate.md b/docs/components/camera/calibrate.md
index ab9e73bf4b..bd9d6a7532 100644
--- a/docs/components/camera/calibrate.md
+++ b/docs/components/camera/calibrate.md
@@ -72,8 +72,9 @@ The following is a full example config:
   "components": [
     {
       "name": "color",
-      "type": "camera",
       "model": "webcam",
+      "type": "camera",
+      "namespace": "rdk",
       "attributes": {
         "intrinsic_parameters": {
           "fy": 940.2928257873841,
diff --git a/docs/components/camera/transform.md b/docs/components/camera/transform.md
index bfe2be7d29..3a8dff45d3 100644
--- a/docs/components/camera/transform.md
+++ b/docs/components/camera/transform.md
@@ -388,8 +388,9 @@ For further information, please refer to the [OpenCV docs](https://docs.opencv.o
 ```json {class="line-numbers linkable-line-numbers"}
 {
   "name": "camera_name",
-  "type": "camera",
   "model": "transform",
+  "type": "camera",
+  "namespace": "rdk",
   "attributes": {
     "source": "physical_cam",
     "pipeline": [
diff --git a/docs/components/component/model1.md b/docs/components/component/model1.md
index c9efa38066..26cad6d361 100644
--- a/docs/components/component/model1.md
+++ b/docs/components/component/model1.md
@@ -33,8 +33,9 @@ Edit and fill in the attributes as applicable.
   "components": [
     {
       "name": <arm_name>,
-      "type": "arm",
       "model": "model1",
+      "type": "arm",
+      "namespace": "rdk",
       "attributes": {
         "board": <string>,
         "i2c_bus": <string>
@@ -53,8 +54,9 @@ Edit and fill in the attributes as applicable.
   "components": [
     {
       "name": "myArm",
-      "type": "arm",
       "model": "model1",
+      "type": "arm",
+      "namespace": "rdk",
       "attributes": {
         "board": "local",
         "i2c_bus": "1"
diff --git a/docs/components/encoder/incremental.md b/docs/components/encoder/incremental.md
index 347f5b6178..ddfbd40202 100644
--- a/docs/components/encoder/incremental.md
+++ b/docs/components/encoder/incremental.md
@@ -59,8 +59,9 @@ Fill in and edit the attributes as applicable.
     },
     {
       "name": "myEncoder",
-      "type": "encoder",
       "model": "incremental",
+      "type": "encoder",
+      "namespace": "rdk",
       "attributes": {
         "board": "local",
         "pins": {
diff --git a/docs/components/gantry/multi-axis.md b/docs/components/gantry/multi-axis.md
index 111e156263..96bdedbdb2 100644
--- a/docs/components/gantry/multi-axis.md
+++ b/docs/components/gantry/multi-axis.md
@@ -153,8 +153,9 @@ Then remove and fill in the attributes as applicable to your gantry, according t
     },
     {
       "name": "yaxis",
-      "type": "gantry",
       "model": "single-axis",
+      "type": "gantry",
+      "namespace": "rdk",
       "attributes": {
         "length_mm": 1000,
         "board": "local",
diff --git a/docs/components/generic/fake.md b/docs/components/generic/fake.md
index 43f334a1aa..00e83db514 100644
--- a/docs/components/generic/fake.md
+++ b/docs/components/generic/fake.md
@@ -27,8 +27,9 @@ Enter a name for your generic component and click **Create**.
 ```json {class="line-numbers linkable-line-numbers"}
 {
   "name": "<your-fake-generic-component-name>",
-  "type": "generic",
   "model": "fake",
+  "type": "generic",
+  "namespace": "rdk",
   "attributes": {}
 }
 ```
diff --git a/docs/components/movement-sensor/cameramono.md b/docs/components/movement-sensor/cameramono.md
index ec6615acb7..012ab9ac35 100644
--- a/docs/components/movement-sensor/cameramono.md
+++ b/docs/components/movement-sensor/cameramono.md
@@ -38,8 +38,9 @@ Edit and fill in the attributes as applicable.
   "components": [
     {
       "name": "<your-sensor-name>",
-      "type": "movement_sensor",
       "model": "camera_mono",
+      "type": "movement_sensor",
+      "namespace": "rdk",
       "attributes": {
         "camera": "<your-camera-name>",
         "motion_estimation_config": {
@@ -60,8 +61,9 @@ Edit and fill in the attributes as applicable.
   "components": [
     {
       "name": "myCamera",
-      "type": "camera",
       "model": "webcam",
+      "type": "camera",
+      "namespace": "rdk",
       "attributes": {
         "video_path": "video0"
       },
@@ -69,8 +71,9 @@ Edit and fill in the attributes as applicable.
     },
     {
       "name": "movementCamera",
-      "type": "movement_sensor",
       "model": "camera_mono",
+      "type": "movement_sensor",
+      "namespace": "rdk",
       "attributes": {
         "camera": "myCamera",
         "motion_estimation_config": {
diff --git a/docs/components/movement-sensor/gps/gps-nmea-rtk-pmtk.md b/docs/components/movement-sensor/gps/gps-nmea-rtk-pmtk.md
index d0326193a0..9d40f9c3b2 100644
--- a/docs/components/movement-sensor/gps/gps-nmea-rtk-pmtk.md
+++ b/docs/components/movement-sensor/gps/gps-nmea-rtk-pmtk.md
@@ -117,8 +117,9 @@ Then remove and fill in the attributes as applicable to your movement sensor, ac
   "components": [
     {
       "name": "my_GPS",
-      "type": "movement_sensor",
       "model": "gps-nmea-rtk-pmtk",
+      "type": "movement_sensor",
+      "namespace": "rdk",
       "attributes": {
         "board": "local",
         "i2c_addr": 66,
diff --git a/docs/components/movement-sensor/viam-visual-odometry.md b/docs/components/movement-sensor/viam-visual-odometry.md
index 11e2ae3cf1..e2c58da324 100644
--- a/docs/components/movement-sensor/viam-visual-odometry.md
+++ b/docs/components/movement-sensor/viam-visual-odometry.md
@@ -99,8 +99,9 @@ See the [Attributes](#attributes) section for more information on the other attr
   "components": [
     {
       "name": "<your-camera-name>",
-      "type": "camera",
       "model": "webcam",
+      "type": "camera",
+      "namespace": "rdk",
       "attributes": {
         "video_path": "<path-to-video-stream>",
         "height_px": <height>,
@@ -152,8 +153,9 @@ See the [Attributes](#attributes) section for more information on the other attr
   "components": [
     {
       "name": "my-camera",
-      "type": "camera",
       "model": "webcam",
+      "type": "camera",
+      "namespace": "rdk",
       "attributes": {
         "video_path": "FDF90FEB-59E5-4FCF-AABD-DA03C4E19BFB",
         "height_px": 720,
diff --git a/docs/manage/configuration.md b/docs/manage/configuration.md
index c2ab3662bd..697dafda21 100644
--- a/docs/manage/configuration.md
+++ b/docs/manage/configuration.md
@@ -77,15 +77,17 @@ If you add components in **Builder** mode and click **Save Config** at the botto
   "components": [
     {
       "name": "local",
-      "type": "board",
       "model": "pi",
+      "type": "board",
+      "namespace": "rdk",
       "attributes": {},
       "depends_on": []
     },
     {
       "name": "my-motor",
-      "type": "motor",
       "model": "gpio",
+      "type": "motor",
+      "namespace": "rdk",
       "attributes": {
         "pins": {
           "a": "13",
@@ -98,8 +100,9 @@ If you add components in **Builder** mode and click **Save Config** at the botto
     },
     {
       "name": "my_camera",
-      "type": "camera",
       "model": "webcam",
+      "type": "camera",
+      "namespace": "rdk",
       "attributes": {
         "video_path": "video0"
       }
diff --git a/docs/services/frame-system/frame-config.md b/docs/services/frame-system/frame-config.md
index 492d6dd50e..3061e06e15 100644
--- a/docs/services/frame-system/frame-config.md
+++ b/docs/services/frame-system/frame-config.md
@@ -35,8 +35,9 @@ Select the `parent` frame as `world` and fill in the coordinates for `translatio
     {
       "depends_on": [],
       "name": "myArm",
-      "type": "arm",
       "model": "ur5e",
+      "type": "arm",
+      "namespace": "rdk",
       "attributes": {
         "host": "127.0.0.1"
       },
diff --git a/docs/services/frame-system/nested-frame-config.md b/docs/services/frame-system/nested-frame-config.md
index f90ffc2c13..689c1b9186 100644
--- a/docs/services/frame-system/nested-frame-config.md
+++ b/docs/services/frame-system/nested-frame-config.md
@@ -43,8 +43,9 @@ Select the `parent` frame as `myGantry` and fill in the coordinates for `transla
   "components": [
     {
       "name": "myGantry",
-      "type": "gantry",
       "model": "single-axis",
+      "type": "gantry",
+      "namespace": "rdk",
       "attributes": {},
       "depends_on": [],
       "frame": {
@@ -68,8 +69,9 @@ Select the `parent` frame as `myGantry` and fill in the coordinates for `transla
     {
       "depends_on": [],
       "name": "myArm",
-      "type": "arm",
       "model": "ur5e",
+      "type": "arm",
+      "namespace": "rdk",
       "attributes": {
         "host": "127.0.0.1"
       },
diff --git a/docs/tutorials/configure/scuttlebot.md b/docs/tutorials/configure/scuttlebot.md
index 7a1a0b720f..3d65c61a9f 100644
--- a/docs/tutorials/configure/scuttlebot.md
+++ b/docs/tutorials/configure/scuttlebot.md
@@ -112,8 +112,9 @@ Add the following JSON objects to the `components` array:
 ```json {class="line-numbers linkable-line-numbers"}
 {
     "name": "lenc",
-    "type": "encoder",
     "model": "AMS-AS5048",
+    "type": "encoder",
+    "namespace": "rdk",
     "attributes": {
       "board": "local",
       "connection_type": "i2c",
@@ -125,8 +126,9 @@ Add the following JSON objects to the `components` array:
 },
 {
     "name": "renc",
-    "type": "encoder",
     "model": "AMS-AS5048",
+    "type": "encoder",
+    "namespace": "rdk",
     "attributes": {
       "board": "local",
       "connection_type": "i2c",
@@ -192,8 +194,9 @@ Add the following JSON objects to the `components` array:
 ```json
 {
   "name": "right",
-  "type": "motor",
   "model": "gpio",
+  "type": "motor",
+  "namespace": "rdk",
   "attributes": {
     "pins": {
       "a": "16",
@@ -209,8 +212,9 @@ Add the following JSON objects to the `components` array:
 },
 {
   "name": "left",
-  "type": "motor",
   "model": "gpio",
+  "type": "motor",
+  "namespace": "rdk",
   "attributes": {
     "pins": {
       "a": "12",
@@ -375,8 +379,9 @@ If you click on the **Video Path** field while your robot is live, a drop down a
 ```json {class="line-numbers linkable-line-numbers"}
 {
   "name": "Webcam",
-  "type": "camera",
   "model": "webcam",
+  "type": "camera",
+  "namespace": "rdk",
   "attributes": {
     "video_path": "video0"
   }
diff --git a/docs/tutorials/control/scuttle-gamepad.md b/docs/tutorials/control/scuttle-gamepad.md
index 5baa098c05..9a6139adf9 100644
--- a/docs/tutorials/control/scuttle-gamepad.md
+++ b/docs/tutorials/control/scuttle-gamepad.md
@@ -73,8 +73,9 @@ Inside the `components` array of your config, add the following configuration fo
 ```json {class="line-numbers linkable-line-numbers"}
 {
   "name": "my-gamepad",
-  "type": "input_controller",
   "model": "gamepad",
+  "type": "input_controller",
+  "namespace": "rdk",
   "attributes": {},
   "depends_on": []
 }
diff --git a/docs/tutorials/get-started/blink-an-led.md b/docs/tutorials/get-started/blink-an-led.md
index 7038fb7bd0..0a8a76da40 100644
--- a/docs/tutorials/get-started/blink-an-led.md
+++ b/docs/tutorials/get-started/blink-an-led.md
@@ -152,8 +152,9 @@ Replace the contents of the config field with the following JSON configuration f
   "components": [
     {
       "name": "local",
-      "type": "board",
       "model": "pi",
+      "type": "board",
+      "namespace": "rdk",
       "attributes": {},
       "depends_on": []
     }
diff --git a/docs/tutorials/get-started/confetti-bot.md b/docs/tutorials/get-started/confetti-bot.md
index 951ee14999..8f846bd76e 100644
--- a/docs/tutorials/get-started/confetti-bot.md
+++ b/docs/tutorials/get-started/confetti-bot.md
@@ -166,15 +166,17 @@ On the [**Raw JSON** tab](/manage/configuration/#the-config-tab), replace the co
   "components": [
     {
       "name": "party",
-      "type": "board",
       "model": "pi",
+      "type": "board",
+      "namespace": "rdk",
       "attributes": {},
       "depends_on": []
     },
     {
       "name": "start",
-      "type": "motor",
       "model": "gpio",
+      "type": "motor",
+      "namespace": "rdk",
       "attributes": {
         "pins": {
           "a": "13",
diff --git a/docs/tutorials/get-started/lazy-susan.md b/docs/tutorials/get-started/lazy-susan.md
index fe51a9d3ce..aec31853e1 100644
--- a/docs/tutorials/get-started/lazy-susan.md
+++ b/docs/tutorials/get-started/lazy-susan.md
@@ -167,15 +167,17 @@ On the [`Raw JSON` tab](/manage/configuration/#the-config-tab), replace the conf
   "components": [
     {
       "name": "local",
-      "type": "board",
       "model": "pi",
+      "type": "board",
+      "namespace": "rdk",
       "attributes": {},
       "depends_on": []
     },
     {
       "name": "dcmotor",
-      "type": "motor",
       "model": "gpio",
+      "type": "motor",
+      "namespace": "rdk",
       "attributes": {
         "pins": {
           "a": "16",
diff --git a/docs/tutorials/projects/bedtime-songs-bot.md b/docs/tutorials/projects/bedtime-songs-bot.md
index af111c92ad..39ee4c0537 100644
--- a/docs/tutorials/projects/bedtime-songs-bot.md
+++ b/docs/tutorials/projects/bedtime-songs-bot.md
@@ -294,8 +294,9 @@ At this point, the full **Raw JSON** configuration of your robot should look lik
   "components": [
     {
       "name": "cam",
-      "type": "camera",
       "model": "webcam",
+      "type": "camera",
+      "namespace": "rdk",
       "attributes": {},
       "depends_on": []
     }
diff --git a/docs/tutorials/projects/claw-game.md b/docs/tutorials/projects/claw-game.md
index ad49e49472..1eb5a60715 100644
--- a/docs/tutorials/projects/claw-game.md
+++ b/docs/tutorials/projects/claw-game.md
@@ -235,8 +235,9 @@ On the [`Raw JSON` tab](/manage/configuration/#the-config-tab), replace the conf
 {
   "components": [
     {
-      "type": "arm",
       "model": "xArm6",
+      "type": "arm",
+      "namespace": "rdk",
       "attributes": {
         "acceleration_degs_per_sec_per_sec": 0,
         "host": "10.1.1.26",
@@ -299,8 +300,9 @@ On the [`Raw JSON` tab](/manage/configuration/#the-config-tab), replace the conf
 {
   "components": [
     {
-      "type": "arm",
       "model": "xArm6",
+      "type": "arm",
+      "namespace": "rdk",
       "attributes": {
         "acceleration_degs_per_sec_per_sec": 0,
         "host": "10.1.1.26",
@@ -353,8 +355,9 @@ On the [`Raw JSON` tab](/manage/configuration/#the-config-tab), replace the conf
         "parent": "myArm"
       },
       "name": "gripper",
-      "type": "gripper",
       "model": "fake",
+      "type": "gripper",
+      "namespace": "rdk",
       "attributes": {},
       "depends_on": []
     }
diff --git a/docs/tutorials/projects/foam-dart-launcher.md b/docs/tutorials/projects/foam-dart-launcher.md
index 7765258f51..12120c8431 100644
--- a/docs/tutorials/projects/foam-dart-launcher.md
+++ b/docs/tutorials/projects/foam-dart-launcher.md
@@ -270,15 +270,17 @@ The full raw JSON config file generated by the configuration steps you just comp
   "components": [
     {
       "name": "local",
-      "type": "board",
       "model": "pi",
+      "type": "board",
+      "namespace": "rdk",
       "attributes": {},
       "depends_on": []
     },
     {
       "name": "left",
-      "type": "motor",
       "model": "gpio",
+      "type": "motor",
+      "namespace": "rdk",
       "attributes": {
         "pins": {
           "a": "11",
@@ -292,8 +294,9 @@ The full raw JSON config file generated by the configuration steps you just comp
     },
     {
       "name": "right",
-      "type": "motor",
       "model": "gpio",
+      "type": "motor",
+      "namespace": "rdk",
       "attributes": {
         "pins": {
           "a": "16",
@@ -307,8 +310,9 @@ The full raw JSON config file generated by the configuration steps you just comp
     },
     {
       "name": "base",
-      "type": "base",
       "model": "wheeled",
+      "type": "base",
+      "namespace": "rdk",
       "attributes": {
         "width_mm": 130,
         "wheel_circumference_mm": 200,
@@ -319,8 +323,9 @@ The full raw JSON config file generated by the configuration steps you just comp
     },
     {
       "name": "camera",
-      "type": "camera",
       "model": "webcam",
+      "type": "camera",
+      "namespace": "rdk",
       "attributes": {
         "video_path": "video0"
       },
diff --git a/docs/tutorials/projects/guardian.md b/docs/tutorials/projects/guardian.md
index bd196f91e5..1b7c938ba6 100644
--- a/docs/tutorials/projects/guardian.md
+++ b/docs/tutorials/projects/guardian.md
@@ -169,15 +169,17 @@ On the [`Raw JSON` tab](/manage/configuration/#the-config-tab), replace the conf
   "components": [
     {
       "name": "local",
-      "type": "board",
       "model": "pi",
+      "type": "board",
+      "namespace": "rdk",
       "attributes": {},
       "depends_on": []
     },
     {
       "name": "cam",
-      "type": "camera",
       "model": "webcam",
+      "type": "camera",
+      "namespace": "rdk",
       "attributes": {
         "video_path": "video0"
       },
@@ -185,8 +187,9 @@ On the [`Raw JSON` tab](/manage/configuration/#the-config-tab), replace the conf
     },
     {
       "name": "servo",
-      "type": "servo",
       "model": "pi",
+      "type": "servo",
+      "namespace": "rdk",
       "attributes": {
         "pin": "12",
         "board": "local"
@@ -325,15 +328,17 @@ Next, on the [**Raw JSON** tab](/manage/configuration/#the-config-tab), replace
   "components": [
     {
       "name": "local",
-      "type": "board",
       "model": "pi",
+      "type": "board",
+      "namespace": "rdk",
       "attributes": {},
       "depends_on": []
     },
     {
       "name": "cam",
-      "type": "camera",
       "model": "webcam",
+      "type": "camera",
+      "namespace": "rdk",
       "attributes": {
         "video_path": "video0"
       },
@@ -341,8 +346,9 @@ Next, on the [**Raw JSON** tab](/manage/configuration/#the-config-tab), replace
     },
     {
       "name": "servo",
-      "type": "servo",
       "model": "pi",
+      "type": "servo",
+      "namespace": "rdk",
       "attributes": {
         "pin": "12",
         "board": "local"
@@ -351,8 +357,9 @@ Next, on the [**Raw JSON** tab](/manage/configuration/#the-config-tab), replace
     },
     {
       "name": "transform_cam",
-      "type": "camera",
       "model": "transform",
+      "type": "camera",
+      "namespace": "rdk",
       "attributes": {
         "source": "cam",
         "pipeline": [
diff --git a/docs/tutorials/projects/make-a-plant-watering-robot.md b/docs/tutorials/projects/make-a-plant-watering-robot.md
index f26e4cb0da..e00d40d7af 100644
--- a/docs/tutorials/projects/make-a-plant-watering-robot.md
+++ b/docs/tutorials/projects/make-a-plant-watering-robot.md
@@ -282,8 +282,9 @@ First, add your Pi as a [board component](/components/board/) by creating a new
   "components": [
     {
       "name": "local",
-      "type": "board",
       "model": "pi",
+      "type": "board",
+      "namespace": "rdk",
       "attributes": {},
       "depends_on": []
     } // Motor JSON ...
@@ -310,8 +311,9 @@ Set the motor's attributes **Max RPM** to `1000` and **PWM** to `12 GPIO 18` (th
 // Board JSON ... },
 {
   "name": "water-pump",
-  "type": "motor",
   "model": "gpio",
+  "type": "motor",
+  "namespace": "rdk",
   "attributes": {
     "pins": {
       "a": "",
diff --git a/docs/tutorials/projects/modernize-retro-robot.md b/docs/tutorials/projects/modernize-retro-robot.md
index a5d10d89e3..7677006a08 100644
--- a/docs/tutorials/projects/modernize-retro-robot.md
+++ b/docs/tutorials/projects/modernize-retro-robot.md
@@ -341,8 +341,9 @@ On the [`Raw JSON` tab](/manage/configuration/#the-config-tab), replace the conf
   "components": [
     {
       "name": "local",
-      "type": "board",
       "model": "pi",
+      "type": "board",
+      "namespace": "rdk",
       "attributes": {},
       "depends_on": []
     },
diff --git a/docs/tutorials/projects/pet-treat-dispenser.md b/docs/tutorials/projects/pet-treat-dispenser.md
index 163500050e..e1e1f51a07 100644
--- a/docs/tutorials/projects/pet-treat-dispenser.md
+++ b/docs/tutorials/projects/pet-treat-dispenser.md
@@ -161,8 +161,9 @@ On the [`Raw JSON` tab](/manage/configuration/#the-config-tab), replace the conf
     {
       "depends_on": [],
       "name": "stepper",
-      "type": "motor",
       "model": "gpiostepper",
+      "type": "motor",
+      "namespace": "rdk",
       "attributes": {
         "pins": {
           "en_low": "18",
diff --git a/docs/tutorials/projects/tipsy.md b/docs/tutorials/projects/tipsy.md
index a136065b9b..656f5499fd 100644
--- a/docs/tutorials/projects/tipsy.md
+++ b/docs/tutorials/projects/tipsy.md
@@ -237,16 +237,18 @@ On the [`Raw JSON` tab](/manage/configuration/#the-config-tab), replace the conf
     {
       "depends_on": ["local"],
       "name": "cam",
-      "type": "camera",
       "model": "webcam",
+      "type": "camera",
+      "namespace": "rdk",
       "attributes": {
         "video_path": "video4"
       }
     },
     {
       "name": "ultrasonic",
-      "type": "sensor",
       "model": "ultrasonic",
+      "type": "sensor",
+      "namespace": "rdk",
       "attributes": {
         "echo_interrupt_pin": "38",
         "board": "local",
@@ -256,8 +258,9 @@ On the [`Raw JSON` tab](/manage/configuration/#the-config-tab), replace the conf
     },
     {
       "name": "ultrasonic2",
-      "type": "sensor",
       "model": "ultrasonic",
+      "type": "sensor",
+      "namespace": "rdk",
       "attributes": {
         "echo_interrupt_pin": "7",
         "trigger_pin": "13",
@@ -477,8 +480,9 @@ On the [`Raw JSON` tab](/manage/configuration/#the-config-tab), replace the conf
     {
       "depends_on": ["local"],
       "name": "cam",
-      "type": "camera",
       "model": "webcam",
+      "type": "camera",
+      "namespace": "rdk",
       "attributes": {
         "video_path": "video4"
       }
@@ -503,8 +507,9 @@ On the [`Raw JSON` tab](/manage/configuration/#the-config-tab), replace the conf
     },
     {
       "name": "ultrasonic",
-      "type": "sensor",
       "model": "ultrasonic",
+      "type": "sensor",
+      "namespace": "rdk",
       "attributes": {
         "echo_interrupt_pin": "38",
         "board": "local",
@@ -514,8 +519,9 @@ On the [`Raw JSON` tab](/manage/configuration/#the-config-tab), replace the conf
     },
     {
       "name": "ultrasonic2",
-      "type": "sensor",
       "model": "ultrasonic",
+      "type": "sensor",
+      "namespace": "rdk",
       "attributes": {
         "echo_interrupt_pin": "7",
         "board": "local",
diff --git a/docs/tutorials/services/constrain-motion.md b/docs/tutorials/services/constrain-motion.md
index 1884e6747e..58c2b8e5ca 100644
--- a/docs/tutorials/services/constrain-motion.md
+++ b/docs/tutorials/services/constrain-motion.md
@@ -63,8 +63,9 @@ If instead you are creating a new robot for this tutorial, copy the following co
   "components": [
     {
       "name": "myArm",
-      "type": "arm",
       "model": "xArm6",
+      "type": "arm",
+      "namespace": "rdk",
       "attributes": {
         "host": "<ip-address>",
         "port": 0,
@@ -92,8 +93,9 @@ If instead you are creating a new robot for this tutorial, copy the following co
     },
     {
       "name": "myGripper",
-      "type": "gripper",
       "model": "fake",
+      "type": "gripper",
+      "namespace": "rdk",
       "attributes": {},
       "depends_on": ["myArm"],
       "frame": {
diff --git a/docs/tutorials/services/navigate-with-rover-base.md b/docs/tutorials/services/navigate-with-rover-base.md
index 0771197dc2..85ac793272 100644
--- a/docs/tutorials/services/navigate-with-rover-base.md
+++ b/docs/tutorials/services/navigate-with-rover-base.md
@@ -349,8 +349,9 @@ At this point, if you switch to **Raw JSON** mode in your robot's **Config** tab
       "model": "incremental"
     },
     {
-      "type": "encoder",
       "model": "incremental",
+      "type": "encoder",
+      "namespace": "rdk",
       "attributes": {
         "board": "local",
         "pins": {
diff --git a/docs/tutorials/services/webcam-line-follower-robot.md b/docs/tutorials/services/webcam-line-follower-robot.md
index a83080d846..00250ed805 100644
--- a/docs/tutorials/services/webcam-line-follower-robot.md
+++ b/docs/tutorials/services/webcam-line-follower-robot.md
@@ -112,15 +112,17 @@ To find yours, follow [these instructions](/components/camera/webcam/#find-the-v
   "components": [
     {
       "name": "local",
-      "type": "board",
       "model": "pi",
+      "type": "board",
+      "namespace": "rdk",
       "attributes": {},
       "depends_on": []
     },
     {
       "name": "leftm",
-      "type": "motor",
       "model": "gpio",
+      "type": "motor",
+      "namespace": "rdk",
       "attributes": {
         "pins": {
           "a": "15",
@@ -133,8 +135,9 @@ To find yours, follow [these instructions](/components/camera/webcam/#find-the-v
     },
     {
       "name": "rightm",
-      "type": "motor",
       "model": "gpio",
+      "type": "motor",
+      "namespace": "rdk",
       "attributes": {
         "pins": {
           "b": "11",
@@ -149,8 +152,9 @@ To find yours, follow [these instructions](/components/camera/webcam/#find-the-v
     },
     {
       "name": "scuttlebase",
-      "type": "base",
       "model": "wheeled",
+      "type": "base",
+      "namespace": "rdk",
       "attributes": {
         "width_mm": 400,
         "wheel_circumference_mm": 258,
@@ -161,8 +165,9 @@ To find yours, follow [these instructions](/components/camera/webcam/#find-the-v
     },
     {
       "name": "my_camera",
-      "type": "camera",
       "model": "webcam",
+      "type": "camera",
+      "namespace": "rdk",
       "attributes": {
         "video_path": "video0"
       },
@@ -268,15 +273,17 @@ On the [`Raw JSON` tab](/manage/configuration/#the-config-tab), replace the conf
   "components": [
     {
       "name": "local",
-      "type": "board",
       "model": "pi",
+      "type": "board",
+      "namespace": "rdk",
       "attributes": {},
       "depends_on": []
     },
     {
       "name": "leftm",
-      "type": "motor",
       "model": "gpio",
+      "type": "motor",
+      "namespace": "rdk",
       "attributes": {
         "pins": {
           "a": "15",
@@ -289,8 +296,9 @@ On the [`Raw JSON` tab](/manage/configuration/#the-config-tab), replace the conf
     },
     {
       "name": "rightm",
-      "type": "motor",
       "model": "gpio",
+      "type": "motor",
+      "namespace": "rdk",
       "attributes": {
         "pins": {
           "b": "11",
@@ -305,8 +313,9 @@ On the [`Raw JSON` tab](/manage/configuration/#the-config-tab), replace the conf
     },
     {
       "name": "scuttlebase",
-      "type": "base",
       "model": "wheeled",
+      "type": "base",
+      "namespace": "rdk",
       "attributes": {
         "width_mm": 400,
         "wheel_circumference_mm": 258,
@@ -317,8 +326,9 @@ On the [`Raw JSON` tab](/manage/configuration/#the-config-tab), replace the conf
     },
     {
       "name": "my_camera",
-      "type": "camera",
       "model": "webcam",
+      "type": "camera",
+      "namespace": "rdk",
       "attributes": {
         "video_path": "video0"
       },
@@ -326,8 +336,9 @@ On the [`Raw JSON` tab](/manage/configuration/#the-config-tab), replace the conf
     },
     {
       "name": "show_detections",
-      "type": "camera",
       "model": "transform",
+      "type": "camera",
+      "namespace": "rdk",
       "attributes": {
         "source": "my_camera",
         "pipeline": [