diff --git a/CPEs/proposed/CPE2 - In-band account login.md b/CPEs/proposed/CPE2 - In-band account login.md
index 4f110fb..cae6e9c 100644
--- a/CPEs/proposed/CPE2 - In-band account login.md	
+++ b/CPEs/proposed/CPE2 - In-band account login.md	
@@ -6,12 +6,12 @@ This extension is intended for logging into user account on a server by username
 
 ## Message type identifiers
 
-- `profile:login`  
+- `urn:cadmium:profile:login`  
 
 ## Errors
 
 - Ratelimit system: enabled
-- `invalid_creds`: user ID/password isn't valid
+- `urn:cadmium:profile:login:invalid_creds`: user ID/password isn't valid
 
 ## Use cases
 
@@ -20,8 +20,8 @@ This extension is intended for logging into user account on a server by username
 ```json
 {
     "id": "abcd",
-    "type": "profile:login",
-    "to": "cadmium.org",
+    "type": "urn:cadmium:profile:login",
+    "to": ["cadmium.org"],
     "payload": {
         "username": "juliet",
         "password": "romeo1"
@@ -34,7 +34,7 @@ This extension is intended for logging into user account on a server by username
 ```json
 {
     "id": "abcd",
-    "type": "profile:login",
+    "type": "urn:cadmium:profile:login",
     "from": "cadmium.org",
     "ok": true,
     "payload": {
@@ -49,11 +49,11 @@ This extension is intended for logging into user account on a server by username
 ```json
 {
     "id": "abcd",
-    "type": "profile:login",
+    "type": "urn:cadmium:profile:login",
     "from": "cadmium.org",
     "ok": false,
     "payload": {
-        "errID": "invalid_creds",
+        "errID": "urn:cadmium:profile:login:invalid_creds",
         "errText": "Username/password isn't valid"
     }
 }
diff --git a/CPEs/proposed/CPE3 - In-band account registration.md b/CPEs/proposed/CPE3 - In-band account registration.md
index a7848b5..9b12a48 100644
--- a/CPEs/proposed/CPE3 - In-band account registration.md	
+++ b/CPEs/proposed/CPE3 - In-band account registration.md	
@@ -6,13 +6,13 @@ This extension is intended for creating user accounts on a server
 
 ## Message type identifiers
 
-- `profile:register`
+- `urn:cadmium:profile:register`
 
 ## Errors
 
 - Ratelimit system: enabled
-- `id_exists`: username/third party ID already taken
-- `reg_disabled`: registration isn't allowed on a server
+- `urn:cadmium:profile:register:id_exists`: username/third party ID already taken
+- `urn:cadmium:profile:register:reg_disabled`: registration isn't allowed on a server
 
 ## Use cases
 
@@ -25,8 +25,8 @@ This extension is intended for creating user accounts on a server
 ```json
 {
     "id": "abcd",
-    "type": "profile:register",
-    "to": "cadmium.org",
+    "type": "urn:cadmium:profile:register",
+    "to": ["cadmium.org"],
     "payload": {
         "username": "juliet",
         "thirdPIDs": [
@@ -44,7 +44,7 @@ This extension is intended for creating user accounts on a server
 ```json
 {
     "id": "abcd",
-    "type": "profile:register",
+    "type": "urn:cadmium:profile:register",
     "from": "cadmium.org",
     "ok": true,
     "payload": {
@@ -58,11 +58,11 @@ This extension is intended for creating user accounts on a server
 ```json
 {
     "id": "abcd",
-    "type": "profile:register",
+    "type": "urn:cadmium:profile:register",
     "from": "cadmium.org",
     "ok": false,
     "payload": {
-        "errID": "id_exists",
+        "errID": "urn:cadmium:profile:register:id_exists",
         "errText": "Username/email/msisdn already taken"
     }
 }