diff --git a/data/topic-schema/src/main/java/net/corda/schema/Schemas.java b/data/topic-schema/src/main/java/net/corda/schema/Schemas.java
index bb0a38a71b..8134dd4c59 100644
--- a/data/topic-schema/src/main/java/net/corda/schema/Schemas.java
+++ b/data/topic-schema/src/main/java/net/corda/schema/Schemas.java
@@ -87,8 +87,8 @@ private Crypto() {
         public static final String FLOW_OPS_MESSAGE_TOPIC = "crypto.ops.flow";
         public static final String RPC_OPS_MESSAGE_TOPIC = "crypto.ops.rpc";
         public static final String RPC_OPS_MESSAGE_RESPONSE_TOPIC = getRPCResponseTopic(RPC_OPS_MESSAGE_TOPIC);
-        public static final String REKEY_MESSAGE_TOPIC = "crypto.key.rotations.ops";
-        public static final String REKEY_MESSAGE_RESPONSE_TOPIC = getRPCResponseTopic(REKEY_MESSAGE_TOPIC);
+        public static final String REKEY_MESSAGE_TOPIC = "crypto.key.rotation.ops";
+        public static final String REKEY_MESSAGE_STATUS_TOPIC = "crypto.key.rotation.status";
         public static final String REWRAP_MESSAGE_TOPIC = "crypto.key.rotation.individual";
         public static final String REWRAP_MESSAGE_RESPONSE_TOPIC = getRPCResponseTopic(REWRAP_MESSAGE_TOPIC);
     }
diff --git a/data/topic-schema/src/main/resources/net/corda/schema/Crypto.yaml b/data/topic-schema/src/main/resources/net/corda/schema/Crypto.yaml
index 432480a35d..8cc58b0ade 100644
--- a/data/topic-schema/src/main/resources/net/corda/schema/Crypto.yaml
+++ b/data/topic-schema/src/main/resources/net/corda/schema/Crypto.yaml
@@ -45,13 +45,13 @@ topics:
       - crypto
     config:
   CryptoOpsRekeyTopic:
-    name: crypto.key.rotations.ops
+    name: crypto.key.rotation.ops
     consumers:
       - crypto
     producers:
       - rest
-  CryptoOpsRekeyResponseTopic:
-    name: crypto.key.rotations.ops.resp
+  CryptoOpsRekeyStatusTopic:
+    name: crypto.key.rotation.ops.resp
     consumers:
       - rest
     producers: