diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/EventType.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/EventType.kt
index b4a58e5ee6..d2befca1ee 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/EventType.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/EventType.kt
@@ -52,11 +52,9 @@ object EventType {
     const val STATE_ROOM_GUEST_ACCESS = "m.room.guest_access"
     const val STATE_ROOM_POWER_LEVELS = "m.room.power_levels"
 
-    //    const val STATE_SPACE_CHILD = "m.space.child"
-    const val STATE_SPACE_CHILD = "org.matrix.msc1772.space.child"
+    const val STATE_SPACE_CHILD = "m.space.child"
 
-    //    const val STATE_SPACE_PARENT = "m.space.parent"
-    const val STATE_SPACE_PARENT = "org.matrix.msc1772.space.parent"
+    const val STATE_SPACE_PARENT = "m.space.parent"
 
     /**
      * Note that this Event has been deprecated, see
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomType.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomType.kt
index b4932494f2..b0f3a56d67 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomType.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomType.kt
@@ -18,6 +18,5 @@ package org.matrix.android.sdk.api.session.room.model
 
 object RoomType {
 
-    const val SPACE = "org.matrix.msc1772.space" // "m.space"
-//    const val MESSAGING = "org.matrix.msc1840.messaging"
+    const val SPACE = "m.space"
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/create/CreateRoomParams.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/create/CreateRoomParams.kt
index cd729832eb..ca8c66bb3b 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/create/CreateRoomParams.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/create/CreateRoomParams.kt
@@ -160,6 +160,6 @@ open class CreateRoomParams {
 
     companion object {
         private const val CREATION_CONTENT_KEY_M_FEDERATE = "m.federate"
-        private const val CREATION_CONTENT_KEY_ROOM_TYPE = "org.matrix.msc1772.type"
+        private const val CREATION_CONTENT_KEY_ROOM_TYPE = "type"
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/create/RoomCreateContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/create/RoomCreateContent.kt
index f9d40d5652..52e5c0e9c7 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/create/RoomCreateContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/create/RoomCreateContent.kt
@@ -28,5 +28,5 @@ data class RoomCreateContent(
         @Json(name = "room_version") val roomVersion: String? = null,
         @Json(name = "predecessor") val predecessor: Predecessor? = null,
         // Defines the room type, see #RoomType (user extensible)
-        @Json(name = "org.matrix.msc1772.type") val type: String? = null
+        @Json(name = "type") val type: String? = null
 )