diff --git a/hack/update-mockgen.sh b/hack/update-mockgen.sh
index 7570ca6eb..9c771927d 100755
--- a/hack/update-mockgen.sh
+++ b/hack/update-mockgen.sh
@@ -4,28 +4,60 @@
 # Use a space to separate mock destination from its interfaces.
 
 mock_path="testing/mock"
-proto_mocks=(
+
+# github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1
+# ------------------------------------------------------
+proto_mocks_v1alpha1=(
       "$mock_path/beacon_service_mock.go BeaconChainClient,BeaconChain_StreamChainHeadClient,BeaconChain_StreamAttestationsClient,BeaconChain_StreamBlocksClient,BeaconChain_StreamValidatorsInfoClient,BeaconChain_StreamIndexedAttestationsClient"
       "$mock_path/beacon_chain_service_mock.go BeaconChain_StreamChainHeadServer,BeaconChain_StreamAttestationsServer,BeaconChain_StreamBlocksServer,BeaconChain_StreamValidatorsInfoServer,BeaconChain_StreamIndexedAttestationsServer"
       "$mock_path/beacon_validator_server_mock.go BeaconNodeValidatorServer,BeaconNodeValidator_WaitForActivationServer,BeaconNodeValidator_WaitForChainStartServer,BeaconNodeValidator_StreamDutiesServer"
       "$mock_path/beacon_validator_client_mock.go BeaconNodeValidatorClient,BeaconNodeValidator_WaitForChainStartClient,BeaconNodeValidator_WaitForActivationClient,BeaconNodeValidator_StreamDutiesClient"
       "$mock_path/slasher_client_mock.go SlasherClient"
-      "$mock_path/event_service_mock.go EventsClient,Events_StreamEventsClient,Events_StreamEventsServer"
       "$mock_path/node_service_mock.go NodeClient"
-      "$mock_path/keymanager_mock.go RemoteSignerClient"
 )
 
+for ((i = 0; i < ${#proto_mocks_v1alpha1[@]}; i++)); do
+    file=${proto_mocks_v1alpha1[i]% *};
+    interfaces=${proto_mocks_v1alpha1[i]#* };
+    echo "generating $file for interfaces: $interfaces";
+    echo
+    GO11MODULE=on mockgen -package=mock -destination="$file" github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1 "$interfaces"
+done
+
+# github.com/prysmaticlabs/prysm/v3/proto/eth/service
+# ---------------------------------------------------
+proto_mocks_service=(
+      "$mock_path/event_service_mock.go EventsClient,Events_StreamEventsClient,Events_StreamEventsServer"
+)
+
+for ((i = 0; i < ${#proto_mocks_service[@]}; i++)); do
+    file=${proto_mocks_service[i]% *};
+    interfaces=${proto_mocks_service[i]#* };
+    echo "generating $file for interfaces: $interfaces";
+    echo
+    GO11MODULE=on mockgen -package=mock -destination="$file" github.com/prysmaticlabs/prysm/v3/proto/eth/service "$interfaces"
+done
+
+# github.com/prysmaticlabs/prysm/proto/v3/prysm/v1alpha1/validator-client
+# -----------------------------------------------------------------------
+proto_mocks_v1alpha1_validator_clients=(
+    "$mock_path/keymanager_mock.go RemoteSignerClient"
+)
+
+for ((i = 0; i < ${#proto_mocks_v1alpha1_validator_clients[@]}; i++)); do
+    file=${proto_mocks_v1alpha1_validator_clients[i]% *};
+    interfaces=${proto_mocks_v1alpha1_validator_clients[i]#* };
+    echo "generating $file for interfaces: $interfaces";
+    echo
+    GO11MODULE=on mockgen -package=mock -destination="$file" github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1/validator-client "$interfaces"
+done
+
+# github.com/prysmaticlabs/prysm/v3/validator/client/iface
+# --------------------------------------------------------
 iface_mocks=(
       "$mock_path/validator_client_mock.go ValidatorClient"
 )
 
-for ((i = 0; i < ${#proto_mocks[@]}; i++)); do
-    file=${proto_mocks[i]% *};
-    interfaces=${proto_mocks[i]#* };
-    echo "generating $file for interfaces: $interfaces";
-    GO11MODULE=on mockgen -package=mock -destination="$file" github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1 "$interfaces"
-done
-
 for ((i = 0; i < ${#iface_mocks[@]}; i++)); do
     file=${iface_mocks[i]% *};
     interfaces=${iface_mocks[i]#* };
diff --git a/testing/mock/beacon_chain_service_mock.go b/testing/mock/beacon_chain_service_mock.go
index 6eb479058..3e281733e 100644
--- a/testing/mock/beacon_chain_service_mock.go
+++ b/testing/mock/beacon_chain_service_mock.go
@@ -1,5 +1,5 @@
 // Code generated by MockGen. DO NOT EDIT.
-// Source: github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1 (interfaces: BeaconChain_StreamChainHeadServer,BeaconChain_StreamAttestationsServer,BeaconChain_StreamBlocksServer,BeaconChain_StreamValidatorsInfoServer,BeaconChain_StreamIndexedAttestationsServer)
+// Source: github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1 (interfaces: BeaconChain_StreamChainHeadServer,BeaconChain_StreamAttestationsServer,BeaconChain_StreamBlocksServer,BeaconChain_StreamValidatorsInfoServer,BeaconChain_StreamIndexedAttestationsServer)
 
 // Package mock is a generated GoMock package.
 package mock
diff --git a/testing/mock/beacon_service_mock.go b/testing/mock/beacon_service_mock.go
index 6ee09c28e..7802d5c74 100644
--- a/testing/mock/beacon_service_mock.go
+++ b/testing/mock/beacon_service_mock.go
@@ -1,5 +1,5 @@
 // Code generated by MockGen. DO NOT EDIT.
-// Source: github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1 (interfaces: BeaconChainClient,BeaconChain_StreamChainHeadClient,BeaconChain_StreamAttestationsClient,BeaconChain_StreamBlocksClient,BeaconChain_StreamValidatorsInfoClient,BeaconChain_StreamIndexedAttestationsClient)
+// Source: github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1 (interfaces: BeaconChainClient,BeaconChain_StreamChainHeadClient,BeaconChain_StreamAttestationsClient,BeaconChain_StreamBlocksClient,BeaconChain_StreamValidatorsInfoClient,BeaconChain_StreamIndexedAttestationsClient)
 
 // Package mock is a generated GoMock package.
 package mock
diff --git a/testing/mock/beacon_validator_client_mock.go b/testing/mock/beacon_validator_client_mock.go
index 28aaae06b..0b4fdbfd6 100644
--- a/testing/mock/beacon_validator_client_mock.go
+++ b/testing/mock/beacon_validator_client_mock.go
@@ -1,5 +1,5 @@
 // Code generated by MockGen. DO NOT EDIT.
-// Source: github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1 (interfaces: BeaconNodeValidatorClient,BeaconNodeValidator_WaitForChainStartClient,BeaconNodeValidator_WaitForActivationClient,BeaconNodeValidator_StreamDutiesClient)
+// Source: github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1 (interfaces: BeaconNodeValidatorClient,BeaconNodeValidator_WaitForChainStartClient,BeaconNodeValidator_WaitForActivationClient,BeaconNodeValidator_StreamDutiesClient)
 
 // Package mock is a generated GoMock package.
 package mock
@@ -138,6 +138,26 @@ func (mr *MockBeaconNodeValidatorClientMockRecorder) GetDuties(arg0, arg1 interf
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetDuties", reflect.TypeOf((*MockBeaconNodeValidatorClient)(nil).GetDuties), varargs...)
 }
 
+// GetFeeRecipientByPubKey mocks base method.
+func (m *MockBeaconNodeValidatorClient) GetFeeRecipientByPubKey(arg0 context.Context, arg1 *eth.FeeRecipientByPubKeyRequest, arg2 ...grpc.CallOption) (*eth.FeeRecipientByPubKeyResponse, error) {
+	m.ctrl.T.Helper()
+	varargs := []interface{}{arg0, arg1}
+	for _, a := range arg2 {
+		varargs = append(varargs, a)
+	}
+	ret := m.ctrl.Call(m, "GetFeeRecipientByPubKey", varargs...)
+	ret0, _ := ret[0].(*eth.FeeRecipientByPubKeyResponse)
+	ret1, _ := ret[1].(error)
+	return ret0, ret1
+}
+
+// GetFeeRecipientByPubKey indicates an expected call of GetFeeRecipientByPubKey.
+func (mr *MockBeaconNodeValidatorClientMockRecorder) GetFeeRecipientByPubKey(arg0, arg1 interface{}, arg2 ...interface{}) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	varargs := append([]interface{}{arg0, arg1}, arg2...)
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetFeeRecipientByPubKey", reflect.TypeOf((*MockBeaconNodeValidatorClient)(nil).GetFeeRecipientByPubKey), varargs...)
+}
+
 // GetSyncCommitteeContribution mocks base method.
 func (m *MockBeaconNodeValidatorClient) GetSyncCommitteeContribution(arg0 context.Context, arg1 *eth.SyncCommitteeContributionRequest, arg2 ...grpc.CallOption) (*eth.SyncCommitteeContribution, error) {
 	m.ctrl.T.Helper()
@@ -238,26 +258,6 @@ func (mr *MockBeaconNodeValidatorClientMockRecorder) PrepareBeaconProposer(arg0,
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "PrepareBeaconProposer", reflect.TypeOf((*MockBeaconNodeValidatorClient)(nil).PrepareBeaconProposer), varargs...)
 }
 
-// GetFeeRecipientByPubKey mocks base method.
-func (m *MockBeaconNodeValidatorClient) GetFeeRecipientByPubKey(arg0 context.Context, arg1 *eth.FeeRecipientByPubKeyRequest, arg2 ...grpc.CallOption) (*eth.FeeRecipientByPubKeyResponse, error) {
-	m.ctrl.T.Helper()
-	varargs := []interface{}{arg0, arg1}
-	for _, a := range arg2 {
-		varargs = append(varargs, a)
-	}
-	ret := m.ctrl.Call(m, "GetFeeRecipientByPublicKey", varargs...)
-	ret0, _ := ret[0].(*eth.FeeRecipientByPubKeyResponse)
-	ret1, _ := ret[1].(error)
-	return ret0, ret1
-}
-
-// GetFeeRecipientByPubKey indicates an expected call of GetFeeRecipientByPubKey.
-func (mr *MockBeaconNodeValidatorClientMockRecorder) GetFeeRecipientByPubKey(arg0, arg1 interface{}, arg2 ...interface{}) *gomock.Call {
-	mr.mock.ctrl.T.Helper()
-	varargs := append([]interface{}{arg0, arg1}, arg2...)
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetFeeRecipientByPublicKey", reflect.TypeOf((*MockBeaconNodeValidatorClient)(nil).GetFeeRecipientByPubKey), varargs...)
-}
-
 // ProposeAttestation mocks base method.
 func (m *MockBeaconNodeValidatorClient) ProposeAttestation(arg0 context.Context, arg1 *eth.Attestation, arg2 ...grpc.CallOption) (*eth.AttestResponse, error) {
 	m.ctrl.T.Helper()
@@ -438,26 +438,6 @@ func (mr *MockBeaconNodeValidatorClientMockRecorder) SubmitSyncMessage(arg0, arg
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SubmitSyncMessage", reflect.TypeOf((*MockBeaconNodeValidatorClient)(nil).SubmitSyncMessage), varargs...)
 }
 
-// SubmitValidatorRegistration mocks base method.
-func (m *MockBeaconNodeValidatorClient) SubmitValidatorRegistration(arg0 context.Context, arg1 *eth.SignedValidatorRegistrationV1, arg2 ...grpc.CallOption) (*emptypb.Empty, error) {
-	m.ctrl.T.Helper()
-	varargs := []interface{}{arg0, arg1}
-	for _, a := range arg2 {
-		varargs = append(varargs, a)
-	}
-	ret := m.ctrl.Call(m, "SubmitValidatorRegistration", varargs...)
-	ret0, _ := ret[0].(*emptypb.Empty)
-	ret1, _ := ret[1].(error)
-	return ret0, ret1
-}
-
-// SubmitValidatorRegistration indicates an expected call of SubmitValidatorRegistration.
-func (mr *MockBeaconNodeValidatorClientMockRecorder) SubmitValidatorRegistration(arg0, arg1 interface{}, arg2 ...interface{}) *gomock.Call {
-	mr.mock.ctrl.T.Helper()
-	varargs := append([]interface{}{arg0, arg1}, arg2...)
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SubmitValidatorRegistration", reflect.TypeOf((*MockBeaconNodeValidatorClient)(nil).SubmitValidatorRegistration), varargs...)
-}
-
 // SubmitValidatorRegistrations mocks base method.
 func (m *MockBeaconNodeValidatorClient) SubmitValidatorRegistrations(arg0 context.Context, arg1 *eth.SignedValidatorRegistrationsV1, arg2 ...grpc.CallOption) (*emptypb.Empty, error) {
 	m.ctrl.T.Helper()
diff --git a/testing/mock/beacon_validator_server_mock.go b/testing/mock/beacon_validator_server_mock.go
index 3ca403336..6a9f3b3fe 100644
--- a/testing/mock/beacon_validator_server_mock.go
+++ b/testing/mock/beacon_validator_server_mock.go
@@ -1,5 +1,5 @@
 // Code generated by MockGen. DO NOT EDIT.
-// Source: github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1 (interfaces: BeaconNodeValidatorServer,BeaconNodeValidator_WaitForActivationServer,BeaconNodeValidator_WaitForChainStartServer,BeaconNodeValidator_StreamDutiesServer)
+// Source: github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1 (interfaces: BeaconNodeValidatorServer,BeaconNodeValidator_WaitForActivationServer,BeaconNodeValidator_WaitForChainStartServer,BeaconNodeValidator_StreamDutiesServer)
 
 // Package mock is a generated GoMock package.
 package mock
@@ -112,6 +112,21 @@ func (mr *MockBeaconNodeValidatorServerMockRecorder) GetDuties(arg0, arg1 interf
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetDuties", reflect.TypeOf((*MockBeaconNodeValidatorServer)(nil).GetDuties), arg0, arg1)
 }
 
+// GetFeeRecipientByPubKey mocks base method.
+func (m *MockBeaconNodeValidatorServer) GetFeeRecipientByPubKey(arg0 context.Context, arg1 *eth.FeeRecipientByPubKeyRequest) (*eth.FeeRecipientByPubKeyResponse, error) {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "GetFeeRecipientByPubKey", arg0, arg1)
+	ret0, _ := ret[0].(*eth.FeeRecipientByPubKeyResponse)
+	ret1, _ := ret[1].(error)
+	return ret0, ret1
+}
+
+// GetFeeRecipientByPubKey indicates an expected call of GetFeeRecipientByPubKey.
+func (mr *MockBeaconNodeValidatorServerMockRecorder) GetFeeRecipientByPubKey(arg0, arg1 interface{}) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetFeeRecipientByPubKey", reflect.TypeOf((*MockBeaconNodeValidatorServer)(nil).GetFeeRecipientByPubKey), arg0, arg1)
+}
+
 // GetSyncCommitteeContribution mocks base method.
 func (m *MockBeaconNodeValidatorServer) GetSyncCommitteeContribution(arg0 context.Context, arg1 *eth.SyncCommitteeContributionRequest) (*eth.SyncCommitteeContribution, error) {
 	m.ctrl.T.Helper()
@@ -320,21 +335,6 @@ func (mr *MockBeaconNodeValidatorServerMockRecorder) SubmitSyncMessage(arg0, arg
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SubmitSyncMessage", reflect.TypeOf((*MockBeaconNodeValidatorServer)(nil).SubmitSyncMessage), arg0, arg1)
 }
 
-// SubmitValidatorRegistration mocks base method.
-func (m *MockBeaconNodeValidatorServer) SubmitValidatorRegistration(arg0 context.Context, arg1 *eth.SignedValidatorRegistrationV1) (*emptypb.Empty, error) {
-	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "SubmitValidatorRegistration", arg0, arg1)
-	ret0, _ := ret[0].(*emptypb.Empty)
-	ret1, _ := ret[1].(error)
-	return ret0, ret1
-}
-
-// SubmitValidatorRegistration indicates an expected call of SubmitValidatorRegistration.
-func (mr *MockBeaconNodeValidatorServerMockRecorder) SubmitValidatorRegistration(arg0, arg1 interface{}) *gomock.Call {
-	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SubmitValidatorRegistration", reflect.TypeOf((*MockBeaconNodeValidatorServer)(nil).SubmitValidatorRegistration), arg0, arg1)
-}
-
 // SubmitValidatorRegistrations mocks base method.
 func (m *MockBeaconNodeValidatorServer) SubmitValidatorRegistrations(arg0 context.Context, arg1 *eth.SignedValidatorRegistrationsV1) (*emptypb.Empty, error) {
 	m.ctrl.T.Helper()
diff --git a/testing/mock/event_service_mock.go b/testing/mock/event_service_mock.go
index d269929c4..2a449503d 100644
--- a/testing/mock/event_service_mock.go
+++ b/testing/mock/event_service_mock.go
@@ -1,5 +1,5 @@
 // Code generated by MockGen. DO NOT EDIT.
-// Source: github.com/prysmaticlabs/prysm/proto/eth/service (interfaces: EventsClient,Events_StreamEventsClient,Events_StreamEventsServer)
+// Source: github.com/prysmaticlabs/prysm/v3/proto/eth/service (interfaces: EventsClient,Events_StreamEventsClient,Events_StreamEventsServer)
 
 // Package mock is a generated GoMock package.
 package mock
@@ -16,30 +16,30 @@ import (
 	metadata "google.golang.org/grpc/metadata"
 )
 
-// MockEventsClient is a mock of EventsClient interface
+// MockEventsClient is a mock of EventsClient interface.
 type MockEventsClient struct {
 	ctrl     *gomock.Controller
 	recorder *MockEventsClientMockRecorder
 }
 
-// MockEventsClientMockRecorder is the mock recorder for MockEventsClient
+// MockEventsClientMockRecorder is the mock recorder for MockEventsClient.
 type MockEventsClientMockRecorder struct {
 	mock *MockEventsClient
 }
 
-// NewMockEventsClient creates a new mock instance
+// NewMockEventsClient creates a new mock instance.
 func NewMockEventsClient(ctrl *gomock.Controller) *MockEventsClient {
 	mock := &MockEventsClient{ctrl: ctrl}
 	mock.recorder = &MockEventsClientMockRecorder{mock}
 	return mock
 }
 
-// EXPECT returns an object that allows the caller to indicate expected use
+// EXPECT returns an object that allows the caller to indicate expected use.
 func (m *MockEventsClient) EXPECT() *MockEventsClientMockRecorder {
 	return m.recorder
 }
 
-// StreamEvents mocks base method
+// StreamEvents mocks base method.
 func (m *MockEventsClient) StreamEvents(arg0 context.Context, arg1 *v1.StreamEventsRequest, arg2 ...grpc.CallOption) (service.Events_StreamEventsClient, error) {
 	m.ctrl.T.Helper()
 	varargs := []interface{}{arg0, arg1}
@@ -52,37 +52,37 @@ func (m *MockEventsClient) StreamEvents(arg0 context.Context, arg1 *v1.StreamEve
 	return ret0, ret1
 }
 
-// StreamEvents indicates an expected call of StreamEvents
+// StreamEvents indicates an expected call of StreamEvents.
 func (mr *MockEventsClientMockRecorder) StreamEvents(arg0, arg1 interface{}, arg2 ...interface{}) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	varargs := append([]interface{}{arg0, arg1}, arg2...)
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "StreamEvents", reflect.TypeOf((*MockEventsClient)(nil).StreamEvents), varargs...)
 }
 
-// MockEvents_StreamEventsClient is a mock of Events_StreamEventsClient interface
+// MockEvents_StreamEventsClient is a mock of Events_StreamEventsClient interface.
 type MockEvents_StreamEventsClient struct {
 	ctrl     *gomock.Controller
 	recorder *MockEvents_StreamEventsClientMockRecorder
 }
 
-// MockEvents_StreamEventsClientMockRecorder is the mock recorder for MockEvents_StreamEventsClient
+// MockEvents_StreamEventsClientMockRecorder is the mock recorder for MockEvents_StreamEventsClient.
 type MockEvents_StreamEventsClientMockRecorder struct {
 	mock *MockEvents_StreamEventsClient
 }
 
-// NewMockEvents_StreamEventsClient creates a new mock instance
+// NewMockEvents_StreamEventsClient creates a new mock instance.
 func NewMockEvents_StreamEventsClient(ctrl *gomock.Controller) *MockEvents_StreamEventsClient {
 	mock := &MockEvents_StreamEventsClient{ctrl: ctrl}
 	mock.recorder = &MockEvents_StreamEventsClientMockRecorder{mock}
 	return mock
 }
 
-// EXPECT returns an object that allows the caller to indicate expected use
+// EXPECT returns an object that allows the caller to indicate expected use.
 func (m *MockEvents_StreamEventsClient) EXPECT() *MockEvents_StreamEventsClientMockRecorder {
 	return m.recorder
 }
 
-// CloseSend mocks base method
+// CloseSend mocks base method.
 func (m *MockEvents_StreamEventsClient) CloseSend() error {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "CloseSend")
@@ -90,13 +90,13 @@ func (m *MockEvents_StreamEventsClient) CloseSend() error {
 	return ret0
 }
 
-// CloseSend indicates an expected call of CloseSend
+// CloseSend indicates an expected call of CloseSend.
 func (mr *MockEvents_StreamEventsClientMockRecorder) CloseSend() *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CloseSend", reflect.TypeOf((*MockEvents_StreamEventsClient)(nil).CloseSend))
 }
 
-// Context mocks base method
+// Context mocks base method.
 func (m *MockEvents_StreamEventsClient) Context() context.Context {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "Context")
@@ -104,13 +104,13 @@ func (m *MockEvents_StreamEventsClient) Context() context.Context {
 	return ret0
 }
 
-// Context indicates an expected call of Context
+// Context indicates an expected call of Context.
 func (mr *MockEvents_StreamEventsClientMockRecorder) Context() *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Context", reflect.TypeOf((*MockEvents_StreamEventsClient)(nil).Context))
 }
 
-// Header mocks base method
+// Header mocks base method.
 func (m *MockEvents_StreamEventsClient) Header() (metadata.MD, error) {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "Header")
@@ -119,13 +119,13 @@ func (m *MockEvents_StreamEventsClient) Header() (metadata.MD, error) {
 	return ret0, ret1
 }
 
-// Header indicates an expected call of Header
+// Header indicates an expected call of Header.
 func (mr *MockEvents_StreamEventsClientMockRecorder) Header() *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Header", reflect.TypeOf((*MockEvents_StreamEventsClient)(nil).Header))
 }
 
-// Recv mocks base method
+// Recv mocks base method.
 func (m *MockEvents_StreamEventsClient) Recv() (*gateway.EventSource, error) {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "Recv")
@@ -134,13 +134,13 @@ func (m *MockEvents_StreamEventsClient) Recv() (*gateway.EventSource, error) {
 	return ret0, ret1
 }
 
-// Recv indicates an expected call of Recv
+// Recv indicates an expected call of Recv.
 func (mr *MockEvents_StreamEventsClientMockRecorder) Recv() *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Recv", reflect.TypeOf((*MockEvents_StreamEventsClient)(nil).Recv))
 }
 
-// RecvMsg mocks base method
+// RecvMsg mocks base method.
 func (m *MockEvents_StreamEventsClient) RecvMsg(arg0 interface{}) error {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "RecvMsg", arg0)
@@ -148,13 +148,13 @@ func (m *MockEvents_StreamEventsClient) RecvMsg(arg0 interface{}) error {
 	return ret0
 }
 
-// RecvMsg indicates an expected call of RecvMsg
+// RecvMsg indicates an expected call of RecvMsg.
 func (mr *MockEvents_StreamEventsClientMockRecorder) RecvMsg(arg0 interface{}) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RecvMsg", reflect.TypeOf((*MockEvents_StreamEventsClient)(nil).RecvMsg), arg0)
 }
 
-// SendMsg mocks base method
+// SendMsg mocks base method.
 func (m *MockEvents_StreamEventsClient) SendMsg(arg0 interface{}) error {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "SendMsg", arg0)
@@ -162,13 +162,13 @@ func (m *MockEvents_StreamEventsClient) SendMsg(arg0 interface{}) error {
 	return ret0
 }
 
-// SendMsg indicates an expected call of SendMsg
+// SendMsg indicates an expected call of SendMsg.
 func (mr *MockEvents_StreamEventsClientMockRecorder) SendMsg(arg0 interface{}) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SendMsg", reflect.TypeOf((*MockEvents_StreamEventsClient)(nil).SendMsg), arg0)
 }
 
-// Trailer mocks base method
+// Trailer mocks base method.
 func (m *MockEvents_StreamEventsClient) Trailer() metadata.MD {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "Trailer")
@@ -176,36 +176,36 @@ func (m *MockEvents_StreamEventsClient) Trailer() metadata.MD {
 	return ret0
 }
 
-// Trailer indicates an expected call of Trailer
+// Trailer indicates an expected call of Trailer.
 func (mr *MockEvents_StreamEventsClientMockRecorder) Trailer() *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Trailer", reflect.TypeOf((*MockEvents_StreamEventsClient)(nil).Trailer))
 }
 
-// MockEvents_StreamEventsServer is a mock of Events_StreamEventsServer interface
+// MockEvents_StreamEventsServer is a mock of Events_StreamEventsServer interface.
 type MockEvents_StreamEventsServer struct {
 	ctrl     *gomock.Controller
 	recorder *MockEvents_StreamEventsServerMockRecorder
 }
 
-// MockEvents_StreamEventsServerMockRecorder is the mock recorder for MockEvents_StreamEventsServer
+// MockEvents_StreamEventsServerMockRecorder is the mock recorder for MockEvents_StreamEventsServer.
 type MockEvents_StreamEventsServerMockRecorder struct {
 	mock *MockEvents_StreamEventsServer
 }
 
-// NewMockEvents_StreamEventsServer creates a new mock instance
+// NewMockEvents_StreamEventsServer creates a new mock instance.
 func NewMockEvents_StreamEventsServer(ctrl *gomock.Controller) *MockEvents_StreamEventsServer {
 	mock := &MockEvents_StreamEventsServer{ctrl: ctrl}
 	mock.recorder = &MockEvents_StreamEventsServerMockRecorder{mock}
 	return mock
 }
 
-// EXPECT returns an object that allows the caller to indicate expected use
+// EXPECT returns an object that allows the caller to indicate expected use.
 func (m *MockEvents_StreamEventsServer) EXPECT() *MockEvents_StreamEventsServerMockRecorder {
 	return m.recorder
 }
 
-// Context mocks base method
+// Context mocks base method.
 func (m *MockEvents_StreamEventsServer) Context() context.Context {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "Context")
@@ -213,13 +213,13 @@ func (m *MockEvents_StreamEventsServer) Context() context.Context {
 	return ret0
 }
 
-// Context indicates an expected call of Context
+// Context indicates an expected call of Context.
 func (mr *MockEvents_StreamEventsServerMockRecorder) Context() *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Context", reflect.TypeOf((*MockEvents_StreamEventsServer)(nil).Context))
 }
 
-// RecvMsg mocks base method
+// RecvMsg mocks base method.
 func (m *MockEvents_StreamEventsServer) RecvMsg(arg0 interface{}) error {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "RecvMsg", arg0)
@@ -227,13 +227,13 @@ func (m *MockEvents_StreamEventsServer) RecvMsg(arg0 interface{}) error {
 	return ret0
 }
 
-// RecvMsg indicates an expected call of RecvMsg
+// RecvMsg indicates an expected call of RecvMsg.
 func (mr *MockEvents_StreamEventsServerMockRecorder) RecvMsg(arg0 interface{}) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RecvMsg", reflect.TypeOf((*MockEvents_StreamEventsServer)(nil).RecvMsg), arg0)
 }
 
-// Send mocks base method
+// Send mocks base method.
 func (m *MockEvents_StreamEventsServer) Send(arg0 *gateway.EventSource) error {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "Send", arg0)
@@ -241,13 +241,13 @@ func (m *MockEvents_StreamEventsServer) Send(arg0 *gateway.EventSource) error {
 	return ret0
 }
 
-// Send indicates an expected call of Send
+// Send indicates an expected call of Send.
 func (mr *MockEvents_StreamEventsServerMockRecorder) Send(arg0 interface{}) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Send", reflect.TypeOf((*MockEvents_StreamEventsServer)(nil).Send), arg0)
 }
 
-// SendHeader mocks base method
+// SendHeader mocks base method.
 func (m *MockEvents_StreamEventsServer) SendHeader(arg0 metadata.MD) error {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "SendHeader", arg0)
@@ -255,13 +255,13 @@ func (m *MockEvents_StreamEventsServer) SendHeader(arg0 metadata.MD) error {
 	return ret0
 }
 
-// SendHeader indicates an expected call of SendHeader
+// SendHeader indicates an expected call of SendHeader.
 func (mr *MockEvents_StreamEventsServerMockRecorder) SendHeader(arg0 interface{}) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SendHeader", reflect.TypeOf((*MockEvents_StreamEventsServer)(nil).SendHeader), arg0)
 }
 
-// SendMsg mocks base method
+// SendMsg mocks base method.
 func (m *MockEvents_StreamEventsServer) SendMsg(arg0 interface{}) error {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "SendMsg", arg0)
@@ -269,13 +269,13 @@ func (m *MockEvents_StreamEventsServer) SendMsg(arg0 interface{}) error {
 	return ret0
 }
 
-// SendMsg indicates an expected call of SendMsg
+// SendMsg indicates an expected call of SendMsg.
 func (mr *MockEvents_StreamEventsServerMockRecorder) SendMsg(arg0 interface{}) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SendMsg", reflect.TypeOf((*MockEvents_StreamEventsServer)(nil).SendMsg), arg0)
 }
 
-// SetHeader mocks base method
+// SetHeader mocks base method.
 func (m *MockEvents_StreamEventsServer) SetHeader(arg0 metadata.MD) error {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "SetHeader", arg0)
@@ -283,19 +283,19 @@ func (m *MockEvents_StreamEventsServer) SetHeader(arg0 metadata.MD) error {
 	return ret0
 }
 
-// SetHeader indicates an expected call of SetHeader
+// SetHeader indicates an expected call of SetHeader.
 func (mr *MockEvents_StreamEventsServerMockRecorder) SetHeader(arg0 interface{}) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetHeader", reflect.TypeOf((*MockEvents_StreamEventsServer)(nil).SetHeader), arg0)
 }
 
-// SetTrailer mocks base method
+// SetTrailer mocks base method.
 func (m *MockEvents_StreamEventsServer) SetTrailer(arg0 metadata.MD) {
 	m.ctrl.T.Helper()
 	m.ctrl.Call(m, "SetTrailer", arg0)
 }
 
-// SetTrailer indicates an expected call of SetTrailer
+// SetTrailer indicates an expected call of SetTrailer.
 func (mr *MockEvents_StreamEventsServerMockRecorder) SetTrailer(arg0 interface{}) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetTrailer", reflect.TypeOf((*MockEvents_StreamEventsServer)(nil).SetTrailer), arg0)
diff --git a/testing/mock/keymanager_mock.go b/testing/mock/keymanager_mock.go
index 01bae68de..03f45b230 100644
--- a/testing/mock/keymanager_mock.go
+++ b/testing/mock/keymanager_mock.go
@@ -1,5 +1,5 @@
 // Code generated by MockGen. DO NOT EDIT.
-// Source: github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1 (interfaces: RemoteSignerClient)
+// Source: github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1/validator-client (interfaces: RemoteSignerClient)
 
 // Package mock is a generated GoMock package.
 package mock
@@ -9,68 +9,68 @@ import (
 	reflect "reflect"
 
 	gomock "github.com/golang/mock/gomock"
-	v2 "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1/validator-client"
+	validatorpb "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1/validator-client"
 	grpc "google.golang.org/grpc"
 	emptypb "google.golang.org/protobuf/types/known/emptypb"
 )
 
-// MockRemoteSignerClient is a mock of RemoteSignerClient interface
+// MockRemoteSignerClient is a mock of RemoteSignerClient interface.
 type MockRemoteSignerClient struct {
 	ctrl     *gomock.Controller
 	recorder *MockRemoteSignerClientMockRecorder
 }
 
-// MockRemoteSignerClientMockRecorder is the mock recorder for MockRemoteSignerClient
+// MockRemoteSignerClientMockRecorder is the mock recorder for MockRemoteSignerClient.
 type MockRemoteSignerClientMockRecorder struct {
 	mock *MockRemoteSignerClient
 }
 
-// NewMockRemoteSignerClient creates a new mock instance
+// NewMockRemoteSignerClient creates a new mock instance.
 func NewMockRemoteSignerClient(ctrl *gomock.Controller) *MockRemoteSignerClient {
 	mock := &MockRemoteSignerClient{ctrl: ctrl}
 	mock.recorder = &MockRemoteSignerClientMockRecorder{mock}
 	return mock
 }
 
-// EXPECT returns an object that allows the caller to indicate expected use
+// EXPECT returns an object that allows the caller to indicate expected use.
 func (m *MockRemoteSignerClient) EXPECT() *MockRemoteSignerClientMockRecorder {
 	return m.recorder
 }
 
-// ListValidatingPublicKeys mocks base method
-func (m *MockRemoteSignerClient) ListValidatingPublicKeys(arg0 context.Context, arg1 *emptypb.Empty, arg2 ...grpc.CallOption) (*v2.ListPublicKeysResponse, error) {
+// ListValidatingPublicKeys mocks base method.
+func (m *MockRemoteSignerClient) ListValidatingPublicKeys(arg0 context.Context, arg1 *emptypb.Empty, arg2 ...grpc.CallOption) (*validatorpb.ListPublicKeysResponse, error) {
 	m.ctrl.T.Helper()
 	varargs := []interface{}{arg0, arg1}
 	for _, a := range arg2 {
 		varargs = append(varargs, a)
 	}
 	ret := m.ctrl.Call(m, "ListValidatingPublicKeys", varargs...)
-	ret0, _ := ret[0].(*v2.ListPublicKeysResponse)
+	ret0, _ := ret[0].(*validatorpb.ListPublicKeysResponse)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
 
-// ListValidatingPublicKeys indicates an expected call of ListValidatingPublicKeys
+// ListValidatingPublicKeys indicates an expected call of ListValidatingPublicKeys.
 func (mr *MockRemoteSignerClientMockRecorder) ListValidatingPublicKeys(arg0, arg1 interface{}, arg2 ...interface{}) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	varargs := append([]interface{}{arg0, arg1}, arg2...)
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ListValidatingPublicKeys", reflect.TypeOf((*MockRemoteSignerClient)(nil).ListValidatingPublicKeys), varargs...)
 }
 
-// Sign mocks base method
-func (m *MockRemoteSignerClient) Sign(arg0 context.Context, arg1 *v2.SignRequest, arg2 ...grpc.CallOption) (*v2.SignResponse, error) {
+// Sign mocks base method.
+func (m *MockRemoteSignerClient) Sign(arg0 context.Context, arg1 *validatorpb.SignRequest, arg2 ...grpc.CallOption) (*validatorpb.SignResponse, error) {
 	m.ctrl.T.Helper()
 	varargs := []interface{}{arg0, arg1}
 	for _, a := range arg2 {
 		varargs = append(varargs, a)
 	}
 	ret := m.ctrl.Call(m, "Sign", varargs...)
-	ret0, _ := ret[0].(*v2.SignResponse)
+	ret0, _ := ret[0].(*validatorpb.SignResponse)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
 
-// Sign indicates an expected call of Sign
+// Sign indicates an expected call of Sign.
 func (mr *MockRemoteSignerClientMockRecorder) Sign(arg0, arg1 interface{}, arg2 ...interface{}) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	varargs := append([]interface{}{arg0, arg1}, arg2...)
diff --git a/testing/mock/node_service_mock.go b/testing/mock/node_service_mock.go
index 4b28d9029..2e0dcf194 100644
--- a/testing/mock/node_service_mock.go
+++ b/testing/mock/node_service_mock.go
@@ -1,5 +1,5 @@
 // Code generated by MockGen. DO NOT EDIT.
-// Source: github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1 (interfaces: NodeClient)
+// Source: github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1 (interfaces: NodeClient)
 
 // Package mock is a generated GoMock package.
 package mock
diff --git a/testing/mock/slasher_client_mock.go b/testing/mock/slasher_client_mock.go
index 74480baba..a7e693c1f 100644
--- a/testing/mock/slasher_client_mock.go
+++ b/testing/mock/slasher_client_mock.go
@@ -1,5 +1,5 @@
 // Code generated by MockGen. DO NOT EDIT.
-// Source: github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1 (interfaces: SlasherClient)
+// Source: github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1 (interfaces: SlasherClient)
 
 // Package mock is a generated GoMock package.
 package mock