2 files changed, 10 insertions, 11 deletions
diff --git a/synapse/api/room_versions.py b/synapse/api/room_versions.py
index c4d50d2df8..1cdb153f63 100644
--- a/synapse/api/room_versions.py
+++ b/synapse/api/room_versions.py
@@ -147,8 +147,8 @@ class RoomVersions:
         msc2176_redaction_rules=False,
         allow_knocking=False,
     )
-    MSC2176 = RoomVersion(
-        "org.matrix.msc2176",
+    V7 = RoomVersion(
+        "7",
         RoomDisposition.UNSTABLE,
         EventFormatVersions.V3,
         StateResolutionVersions.V2,
@@ -156,11 +156,11 @@ class RoomVersions:
         special_case_aliases_auth=False,
         strict_canonicaljson=True,
         limit_notifications_power_levels=True,
-        msc2176_redaction_rules=True,
-        allow_knocking=False,
+        msc2176_redaction_rules=False,
+        allow_knocking=True,
     )
-    MSC2403_DEV = RoomVersion(
-        "xyz.amorgan.knock",
+    MSC2176 = RoomVersion(
+        "org.matrix.msc2176",
         RoomDisposition.UNSTABLE,
         EventFormatVersions.V3,
         StateResolutionVersions.V2,
@@ -168,8 +168,8 @@ class RoomVersions:
         special_case_aliases_auth=False,
         strict_canonicaljson=True,
         limit_notifications_power_levels=True,
-        msc2176_redaction_rules=False,
-        allow_knocking=True,
+        msc2176_redaction_rules=True,
+        allow_knocking=False,
     )
 
 
@@ -182,5 +182,6 @@ KNOWN_ROOM_VERSIONS = {
         RoomVersions.V4,
         RoomVersions.V5,
         RoomVersions.V6,
+        RoomVersions.V7,
     )
 }  # type: Dict[str, RoomVersion]
diff --git a/synapse/config/experimental.py b/synapse/config/experimental.py
index a94c4cc86d..1ea11422af 100644
--- a/synapse/config/experimental.py
+++ b/synapse/config/experimental.py
@@ -30,6 +30,4 @@ class ExperimentalConfig(Config):
         self.msc2403_enabled = experimental.get("msc2403_enabled", False)  # type: bool
         if self.msc2403_enabled:
             # Enable the MSC2403 unstable room version
-            KNOWN_ROOM_VERSIONS.update(
-                {RoomVersions.MSC2403_DEV.identifier: RoomVersions.MSC2403_DEV}
-            )
+            KNOWN_ROOM_VERSIONS.update({RoomVersions.V7.identifier: RoomVersions.V7})