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 4be8eea856..99934d3d95 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
@@ -51,8 +51,8 @@ object EventType {
     const val STATE_ROOM_JOIN_RULES = "m.room.join_rules"
     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"
+//    const val STATE_SPACE_CHILD = "m.space.child"
+    const val STATE_SPACE_CHILD = "org.matrix.msc1772.space.child"
 
     /**
      * 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 3958d45d0b..b4932494f2 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,6 @@ package org.matrix.android.sdk.api.session.room.model
 
 object RoomType {
 
-    const val SPACE = "m.space"
-    const val MESSAGING = "m.messaging"
+    const val SPACE = "org.matrix.msc1772.space" // "m.space"
+//    const val MESSAGING = "org.matrix.msc1840.messaging"
 }
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 52e5c0e9c7..f9d40d5652 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 = "type") val type: String? = null
+        @Json(name = "org.matrix.msc1772.type") val type: String? = null
 )
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/peeking/PeekSpaceTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/peeking/PeekSpaceTask.kt
index 826be0b3aa..a2be75a232 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/peeking/PeekSpaceTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/peeking/PeekSpaceTask.kt
@@ -119,15 +119,15 @@ internal class DefaultPeekSpaceTask @Inject constructor(
                                     peekChildren(childStateEvents, depth + 1, maxDepth)
                             )
                     )
-                } else if (type == RoomType.MESSAGING || type == null) {
+                } else
+                /** if (type == RoomType.MESSAGING || type == null)*/
+                {
                     Timber.v("## SPACE_PEEK: room child $entry")
                     spaceChildResults.add(
                             SpaceChildPeekResult(
                                     childId, childPeek, entry.second?.default, entry.second?.order
                             )
                     )
-                } else {
-                    // ignore for now?
                 }
 
                 // let's check child info