diff --git a/node/src/integration-test-slow/kotlin/net/corda/node/flows/FinalityFlowErrorHandlingTest.kt b/node/src/integration-test-slow/kotlin/net/corda/node/flows/FinalityFlowErrorHandlingTest.kt
index 9617c21fb3..2ea07f4c7a 100644
--- a/node/src/integration-test-slow/kotlin/net/corda/node/flows/FinalityFlowErrorHandlingTest.kt
+++ b/node/src/integration-test-slow/kotlin/net/corda/node/flows/FinalityFlowErrorHandlingTest.kt
@@ -94,7 +94,7 @@ class GetFlowTransaction(private val txId: SecureHash) : FlowLogic<Pair<String,
                         rs.getString(4)   // TransactionStatus
                     }
                 }
-        val receiverPartyId = serviceHub.jdbcSession().prepareStatement("select * from node_sender_distribution_records where transaction_id = ?")
+        val receiverPartyId = serviceHub.jdbcSession().prepareStatement("select * from node_sender_distr_recs where transaction_id = ?")
                 .apply { setString(1, txId.toString()) }
                 .use { ps ->
                     ps.executeQuery().use { rs ->
diff --git a/node/src/main/kotlin/net/corda/node/services/persistence/DBTransactionStorageLedgerRecovery.kt b/node/src/main/kotlin/net/corda/node/services/persistence/DBTransactionStorageLedgerRecovery.kt
index 69df1fe9b3..31c5dc4a59 100644
--- a/node/src/main/kotlin/net/corda/node/services/persistence/DBTransactionStorageLedgerRecovery.kt
+++ b/node/src/main/kotlin/net/corda/node/services/persistence/DBTransactionStorageLedgerRecovery.kt
@@ -54,7 +54,7 @@ class DBTransactionStorageLedgerRecovery(private val database: CordaPersistence,
 
     @CordaSerializable
     @Entity
-    @Table(name = "${NODE_DATABASE_PREFIX}sender_distribution_records")
+    @Table(name = "${NODE_DATABASE_PREFIX}sender_distr_recs")
     data class DBSenderDistributionRecord(
             @EmbeddedId
             var compositeKey: PersistentKey,
@@ -77,7 +77,7 @@ class DBTransactionStorageLedgerRecovery(private val database: CordaPersistence,
 
     @CordaSerializable
     @Entity
-    @Table(name = "${NODE_DATABASE_PREFIX}receiver_distribution_records")
+    @Table(name = "${NODE_DATABASE_PREFIX}receiver_distr_recs")
     class DBReceiverDistributionRecord(
             @EmbeddedId
             var compositeKey: PersistentKey,
diff --git a/node/src/main/resources/migration/node-core.changelog-v25.xml b/node/src/main/resources/migration/node-core.changelog-v25.xml
index 9ea40bada9..c720483efa 100644
--- a/node/src/main/resources/migration/node-core.changelog-v25.xml
+++ b/node/src/main/resources/migration/node-core.changelog-v25.xml
@@ -11,7 +11,7 @@
     </changeSet>
 
     <changeSet author="R3.Corda" id="create_sender_distribution_records_table">
-        <createTable tableName="node_sender_distribution_records">
+        <createTable tableName="node_sender_distr_recs">
             <column name="timestamp" type="TIMESTAMP">
                 <constraints nullable="false"/>
             </column>
@@ -30,13 +30,13 @@
         </createTable>
     </changeSet>
 
-    <changeSet author="R3.Corda" id="node_sender_distribution_records_pkey">
-        <addPrimaryKey columnNames="peer_party_id, timestamp, timestamp_discriminator" constraintName="node_sender_distribution_records_pkey"
-                       tableName="node_sender_distribution_records"/>
+    <changeSet author="R3.Corda" id="node_sender_distr_recs_pkey">
+        <addPrimaryKey columnNames="peer_party_id, timestamp, timestamp_discriminator" constraintName="node_sender_distr_recs_pkey"
+                       tableName="node_sender_distr_recs"/>
     </changeSet>
 
     <changeSet author="R3.Corda" id="create_receiver_distribution_records_table">
-        <createTable tableName="node_receiver_distribution_records">
+        <createTable tableName="node_receiver_distr_recs">
             <column name="timestamp" type="TIMESTAMP">
                 <constraints nullable="false"/>
             </column>
@@ -58,9 +58,9 @@
         </createTable>
     </changeSet>
 
-    <changeSet author="R3.Corda" id="node_receiver_distribution_records_pkey">
-        <addPrimaryKey columnNames="peer_party_id, timestamp, timestamp_discriminator" constraintName="node_receiver_distribution_records_pkey"
-                       tableName="node_receiver_distribution_records"/>
+    <changeSet author="R3.Corda" id="node_receiver_distr_recs_pkey">
+        <addPrimaryKey columnNames="peer_party_id, timestamp, timestamp_discriminator" constraintName="node_receiver_distr_recs_pkey"
+                       tableName="node_receiver_distr_recs"/>
     </changeSet>
 
     <changeSet author="R3.Corda" id="create_recovery_party_info_table">
@@ -79,14 +79,14 @@
     </changeSet>
 
     <changeSet author="R3.Corda" id="FK__sender_distribution_records__peer_party_id">
-        <addForeignKeyConstraint baseColumnNames="peer_party_id" baseTableName="node_sender_distribution_records"
-                                 constraintName="FK__sender_distribution_records__peer_party_id"
+        <addForeignKeyConstraint baseColumnNames="peer_party_id" baseTableName="node_sender_distr_recs"
+                                 constraintName="FK__send_distr__peer_party_id"
                                  referencedColumnNames="party_id" referencedTableName="node_recovery_party_info"/>
     </changeSet>
 
     <changeSet author="R3.Corda" id="FK__receiver_distribution_records__peer_party_id">
-        <addForeignKeyConstraint baseColumnNames="peer_party_id" baseTableName="node_receiver_distribution_records"
-                                 constraintName="FK__receiver_distribution_records__peer_party_id"
+        <addForeignKeyConstraint baseColumnNames="peer_party_id" baseTableName="node_receiver_distr_recs"
+                                 constraintName="FK__recv_distr__peer_party_id"
                                  referencedColumnNames="party_id" referencedTableName="node_recovery_party_info"/>
     </changeSet>