diff --git a/service/history/interfaces/engine_mock.go b/service/history/interfaces/engine_mock.go
index 8adce0eec56d..76923ffde4d3 100644
--- a/service/history/interfaces/engine_mock.go
+++ b/service/history/interfaces/engine_mock.go
@@ -27,10 +27,10 @@
 //
 // Generated by this command:
 //
-//	mockgen -copyright_file ../../../LICENSE -package common -source engine.go -destination engine_mock.go
+//	mockgen -copyright_file ../../../LICENSE -package interfaces -source engine.go -destination engine_mock.go
 //
 
-// Package common is a generated GoMock package.
+// Package interfaces is a generated GoMock package.
 package interfaces
 
 import (
diff --git a/service/history/ndc/hsm_state_replicator_mock.go b/service/history/ndc/hsm_state_replicator_mock.go
index 99205a571251..7f8899a2febf 100644
--- a/service/history/ndc/hsm_state_replicator_mock.go
+++ b/service/history/ndc/hsm_state_replicator_mock.go
@@ -37,7 +37,7 @@ import (
 	context "context"
 	reflect "reflect"
 
-	common "go.temporal.io/server/service/history/common"
+	interfaces "go.temporal.io/server/service/history/interfaces"
 	gomock "go.uber.org/mock/gomock"
 )
 
@@ -65,7 +65,7 @@ func (m *MockHSMStateReplicator) EXPECT() *MockHSMStateReplicatorMockRecorder {
 }
 
 // SyncHSMState mocks base method.
-func (m *MockHSMStateReplicator) SyncHSMState(ctx context.Context, request *common.SyncHSMRequest) error {
+func (m *MockHSMStateReplicator) SyncHSMState(ctx context.Context, request *interfaces.SyncHSMRequest) error {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "SyncHSMState", ctx, request)
 	ret0, _ := ret[0].(error)
diff --git a/service/history/shard/context_mock.go b/service/history/shard/context_mock.go
index 8d8cb571a76b..fccffe6c287f 100644
--- a/service/history/shard/context_mock.go
+++ b/service/history/shard/context_mock.go
@@ -55,10 +55,10 @@ import (
 	serialization "go.temporal.io/server/common/persistence/serialization"
 	pingable "go.temporal.io/server/common/pingable"
 	searchattribute "go.temporal.io/server/common/searchattribute"
-	common0 "go.temporal.io/server/service/history/common"
 	configs "go.temporal.io/server/service/history/configs"
 	events "go.temporal.io/server/service/history/events"
 	hsm "go.temporal.io/server/service/history/hsm"
+	interfaces "go.temporal.io/server/service/history/interfaces"
 	tasks "go.temporal.io/server/service/history/tasks"
 	gomock "go.uber.org/mock/gomock"
 )
@@ -303,10 +303,10 @@ func (mr *MockContextMockRecorder) GetCurrentTime(cluster any) *gomock.Call {
 }
 
 // GetEngine mocks base method.
-func (m *MockContext) GetEngine(ctx context.Context) (common0.Engine, error) {
+func (m *MockContext) GetEngine(ctx context.Context) (interfaces.Engine, error) {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "GetEngine", ctx)
-	ret0, _ := ret[0].(common0.Engine)
+	ret0, _ := ret[0].(interfaces.Engine)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
@@ -1031,10 +1031,10 @@ func (mr *MockControllableContextMockRecorder) GetCurrentTime(cluster any) *gomo
 }
 
 // GetEngine mocks base method.
-func (m *MockControllableContext) GetEngine(ctx context.Context) (common0.Engine, error) {
+func (m *MockControllableContext) GetEngine(ctx context.Context) (interfaces.Engine, error) {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "GetEngine", ctx)
-	ret0, _ := ret[0].(common0.Engine)
+	ret0, _ := ret[0].(interfaces.Engine)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
diff --git a/service/history/shard/engine_factory_mock.go b/service/history/shard/engine_factory_mock.go
index 12e20bb1dea6..3d9cf1b10c5c 100644
--- a/service/history/shard/engine_factory_mock.go
+++ b/service/history/shard/engine_factory_mock.go
@@ -36,7 +36,7 @@ package shard
 import (
 	reflect "reflect"
 
-	common "go.temporal.io/server/service/history/common"
+	interfaces "go.temporal.io/server/service/history/interfaces"
 	gomock "go.uber.org/mock/gomock"
 )
 
@@ -64,10 +64,10 @@ func (m *MockEngineFactory) EXPECT() *MockEngineFactoryMockRecorder {
 }
 
 // CreateEngine mocks base method.
-func (m *MockEngineFactory) CreateEngine(context Context) common.Engine {
+func (m *MockEngineFactory) CreateEngine(context Context) interfaces.Engine {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "CreateEngine", context)
-	ret0, _ := ret[0].(common.Engine)
+	ret0, _ := ret[0].(interfaces.Engine)
 	return ret0
 }