diff --git a/core/src/test/java/google/registry/beam/initsql/DomainBaseUtilTest.java b/core/src/test/java/google/registry/beam/initsql/DomainBaseUtilTest.java
index d4217f7e4..6d6758a0b 100644
--- a/core/src/test/java/google/registry/beam/initsql/DomainBaseUtilTest.java
+++ b/core/src/test/java/google/registry/beam/initsql/DomainBaseUtilTest.java
@@ -63,7 +63,7 @@ public class DomainBaseUtilTest {
   private DomainBase domain;
   private Entity domainEntity;
   private Key<OneTime> oneTimeBillKey;
-  private Key<BillingEvent.Recurring> recurringBillKey;
+  private VKey<BillingEvent.Recurring> recurringBillKey;
   private Key<DomainBase> domainKey;
 
   @RegisterExtension
@@ -102,11 +102,11 @@ public class DomainBaseUtilTest {
     Key<HistoryEntry> historyEntryKey =
         Key.create(persistResource(new HistoryEntry.Builder().setParent(domainKey).build()));
     oneTimeBillKey = Key.create(historyEntryKey, BillingEvent.OneTime.class, 1);
-    recurringBillKey = Key.create(historyEntryKey, BillingEvent.Recurring.class, 2);
-    Key<PollMessage.Autorenew> autorenewPollKey =
-        Key.create(historyEntryKey, PollMessage.Autorenew.class, 3);
-    Key<PollMessage.OneTime> onetimePollKey =
-        Key.create(historyEntryKey, PollMessage.OneTime.class, 1);
+    recurringBillKey = VKey.from(Key.create(historyEntryKey, BillingEvent.Recurring.class, 2));
+    VKey<PollMessage.Autorenew> autorenewPollKey =
+        VKey.from(Key.create(historyEntryKey, PollMessage.Autorenew.class, 3));
+    VKey<PollMessage.OneTime> onetimePollKey =
+        VKey.from(Key.create(historyEntryKey, PollMessage.OneTime.class, 1));
     // Set up a new persisted domain entity.
     domain =
         persistResource(
@@ -146,12 +146,10 @@ public class DomainBaseUtilTest {
                             .setPendingTransferExpirationTime(fakeClock.nowUtc())
                             .setServerApproveEntities(
                                 ImmutableSet.of(
-                                    VKey.from(oneTimeBillKey),
-                                    VKey.from(recurringBillKey),
-                                    VKey.from(autorenewPollKey)))
+                                    VKey.from(oneTimeBillKey), recurringBillKey, autorenewPollKey))
                             .setServerApproveBillingEvent(VKey.from(oneTimeBillKey))
-                            .setServerApproveAutorenewEvent(VKey.from(recurringBillKey))
-                            .setServerApproveAutorenewPollMessage(VKey.from(autorenewPollKey))
+                            .setServerApproveAutorenewEvent(recurringBillKey)
+                            .setServerApproveAutorenewPollMessage(autorenewPollKey)
                             .setTransferRequestTime(fakeClock.nowUtc().plusDays(1))
                             .setTransferStatus(TransferStatus.SERVER_APPROVED)
                             .setTransferRequestTrid(Trid.create("client-trid", "server-trid"))
diff --git a/core/src/test/java/google/registry/beam/initsql/InitSqlPipelineTest.java b/core/src/test/java/google/registry/beam/initsql/InitSqlPipelineTest.java
index f883f291d..4fdf7a7df 100644
--- a/core/src/test/java/google/registry/beam/initsql/InitSqlPipelineTest.java
+++ b/core/src/test/java/google/registry/beam/initsql/InitSqlPipelineTest.java
@@ -156,12 +156,12 @@ class InitSqlPipelineTest {
       Key<HistoryEntry> historyEntryKey = Key.create(historyEntry);
       Key<BillingEvent.OneTime> oneTimeBillKey =
           Key.create(historyEntryKey, BillingEvent.OneTime.class, 1);
-      Key<BillingEvent.Recurring> recurringBillKey =
-          Key.create(historyEntryKey, BillingEvent.Recurring.class, 2);
-      Key<PollMessage.Autorenew> autorenewPollKey =
-          Key.create(historyEntryKey, PollMessage.Autorenew.class, 3);
-      Key<PollMessage.OneTime> onetimePollKey =
-          Key.create(historyEntryKey, PollMessage.OneTime.class, 1);
+      VKey<BillingEvent.Recurring> recurringBillKey =
+          VKey.from(Key.create(historyEntryKey, BillingEvent.Recurring.class, 2));
+      VKey<PollMessage.Autorenew> autorenewPollKey =
+          VKey.from(Key.create(historyEntryKey, PollMessage.Autorenew.class, 3));
+      VKey<PollMessage.OneTime> onetimePollKey =
+          VKey.from(Key.create(historyEntryKey, PollMessage.OneTime.class, 1));
       domain =
           persistResource(
               new DomainBase.Builder()
@@ -200,12 +200,10 @@ class InitSqlPipelineTest {
                           .setPendingTransferExpirationTime(fakeClock.nowUtc())
                           .setServerApproveEntities(
                               ImmutableSet.of(
-                                  VKey.from(oneTimeBillKey),
-                                  VKey.from(recurringBillKey),
-                                  VKey.from(autorenewPollKey)))
+                                  VKey.from(oneTimeBillKey), recurringBillKey, autorenewPollKey))
                           .setServerApproveBillingEvent(VKey.from(oneTimeBillKey))
-                          .setServerApproveAutorenewEvent(VKey.from(recurringBillKey))
-                          .setServerApproveAutorenewPollMessage(VKey.from(autorenewPollKey))
+                          .setServerApproveAutorenewEvent(recurringBillKey)
+                          .setServerApproveAutorenewPollMessage(autorenewPollKey)
                           .setTransferRequestTime(fakeClock.nowUtc().plusDays(1))
                           .setTransferStatus(TransferStatus.SERVER_APPROVED)
                           .setTransferRequestTrid(Trid.create("client-trid", "server-trid"))
diff --git a/db/src/main/resources/sql/flyway/V40__add_columns_to_domain.sql b/db/src/main/resources/sql/flyway/V41__add_columns_to_domain.sql
similarity index 100%
rename from db/src/main/resources/sql/flyway/V40__add_columns_to_domain.sql
rename to db/src/main/resources/sql/flyway/V41__add_columns_to_domain.sql