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 6abae225bb..ff36f5fb4d 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,10 @@ 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 REWRAP_MESSAGE_TOPIC = "crypto.key.rotation.individual";
         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 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 b5ef6fd3f7..432480a35d 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
@@ -33,26 +33,38 @@ topics:
       - membership
       - rest
     config:
-  CryptoOpsRewrapTopic:
-    name: crypto.key.rotation.individual
+  CryptoOpsRpcResponseTopic:
+    name: crypto.ops.rpc.resp
     consumers:
       - crypto
+      - gateway
+      - link-manager
+      - membership
+      - rest
     producers:
       - crypto
+    config:
   CryptoOpsRekeyTopic:
     name: crypto.key.rotations.ops
     consumers:
       - crypto
     producers:
       - rest
-  CryptoOpsRpcResponseTopic:
-    name: crypto.ops.rpc.resp
+  CryptoOpsRekeyResponseTopic:
+    name: crypto.key.rotations.ops.resp
     consumers:
-      - crypto
-      - gateway
-      - link-manager
-      - membership
       - rest
     producers:
       - crypto
-    config:
+  CryptoOpsRewrapTopic:
+    name: crypto.key.rotation.individual
+    consumers:
+      - crypto
+    producers:
+      - crypto
+  CryptoOpsRewrapResponseTopic:
+    name: crypto.key.rotation.individual.resp
+    consumers:
+      - crypto
+    producers:
+      - crypto