diff --git a/auctioneer/account_subscription_test.go b/auctioneer/account_subscription_test.go
index 271a876..92dd137 100644
--- a/auctioneer/account_subscription_test.go
+++ b/auctioneer/account_subscription_test.go
@@ -45,7 +45,7 @@ func TestAccountSubscriptionAuthenticate(t *testing.T) {
 			sendMsg:      sendMsg,
 			signer:       testSigner,
 			msgChan:      srvMsgChan,
-			batchVersion: order.CurrentBatchVersion,
+			batchVersion: order.LatestBatchVersion,
 		}
 	)
 
@@ -108,7 +108,7 @@ func TestAccountSubscriptionAuthenticateAbort(t *testing.T) {
 			sendMsg:      sendMsg,
 			signer:       testSigner,
 			msgChan:      srvMsgChan,
-			batchVersion: order.CurrentBatchVersion,
+			batchVersion: order.LatestBatchVersion,
 		}
 	)
 
@@ -161,7 +161,7 @@ func TestAccountSubscriptionAuthenticateContextClose(t *testing.T) {
 			sendMsg:      sendMsg,
 			signer:       testSigner,
 			msgChan:      srvMsgChan,
-			batchVersion: order.CurrentBatchVersion,
+			batchVersion: order.LatestBatchVersion,
 		}
 		ctxc, cancel = context.WithCancel(context.Background())
 	)
@@ -216,7 +216,7 @@ func TestAccountSubscriptionAuthenticateError(t *testing.T) {
 			sendMsg:      sendMsg,
 			signer:       testSigner,
 			msgChan:      srvMsgChan,
-			batchVersion: order.CurrentBatchVersion,
+			batchVersion: order.LatestBatchVersion,
 			errChan:      make(chan error),
 		}
 	)
diff --git a/order/batch.go b/order/batch.go
index bd37737..fe2971e 100644
--- a/order/batch.go
+++ b/order/batch.go
@@ -53,10 +53,8 @@ const (
 )
 
 const (
-
-	// CurrentBatchVersion points to the version used by the client for
-	// verifying a batch.
-	CurrentBatchVersion = ExtendAccountBatchVersion
+	// LatestBatchVersion points to the most recent batch version.
+	LatestBatchVersion = ExtendAccountBatchVersion
 
 	// LegacyLeaseDurationBucket is the single static duration bucket that
 	// was used for orders before dynamic duration buckets were added.
diff --git a/order/manager_test.go b/order/manager_test.go
index ded7e79..2aa36eb 100644
--- a/order/manager_test.go
+++ b/order/manager_test.go
@@ -25,7 +25,7 @@ func TestValidateOrderAccountIsolation(t *testing.T) {
 	orderStore := newMockStore()
 	orderManager := NewManager(&ManagerConfig{
 		Store:        orderStore,
-		BatchVersion: CurrentBatchVersion,
+		BatchVersion: LatestBatchVersion,
 	})
 
 	// We'll now create two accounts, one that's 1 BTC in size, while the
@@ -111,7 +111,7 @@ func TestValidateOrder(t *testing.T) {
 	orderStore := newMockStore()
 	orderManager := NewManager(&ManagerConfig{
 		Store:        orderStore,
-		BatchVersion: CurrentBatchVersion,
+		BatchVersion: LatestBatchVersion,
 	})
 
 	// We'll now create an account with sufficient size.
@@ -272,7 +272,7 @@ func TestPrepareOrderSidecarTicket(t *testing.T) {
 		Wallet:       test.NewMockWalletKit(),
 		Lightning:    mockLightning,
 		Signer:       mockSigner,
-		BatchVersion: CurrentBatchVersion,
+		BatchVersion: LatestBatchVersion,
 	})
 	require.NoError(t, mgr.Start())
 	defer mgr.Stop()