diff --git a/Makefile b/Makefile
index e8399d3eb5..f684c86135 100644
--- a/Makefile
+++ b/Makefile
@@ -53,7 +53,7 @@ $(eval $(call makemock, pkg/tokens,                Plugin,             tokenmock
 $(eval $(call makemock, pkg/tokens,                Callbacks,          tokenmocks))
 $(eval $(call makemock, internal/txcommon,         Helper,             txcommonmocks))
 $(eval $(call makemock, internal/identity,         Manager,            identitymanagermocks))
-$(eval $(call makemock, internal/sysmessaging,     MessageSender,      sysmessagingmocks))
+$(eval $(call makemock, internal/syncasync,        Sender,             syncasyncmocks))
 $(eval $(call makemock, internal/syncasync,        Bridge,             syncasyncmocks))
 $(eval $(call makemock, internal/data,             Manager,            datamocks))
 $(eval $(call makemock, internal/batch,            Manager,            batchmocks))
diff --git a/internal/assets/manager.go b/internal/assets/manager.go
index 2d92284393..b4cbfc371e 100644
--- a/internal/assets/manager.go
+++ b/internal/assets/manager.go
@@ -30,7 +30,6 @@ import (
 	"github.com/hyperledger/firefly/internal/operations"
 	"github.com/hyperledger/firefly/internal/privatemessaging"
 	"github.com/hyperledger/firefly/internal/syncasync"
-	"github.com/hyperledger/firefly/internal/sysmessaging"
 	"github.com/hyperledger/firefly/internal/txcommon"
 	"github.com/hyperledger/firefly/pkg/core"
 	"github.com/hyperledger/firefly/pkg/database"
@@ -53,14 +52,14 @@ type Manager interface {
 	GetTokenTransfers(ctx context.Context, filter database.AndFilter) ([]*core.TokenTransfer, *database.FilterResult, error)
 	GetTokenTransferByID(ctx context.Context, id string) (*core.TokenTransfer, error)
 
-	NewTransfer(transfer *core.TokenTransferInput) sysmessaging.MessageSender
+	NewTransfer(transfer *core.TokenTransferInput) syncasync.Sender
 	MintTokens(ctx context.Context, transfer *core.TokenTransferInput, waitConfirm bool) (*core.TokenTransfer, error)
 	BurnTokens(ctx context.Context, transfer *core.TokenTransferInput, waitConfirm bool) (*core.TokenTransfer, error)
 	TransferTokens(ctx context.Context, transfer *core.TokenTransferInput, waitConfirm bool) (*core.TokenTransfer, error)
 
 	GetTokenConnectors(ctx context.Context) []*core.TokenConnector
 
-	NewApproval(approve *core.TokenApprovalInput) sysmessaging.MessageSender
+	NewApproval(approve *core.TokenApprovalInput) syncasync.Sender
 	TokenApproval(ctx context.Context, approval *core.TokenApprovalInput, waitConfirm bool) (*core.TokenApproval, error)
 	GetTokenApprovals(ctx context.Context, filter database.AndFilter) ([]*core.TokenApproval, *database.FilterResult, error)
 
diff --git a/internal/assets/token_approval.go b/internal/assets/token_approval.go
index 5d41a80f90..6b5502282f 100644
--- a/internal/assets/token_approval.go
+++ b/internal/assets/token_approval.go
@@ -22,7 +22,7 @@ import (
 	"github.com/hyperledger/firefly-common/pkg/fftypes"
 	"github.com/hyperledger/firefly-common/pkg/i18n"
 	"github.com/hyperledger/firefly/internal/coremsgs"
-	"github.com/hyperledger/firefly/internal/sysmessaging"
+	"github.com/hyperledger/firefly/internal/syncasync"
 	"github.com/hyperledger/firefly/internal/txcommon"
 	"github.com/hyperledger/firefly/pkg/core"
 	"github.com/hyperledger/firefly/pkg/database"
@@ -53,7 +53,7 @@ func (s *approveSender) setDefaults() {
 	s.approval.LocalID = fftypes.NewUUID()
 }
 
-func (am *assetManager) NewApproval(approval *core.TokenApprovalInput) sysmessaging.MessageSender {
+func (am *assetManager) NewApproval(approval *core.TokenApprovalInput) syncasync.Sender {
 	sender := &approveSender{
 		mgr:      am,
 		approval: approval,
diff --git a/internal/assets/token_approval_test.go b/internal/assets/token_approval_test.go
index 763b436ba6..52b2744898 100644
--- a/internal/assets/token_approval_test.go
+++ b/internal/assets/token_approval_test.go
@@ -449,7 +449,7 @@ func TestTokenApprovalConfirm(t *testing.T) {
 
 	msa.On("WaitForTokenApproval", context.Background(), mock.Anything, mock.Anything).
 		Run(func(args mock.Arguments) {
-			send := args[2].(syncasync.RequestSender)
+			send := args[2].(syncasync.SendFunction)
 			send(context.Background())
 		}).
 		Return(&core.TokenApproval{}, nil)
diff --git a/internal/assets/token_pool_test.go b/internal/assets/token_pool_test.go
index d8e0a567e6..91ef84979d 100644
--- a/internal/assets/token_pool_test.go
+++ b/internal/assets/token_pool_test.go
@@ -368,7 +368,7 @@ func TestCreateTokenPoolConfirm(t *testing.T) {
 	mdi.On("InsertOperation", context.Background(), mock.Anything).Return(nil)
 	msa.On("WaitForTokenPool", context.Background(), mock.Anything, mock.Anything).
 		Run(func(args mock.Arguments) {
-			send := args[2].(syncasync.RequestSender)
+			send := args[2].(syncasync.SendFunction)
 			send(context.Background())
 		}).
 		Return(nil, nil)
diff --git a/internal/assets/token_transfer.go b/internal/assets/token_transfer.go
index a0b17d065f..211f59adbb 100644
--- a/internal/assets/token_transfer.go
+++ b/internal/assets/token_transfer.go
@@ -22,7 +22,7 @@ import (
 	"github.com/hyperledger/firefly-common/pkg/fftypes"
 	"github.com/hyperledger/firefly-common/pkg/i18n"
 	"github.com/hyperledger/firefly/internal/coremsgs"
-	"github.com/hyperledger/firefly/internal/sysmessaging"
+	"github.com/hyperledger/firefly/internal/syncasync"
 	"github.com/hyperledger/firefly/internal/txcommon"
 	"github.com/hyperledger/firefly/pkg/core"
 	"github.com/hyperledger/firefly/pkg/database"
@@ -40,7 +40,7 @@ func (am *assetManager) GetTokenTransferByID(ctx context.Context, id string) (*c
 	return am.database.GetTokenTransferByID(ctx, am.namespace, transferID)
 }
 
-func (am *assetManager) NewTransfer(transfer *core.TokenTransferInput) sysmessaging.MessageSender {
+func (am *assetManager) NewTransfer(transfer *core.TokenTransferInput) syncasync.Sender {
 	sender := &transferSender{
 		mgr:      am,
 		transfer: transfer,
@@ -53,7 +53,7 @@ type transferSender struct {
 	mgr       *assetManager
 	transfer  *core.TokenTransferInput
 	resolved  bool
-	msgSender sysmessaging.MessageSender
+	msgSender syncasync.Sender
 }
 
 // sendMethod is the specific operation requested of the transferSender.
@@ -260,7 +260,7 @@ func (s *transferSender) sendInternal(ctx context.Context, method sendMethod) (e
 	return err
 }
 
-func (s *transferSender) buildTransferMessage(ctx context.Context, in *core.MessageInOut) (sysmessaging.MessageSender, error) {
+func (s *transferSender) buildTransferMessage(ctx context.Context, in *core.MessageInOut) (syncasync.Sender, error) {
 	allowedTypes := []fftypes.FFEnum{
 		core.MessageTypeTransferBroadcast,
 		core.MessageTypeTransferPrivate,
diff --git a/internal/assets/token_transfer_test.go b/internal/assets/token_transfer_test.go
index 5f9ae6aa41..43d306484d 100644
--- a/internal/assets/token_transfer_test.go
+++ b/internal/assets/token_transfer_test.go
@@ -28,7 +28,6 @@ import (
 	"github.com/hyperledger/firefly/mocks/operationmocks"
 	"github.com/hyperledger/firefly/mocks/privatemessagingmocks"
 	"github.com/hyperledger/firefly/mocks/syncasyncmocks"
-	"github.com/hyperledger/firefly/mocks/sysmessagingmocks"
 	"github.com/hyperledger/firefly/mocks/txcommonmocks"
 	"github.com/hyperledger/firefly/pkg/core"
 	"github.com/hyperledger/firefly/pkg/database"
@@ -412,7 +411,7 @@ func TestMintTokensConfirm(t *testing.T) {
 	mdi.On("InsertOperation", context.Background(), mock.Anything).Return(nil)
 	msa.On("WaitForTokenTransfer", context.Background(), mock.Anything, mock.Anything).
 		Run(func(args mock.Arguments) {
-			send := args[2].(syncasync.RequestSender)
+			send := args[2].(syncasync.SendFunction)
 			send(context.Background())
 		}).
 		Return(&core.TokenTransfer{}, nil)
@@ -519,7 +518,7 @@ func TestBurnTokensConfirm(t *testing.T) {
 	mdi.On("InsertOperation", context.Background(), mock.Anything).Return(nil)
 	msa.On("WaitForTokenTransfer", context.Background(), mock.Anything, mock.Anything).
 		Run(func(args mock.Arguments) {
-			send := args[2].(syncasync.RequestSender)
+			send := args[2].(syncasync.SendFunction)
 			send(context.Background())
 		}).
 		Return(&core.TokenTransfer{}, nil)
@@ -724,7 +723,7 @@ func TestTransferTokensWithBroadcastMessage(t *testing.T) {
 	mdi := am.database.(*databasemocks.Plugin)
 	mim := am.identity.(*identitymanagermocks.Manager)
 	mbm := am.broadcast.(*broadcastmocks.Manager)
-	mms := &sysmessagingmocks.MessageSender{}
+	mms := &syncasyncmocks.Sender{}
 	mth := am.txHelper.(*txcommonmocks.Helper)
 	mom := am.operations.(*operationmocks.Manager)
 	mim.On("NormalizeSigningKey", context.Background(), "", identity.KeyNormalizationBlockchainPlugin).Return("0x12345", nil)
@@ -820,7 +819,7 @@ func TestTransferTokensWithBroadcastMessageSendFail(t *testing.T) {
 	mdi := am.database.(*databasemocks.Plugin)
 	mim := am.identity.(*identitymanagermocks.Manager)
 	mbm := am.broadcast.(*broadcastmocks.Manager)
-	mms := &sysmessagingmocks.MessageSender{}
+	mms := &syncasyncmocks.Sender{}
 	mth := am.txHelper.(*txcommonmocks.Helper)
 	mom := am.operations.(*operationmocks.Manager)
 	mim.On("NormalizeSigningKey", context.Background(), "", identity.KeyNormalizationBlockchainPlugin).Return("0x12345", nil)
@@ -865,7 +864,7 @@ func TestTransferTokensWithBroadcastPrepareFail(t *testing.T) {
 	}
 
 	mbm := am.broadcast.(*broadcastmocks.Manager)
-	mms := &sysmessagingmocks.MessageSender{}
+	mms := &syncasyncmocks.Sender{}
 	mbm.On("NewBroadcast", transfer.Message).Return(mms)
 	mms.On("Prepare", context.Background()).Return(fmt.Errorf("pop"))
 
@@ -912,7 +911,7 @@ func TestTransferTokensWithPrivateMessage(t *testing.T) {
 	mdi := am.database.(*databasemocks.Plugin)
 	mim := am.identity.(*identitymanagermocks.Manager)
 	mpm := am.messaging.(*privatemessagingmocks.Manager)
-	mms := &sysmessagingmocks.MessageSender{}
+	mms := &syncasyncmocks.Sender{}
 	mth := am.txHelper.(*txcommonmocks.Helper)
 	mom := am.operations.(*operationmocks.Manager)
 	mim.On("NormalizeSigningKey", context.Background(), "", identity.KeyNormalizationBlockchainPlugin).Return("0x12345", nil)
@@ -1031,7 +1030,7 @@ func TestTransferTokensConfirm(t *testing.T) {
 	mdi.On("InsertOperation", context.Background(), mock.Anything).Return(nil)
 	msa.On("WaitForTokenTransfer", context.Background(), mock.Anything, mock.Anything).
 		Run(func(args mock.Arguments) {
-			send := args[2].(syncasync.RequestSender)
+			send := args[2].(syncasync.SendFunction)
 			send(context.Background())
 		}).
 		Return(&core.TokenTransfer{}, nil)
@@ -1085,7 +1084,7 @@ func TestTransferTokensWithBroadcastConfirm(t *testing.T) {
 	mdi := am.database.(*databasemocks.Plugin)
 	mim := am.identity.(*identitymanagermocks.Manager)
 	mbm := am.broadcast.(*broadcastmocks.Manager)
-	mms := &sysmessagingmocks.MessageSender{}
+	mms := &syncasyncmocks.Sender{}
 	msa := am.syncasync.(*syncasyncmocks.Bridge)
 	mth := am.txHelper.(*txcommonmocks.Helper)
 	mom := am.operations.(*operationmocks.Manager)
@@ -1098,13 +1097,13 @@ func TestTransferTokensWithBroadcastConfirm(t *testing.T) {
 	mms.On("Send", context.Background()).Return(nil)
 	msa.On("WaitForMessage", context.Background(), mock.Anything, mock.Anything).
 		Run(func(args mock.Arguments) {
-			send := args[2].(syncasync.RequestSender)
+			send := args[2].(syncasync.SendFunction)
 			send(context.Background())
 		}).
 		Return(&core.Message{}, nil)
 	msa.On("WaitForTokenTransfer", context.Background(), mock.Anything, mock.Anything).
 		Run(func(args mock.Arguments) {
-			send := args[2].(syncasync.RequestSender)
+			send := args[2].(syncasync.SendFunction)
 			send(context.Background())
 		}).
 		Return(&transfer.TokenTransfer, nil)
diff --git a/internal/broadcast/manager.go b/internal/broadcast/manager.go
index 46be34e9e4..38d7696f6d 100644
--- a/internal/broadcast/manager.go
+++ b/internal/broadcast/manager.go
@@ -32,7 +32,6 @@ import (
 	"github.com/hyperledger/firefly/internal/multiparty"
 	"github.com/hyperledger/firefly/internal/operations"
 	"github.com/hyperledger/firefly/internal/syncasync"
-	"github.com/hyperledger/firefly/internal/sysmessaging"
 	"github.com/hyperledger/firefly/pkg/blockchain"
 	"github.com/hyperledger/firefly/pkg/core"
 	"github.com/hyperledger/firefly/pkg/database"
@@ -45,7 +44,7 @@ const broadcastDispatcherName = "pinned_broadcast"
 type Manager interface {
 	core.Named
 
-	NewBroadcast(in *core.MessageInOut) sysmessaging.MessageSender
+	NewBroadcast(in *core.MessageInOut) syncasync.Sender
 	BroadcastMessage(ctx context.Context, in *core.MessageInOut, waitConfirm bool) (out *core.Message, err error)
 	Start() error
 	WaitStop()
diff --git a/internal/broadcast/message.go b/internal/broadcast/message.go
index 9ab074fa44..b993b6164e 100644
--- a/internal/broadcast/message.go
+++ b/internal/broadcast/message.go
@@ -24,11 +24,11 @@ import (
 	"github.com/hyperledger/firefly-common/pkg/log"
 	"github.com/hyperledger/firefly/internal/coremsgs"
 	"github.com/hyperledger/firefly/internal/data"
-	"github.com/hyperledger/firefly/internal/sysmessaging"
+	"github.com/hyperledger/firefly/internal/syncasync"
 	"github.com/hyperledger/firefly/pkg/core"
 )
 
-func (bm *broadcastManager) NewBroadcast(in *core.MessageInOut) sysmessaging.MessageSender {
+func (bm *broadcastManager) NewBroadcast(in *core.MessageInOut) syncasync.Sender {
 	broadcast := &broadcastSender{
 		mgr: bm,
 		msg: &data.NewMessage{
diff --git a/internal/broadcast/message_test.go b/internal/broadcast/message_test.go
index 954005e98d..80d2b4533d 100644
--- a/internal/broadcast/message_test.go
+++ b/internal/broadcast/message_test.go
@@ -113,7 +113,7 @@ func TestBroadcastMessageWaitConfirmOk(t *testing.T) {
 	}
 	msa.On("WaitForMessage", ctx, mock.Anything, mock.Anything).
 		Run(func(args mock.Arguments) {
-			send := args[2].(syncasync.RequestSender)
+			send := args[2].(syncasync.SendFunction)
 			send(ctx)
 		}).
 		Return(replyMsg, nil)
diff --git a/internal/contracts/manager_test.go b/internal/contracts/manager_test.go
index 1c03888eb7..13c1e22851 100644
--- a/internal/contracts/manager_test.go
+++ b/internal/contracts/manager_test.go
@@ -1338,7 +1338,7 @@ func TestInvokeContractConfirm(t *testing.T) {
 	})).Return(nil, nil)
 	msa.On("WaitForInvokeOperation", mock.Anything, mock.Anything, mock.Anything).
 		Run(func(args mock.Arguments) {
-			send := args[2].(syncasync.RequestSender)
+			send := args[2].(syncasync.SendFunction)
 			send(context.Background())
 		}).
 		Return(&core.Operation{}, nil)
diff --git a/internal/definitions/sender_contracts_test.go b/internal/definitions/sender_contracts_test.go
index e393222cf8..f109b52f92 100644
--- a/internal/definitions/sender_contracts_test.go
+++ b/internal/definitions/sender_contracts_test.go
@@ -25,7 +25,7 @@ import (
 	"github.com/hyperledger/firefly/mocks/broadcastmocks"
 	"github.com/hyperledger/firefly/mocks/contractmocks"
 	"github.com/hyperledger/firefly/mocks/identitymanagermocks"
-	"github.com/hyperledger/firefly/mocks/sysmessagingmocks"
+	"github.com/hyperledger/firefly/mocks/syncasyncmocks"
 	"github.com/hyperledger/firefly/pkg/core"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
@@ -84,7 +84,7 @@ func TestDefineFFIOk(t *testing.T) {
 	mim.On("ResolveInputSigningIdentity", context.Background(), mock.Anything).Return(nil)
 
 	mbm := ds.broadcast.(*broadcastmocks.Manager)
-	mms := &sysmessagingmocks.MessageSender{}
+	mms := &syncasyncmocks.Sender{}
 	mbm.On("NewBroadcast", mock.Anything).Return(mms)
 	mms.On("Send", context.Background()).Return(nil)
 
@@ -160,7 +160,7 @@ func TestDefineContractAPIOk(t *testing.T) {
 	mim.On("ResolveInputSigningIdentity", context.Background(), mock.Anything).Return(nil)
 
 	mbm := ds.broadcast.(*broadcastmocks.Manager)
-	mms := &sysmessagingmocks.MessageSender{}
+	mms := &syncasyncmocks.Sender{}
 	mbm.On("NewBroadcast", mock.Anything).Return(mms)
 	mms.On("Send", context.Background()).Return(nil)
 
diff --git a/internal/definitions/sender_datatype_test.go b/internal/definitions/sender_datatype_test.go
index bca20dfa6d..d3d2a7f0db 100644
--- a/internal/definitions/sender_datatype_test.go
+++ b/internal/definitions/sender_datatype_test.go
@@ -25,7 +25,7 @@ import (
 	"github.com/hyperledger/firefly/mocks/broadcastmocks"
 	"github.com/hyperledger/firefly/mocks/datamocks"
 	"github.com/hyperledger/firefly/mocks/identitymanagermocks"
-	"github.com/hyperledger/firefly/mocks/sysmessagingmocks"
+	"github.com/hyperledger/firefly/mocks/syncasyncmocks"
 	"github.com/hyperledger/firefly/pkg/core"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
@@ -89,7 +89,7 @@ func TestBroadcastOk(t *testing.T) {
 	mdm := ds.data.(*datamocks.Manager)
 	mim := ds.identity.(*identitymanagermocks.Manager)
 	mbm := ds.broadcast.(*broadcastmocks.Manager)
-	mms := &sysmessagingmocks.MessageSender{}
+	mms := &syncasyncmocks.Sender{}
 
 	mim.On("ResolveInputSigningIdentity", mock.Anything, mock.Anything).Return(nil)
 	mdm.On("CheckDatatype", mock.Anything, mock.Anything).Return(nil)
diff --git a/internal/definitions/sender_identity_test.go b/internal/definitions/sender_identity_test.go
index a239a2c9b6..1f32ff4afe 100644
--- a/internal/definitions/sender_identity_test.go
+++ b/internal/definitions/sender_identity_test.go
@@ -23,7 +23,7 @@ import (
 	"github.com/hyperledger/firefly/internal/identity"
 	"github.com/hyperledger/firefly/mocks/broadcastmocks"
 	"github.com/hyperledger/firefly/mocks/identitymanagermocks"
-	"github.com/hyperledger/firefly/mocks/sysmessagingmocks"
+	"github.com/hyperledger/firefly/mocks/syncasyncmocks"
 	"github.com/hyperledger/firefly/pkg/core"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
@@ -35,7 +35,7 @@ func TestClaimIdentity(t *testing.T) {
 
 	mim := ds.identity.(*identitymanagermocks.Manager)
 	mbm := ds.broadcast.(*broadcastmocks.Manager)
-	mms := &sysmessagingmocks.MessageSender{}
+	mms := &syncasyncmocks.Sender{}
 
 	mim.On("NormalizeSigningKey", mock.Anything, "0x1234", identity.KeyNormalizationBlockchainPlugin).Return("", nil)
 	mbm.On("NewBroadcast", mock.Anything).Return(mms)
@@ -61,7 +61,7 @@ func TestClaimIdentityFail(t *testing.T) {
 
 	mim := ds.identity.(*identitymanagermocks.Manager)
 	mbm := ds.broadcast.(*broadcastmocks.Manager)
-	mms := &sysmessagingmocks.MessageSender{}
+	mms := &syncasyncmocks.Sender{}
 
 	mim.On("NormalizeSigningKey", mock.Anything, "0x1234", identity.KeyNormalizationBlockchainPlugin).Return("", nil)
 	mbm.On("NewBroadcast", mock.Anything).Return(mms)
@@ -107,8 +107,8 @@ func TestClaimIdentityChild(t *testing.T) {
 
 	mim := ds.identity.(*identitymanagermocks.Manager)
 	mbm := ds.broadcast.(*broadcastmocks.Manager)
-	mms1 := &sysmessagingmocks.MessageSender{}
-	mms2 := &sysmessagingmocks.MessageSender{}
+	mms1 := &syncasyncmocks.Sender{}
+	mms2 := &syncasyncmocks.Sender{}
 
 	mim.On("NormalizeSigningKey", mock.Anything, "0x1234", identity.KeyNormalizationBlockchainPlugin).Return("", nil)
 	mbm.On("NewBroadcast", mock.Anything).Return(mms1).Once()
@@ -141,8 +141,8 @@ func TestClaimIdentityChildFail(t *testing.T) {
 
 	mim := ds.identity.(*identitymanagermocks.Manager)
 	mbm := ds.broadcast.(*broadcastmocks.Manager)
-	mms1 := &sysmessagingmocks.MessageSender{}
-	mms2 := &sysmessagingmocks.MessageSender{}
+	mms1 := &syncasyncmocks.Sender{}
+	mms2 := &syncasyncmocks.Sender{}
 
 	mim.On("NormalizeSigningKey", mock.Anything, "0x1234", identity.KeyNormalizationBlockchainPlugin).Return("", nil)
 	mbm.On("NewBroadcast", mock.Anything).Return(mms1).Once()
@@ -195,7 +195,7 @@ func TestUpdateIdentity(t *testing.T) {
 
 	mim := ds.identity.(*identitymanagermocks.Manager)
 	mbm := ds.broadcast.(*broadcastmocks.Manager)
-	mms := &sysmessagingmocks.MessageSender{}
+	mms := &syncasyncmocks.Sender{}
 
 	mbm.On("NewBroadcast", mock.Anything).Return(mms)
 	mms.On("Send", mock.Anything).Return(nil)
diff --git a/internal/definitions/sender_test.go b/internal/definitions/sender_test.go
index 5ba920a12f..d0def75b6d 100644
--- a/internal/definitions/sender_test.go
+++ b/internal/definitions/sender_test.go
@@ -29,7 +29,7 @@ import (
 	"github.com/hyperledger/firefly/mocks/dataexchangemocks"
 	"github.com/hyperledger/firefly/mocks/datamocks"
 	"github.com/hyperledger/firefly/mocks/identitymanagermocks"
-	"github.com/hyperledger/firefly/mocks/sysmessagingmocks"
+	"github.com/hyperledger/firefly/mocks/syncasyncmocks"
 	"github.com/hyperledger/firefly/pkg/core"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
@@ -70,7 +70,7 @@ func TestCreateDefinitionConfirm(t *testing.T) {
 
 	mim := ds.identity.(*identitymanagermocks.Manager)
 	mbm := ds.broadcast.(*broadcastmocks.Manager)
-	mms := &sysmessagingmocks.MessageSender{}
+	mms := &syncasyncmocks.Sender{}
 
 	mim.On("ResolveInputSigningIdentity", mock.Anything, mock.Anything).Return(nil)
 	mbm.On("NewBroadcast", mock.Anything).Return(mms)
@@ -91,7 +91,7 @@ func TestCreateDatatypeDefinitionAsNodeConfirm(t *testing.T) {
 
 	mim := ds.identity.(*identitymanagermocks.Manager)
 	mbm := ds.broadcast.(*broadcastmocks.Manager)
-	mms := &sysmessagingmocks.MessageSender{}
+	mms := &syncasyncmocks.Sender{}
 
 	mim.On("ResolveInputSigningIdentity", mock.Anything, mock.Anything).Return(nil)
 	mbm.On("NewBroadcast", mock.Anything).Return(mms)
diff --git a/internal/definitions/sender_tokenpool_test.go b/internal/definitions/sender_tokenpool_test.go
index 878f2e9a81..dc40392de8 100644
--- a/internal/definitions/sender_tokenpool_test.go
+++ b/internal/definitions/sender_tokenpool_test.go
@@ -26,7 +26,7 @@ import (
 	"github.com/hyperledger/firefly/mocks/databasemocks"
 	"github.com/hyperledger/firefly/mocks/datamocks"
 	"github.com/hyperledger/firefly/mocks/identitymanagermocks"
-	"github.com/hyperledger/firefly/mocks/sysmessagingmocks"
+	"github.com/hyperledger/firefly/mocks/syncasyncmocks"
 	"github.com/hyperledger/firefly/pkg/core"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
@@ -88,7 +88,7 @@ func TestDefineTokenPoolOk(t *testing.T) {
 	mdm := ds.data.(*datamocks.Manager)
 	mim := ds.identity.(*identitymanagermocks.Manager)
 	mbm := ds.broadcast.(*broadcastmocks.Manager)
-	mms := &sysmessagingmocks.MessageSender{}
+	mms := &syncasyncmocks.Sender{}
 
 	pool := &core.TokenPoolAnnouncement{
 		Pool: &core.TokenPool{
@@ -151,7 +151,7 @@ func TestDefineTokenPoolBadName(t *testing.T) {
 
 	mim := ds.identity.(*identitymanagermocks.Manager)
 	mbm := ds.broadcast.(*broadcastmocks.Manager)
-	mms := &sysmessagingmocks.MessageSender{}
+	mms := &syncasyncmocks.Sender{}
 
 	pool := &core.TokenPoolAnnouncement{
 		Pool: &core.TokenPool{
diff --git a/internal/events/event_dispatcher_test.go b/internal/events/event_dispatcher_test.go
index bce1a9158f..22fb9b7362 100644
--- a/internal/events/event_dispatcher_test.go
+++ b/internal/events/event_dispatcher_test.go
@@ -32,7 +32,7 @@ import (
 	"github.com/hyperledger/firefly/mocks/datamocks"
 	"github.com/hyperledger/firefly/mocks/eventsmocks"
 	"github.com/hyperledger/firefly/mocks/privatemessagingmocks"
-	"github.com/hyperledger/firefly/mocks/sysmessagingmocks"
+	"github.com/hyperledger/firefly/mocks/syncasyncmocks"
 	"github.com/hyperledger/firefly/pkg/core"
 	"github.com/hyperledger/firefly/pkg/database"
 	"github.com/hyperledger/firefly/pkg/events"
@@ -1031,7 +1031,7 @@ func TestEventDispatcherWithReply(t *testing.T) {
 		Namespace: "ns1",
 	}
 
-	mms := &sysmessagingmocks.MessageSender{}
+	mms := &syncasyncmocks.Sender{}
 	mbm := ed.broadcast.(*broadcastmocks.Manager)
 	mbm.On("NewBroadcast", mock.Anything).Return(mms)
 	mms.On("Send", mock.Anything).Return(nil)
diff --git a/internal/events/reply_sender_test.go b/internal/events/reply_sender_test.go
index 46ee368eeb..ccb4ba3a4a 100644
--- a/internal/events/reply_sender_test.go
+++ b/internal/events/reply_sender_test.go
@@ -24,7 +24,7 @@ import (
 	"github.com/hyperledger/firefly-common/pkg/fftypes"
 	"github.com/hyperledger/firefly/mocks/broadcastmocks"
 	"github.com/hyperledger/firefly/mocks/privatemessagingmocks"
-	"github.com/hyperledger/firefly/mocks/sysmessagingmocks"
+	"github.com/hyperledger/firefly/mocks/syncasyncmocks"
 	"github.com/hyperledger/firefly/pkg/core"
 	"github.com/stretchr/testify/mock"
 )
@@ -35,7 +35,7 @@ func TestSendReplyBroadcastFail(t *testing.T) {
 	})
 	defer cancel()
 
-	mms := &sysmessagingmocks.MessageSender{}
+	mms := &syncasyncmocks.Sender{}
 	mbm := ed.broadcast.(*broadcastmocks.Manager)
 	mbm.On("NewBroadcast", mock.Anything).Return(mms)
 	mms.On("Send", context.Background()).Return(fmt.Errorf("pop"))
@@ -55,7 +55,7 @@ func TestSendReplyPrivateFail(t *testing.T) {
 	})
 	defer cancel()
 
-	mms := &sysmessagingmocks.MessageSender{}
+	mms := &syncasyncmocks.Sender{}
 	mpm := ed.messaging.(*privatemessagingmocks.Manager)
 	mpm.On("NewMessage", mock.Anything).Return(mms)
 	mms.On("Send", context.Background()).Return(fmt.Errorf("pop"))
@@ -87,7 +87,7 @@ func TestSendReplyPrivateOk(t *testing.T) {
 		},
 	}
 
-	mms := &sysmessagingmocks.MessageSender{}
+	mms := &syncasyncmocks.Sender{}
 	mpm := ed.messaging.(*privatemessagingmocks.Manager)
 	mpm.On("NewMessage", mock.Anything).Return(mms)
 	mms.On("Send", context.Background()).Return(nil)
diff --git a/internal/networkmap/register_identity_test.go b/internal/networkmap/register_identity_test.go
index b026bfbf9b..fe2a5b9f1f 100644
--- a/internal/networkmap/register_identity_test.go
+++ b/internal/networkmap/register_identity_test.go
@@ -86,7 +86,7 @@ func TestRegisterIdentityOrgWithParentWaitConfirmOk(t *testing.T) {
 		ctx := args[0].(context.Context)
 		id := args[1].(*fftypes.UUID)
 		assert.NotNil(t, id)
-		cb := args[2].(syncasync.RequestSender)
+		cb := args[2].(syncasync.SendFunction)
 		err := cb(ctx)
 		assert.NoError(t, err)
 	}).Return(nil, nil)
diff --git a/internal/privatemessaging/message.go b/internal/privatemessaging/message.go
index 08b5434b0d..28a2d93674 100644
--- a/internal/privatemessaging/message.go
+++ b/internal/privatemessaging/message.go
@@ -24,11 +24,11 @@ import (
 	"github.com/hyperledger/firefly-common/pkg/log"
 	"github.com/hyperledger/firefly/internal/coremsgs"
 	"github.com/hyperledger/firefly/internal/data"
-	"github.com/hyperledger/firefly/internal/sysmessaging"
+	"github.com/hyperledger/firefly/internal/syncasync"
 	"github.com/hyperledger/firefly/pkg/core"
 )
 
-func (pm *privateMessaging) NewMessage(in *core.MessageInOut) sysmessaging.MessageSender {
+func (pm *privateMessaging) NewMessage(in *core.MessageInOut) syncasync.Sender {
 	message := &messageSender{
 		mgr: pm,
 		msg: &data.NewMessage{
diff --git a/internal/privatemessaging/message_test.go b/internal/privatemessaging/message_test.go
index cafe5d2ea4..950ba9ee88 100644
--- a/internal/privatemessaging/message_test.go
+++ b/internal/privatemessaging/message_test.go
@@ -103,7 +103,7 @@ func TestSendConfirmMessageE2EOk(t *testing.T) {
 	msa := pm.syncasync.(*syncasyncmocks.Bridge)
 	msa.On("WaitForMessage", pm.ctx, mock.Anything, mock.Anything).
 		Run(func(args mock.Arguments) {
-			send := args[2].(syncasync.RequestSender)
+			send := args[2].(syncasync.SendFunction)
 			send(pm.ctx)
 		}).
 		Return(retMsg, nil).Once()
@@ -601,7 +601,7 @@ func TestRequestReplySuccess(t *testing.T) {
 	msa := pm.syncasync.(*syncasyncmocks.Bridge)
 	msa.On("WaitForReply", pm.ctx, mock.Anything, mock.Anything).
 		Run(func(args mock.Arguments) {
-			send := args[2].(syncasync.RequestSender)
+			send := args[2].(syncasync.SendFunction)
 			send(pm.ctx)
 		}).
 		Return(nil, nil)
diff --git a/internal/privatemessaging/privatemessaging.go b/internal/privatemessaging/privatemessaging.go
index 322c273041..5986ba5f25 100644
--- a/internal/privatemessaging/privatemessaging.go
+++ b/internal/privatemessaging/privatemessaging.go
@@ -34,7 +34,6 @@ import (
 	"github.com/hyperledger/firefly/internal/multiparty"
 	"github.com/hyperledger/firefly/internal/operations"
 	"github.com/hyperledger/firefly/internal/syncasync"
-	"github.com/hyperledger/firefly/internal/sysmessaging"
 	"github.com/hyperledger/firefly/pkg/blockchain"
 	"github.com/hyperledger/firefly/pkg/core"
 	"github.com/hyperledger/firefly/pkg/database"
@@ -49,7 +48,7 @@ type Manager interface {
 	core.Named
 	GroupManager
 
-	NewMessage(msg *core.MessageInOut) sysmessaging.MessageSender
+	NewMessage(msg *core.MessageInOut) syncasync.Sender
 	SendMessage(ctx context.Context, in *core.MessageInOut, waitConfirm bool) (out *core.Message, err error)
 	RequestReply(ctx context.Context, request *core.MessageInOut) (reply *core.MessageInOut, err error)
 
diff --git a/internal/syncasync/sync_async_bridge.go b/internal/syncasync/sync_async_bridge.go
index b152485dd2..5b534ea8e5 100644
--- a/internal/syncasync/sync_async_bridge.go
+++ b/internal/syncasync/sync_async_bridge.go
@@ -43,22 +43,29 @@ type Bridge interface {
 	// To use them, invoke the appropriate method, and pass a "send" callback that is expected to trigger the relevant event.
 
 	// WaitForReply waits for a reply to the message with the supplied ID
-	WaitForReply(ctx context.Context, id *fftypes.UUID, send RequestSender) (*core.MessageInOut, error)
+	WaitForReply(ctx context.Context, id *fftypes.UUID, send SendFunction) (*core.MessageInOut, error)
 	// WaitForMessage waits for a message with the supplied ID
-	WaitForMessage(ctx context.Context, id *fftypes.UUID, send RequestSender) (*core.Message, error)
+	WaitForMessage(ctx context.Context, id *fftypes.UUID, send SendFunction) (*core.Message, error)
 	// WaitForIdentity waits for an identity with the supplied ID
-	WaitForIdentity(ctx context.Context, id *fftypes.UUID, send RequestSender) (*core.Identity, error)
+	WaitForIdentity(ctx context.Context, id *fftypes.UUID, send SendFunction) (*core.Identity, error)
 	// WaitForTokenPool waits for a token pool with the supplied ID
-	WaitForTokenPool(ctx context.Context, id *fftypes.UUID, send RequestSender) (*core.TokenPool, error)
+	WaitForTokenPool(ctx context.Context, id *fftypes.UUID, send SendFunction) (*core.TokenPool, error)
 	// WaitForTokenTransfer waits for a token transfer with the supplied ID
-	WaitForTokenTransfer(ctx context.Context, id *fftypes.UUID, send RequestSender) (*core.TokenTransfer, error)
+	WaitForTokenTransfer(ctx context.Context, id *fftypes.UUID, send SendFunction) (*core.TokenTransfer, error)
 	// WaitForTokenTransfer waits for a token approval with the supplied ID
-	WaitForTokenApproval(ctx context.Context, id *fftypes.UUID, send RequestSender) (*core.TokenApproval, error)
+	WaitForTokenApproval(ctx context.Context, id *fftypes.UUID, send SendFunction) (*core.TokenApproval, error)
 	// WaitForInvokeOperation waits for an operation with the supplied ID
-	WaitForInvokeOperation(ctx context.Context, id *fftypes.UUID, send RequestSender) (*core.Operation, error)
+	WaitForInvokeOperation(ctx context.Context, id *fftypes.UUID, send SendFunction) (*core.Operation, error)
 }
 
-type RequestSender func(ctx context.Context) error
+// Sender interface may be implemented by other types that wish to provide generic sync/async capabilities
+type Sender interface {
+	Prepare(ctx context.Context) error
+	Send(ctx context.Context) error
+	SendAndWait(ctx context.Context) error
+}
+
+type SendFunction func(ctx context.Context) error
 
 type requestType int
 
@@ -565,7 +572,7 @@ func (sa *syncAsyncBridge) resolveFailedOperation(inflight *inflightRequest, typ
 	inflight.response <- inflightResponse{err: fmt.Errorf(op.Error)}
 }
 
-func (sa *syncAsyncBridge) sendAndWait(ctx context.Context, ns string, id *fftypes.UUID, reqType requestType, send RequestSender) (interface{}, error) {
+func (sa *syncAsyncBridge) sendAndWait(ctx context.Context, ns string, id *fftypes.UUID, reqType requestType, send SendFunction) (interface{}, error) {
 	inflight, err := sa.addInFlight(ns, id, reqType)
 	if err != nil {
 		return nil, err
@@ -595,7 +602,7 @@ func (sa *syncAsyncBridge) sendAndWait(ctx context.Context, ns string, id *fftyp
 	}
 }
 
-func (sa *syncAsyncBridge) WaitForReply(ctx context.Context, id *fftypes.UUID, send RequestSender) (*core.MessageInOut, error) {
+func (sa *syncAsyncBridge) WaitForReply(ctx context.Context, id *fftypes.UUID, send SendFunction) (*core.MessageInOut, error) {
 	reply, err := sa.sendAndWait(ctx, sa.namespace, id, messageReply, send)
 	if err != nil {
 		return nil, err
@@ -603,7 +610,7 @@ func (sa *syncAsyncBridge) WaitForReply(ctx context.Context, id *fftypes.UUID, s
 	return reply.(*core.MessageInOut), err
 }
 
-func (sa *syncAsyncBridge) WaitForMessage(ctx context.Context, id *fftypes.UUID, send RequestSender) (*core.Message, error) {
+func (sa *syncAsyncBridge) WaitForMessage(ctx context.Context, id *fftypes.UUID, send SendFunction) (*core.Message, error) {
 	reply, err := sa.sendAndWait(ctx, sa.namespace, id, messageConfirm, send)
 	if err != nil {
 		return nil, err
@@ -611,7 +618,7 @@ func (sa *syncAsyncBridge) WaitForMessage(ctx context.Context, id *fftypes.UUID,
 	return reply.(*core.Message), err
 }
 
-func (sa *syncAsyncBridge) WaitForIdentity(ctx context.Context, id *fftypes.UUID, send RequestSender) (*core.Identity, error) {
+func (sa *syncAsyncBridge) WaitForIdentity(ctx context.Context, id *fftypes.UUID, send SendFunction) (*core.Identity, error) {
 	reply, err := sa.sendAndWait(ctx, sa.namespace, id, identityConfirm, send)
 	if err != nil {
 		return nil, err
@@ -619,7 +626,7 @@ func (sa *syncAsyncBridge) WaitForIdentity(ctx context.Context, id *fftypes.UUID
 	return reply.(*core.Identity), err
 }
 
-func (sa *syncAsyncBridge) WaitForTokenPool(ctx context.Context, id *fftypes.UUID, send RequestSender) (*core.TokenPool, error) {
+func (sa *syncAsyncBridge) WaitForTokenPool(ctx context.Context, id *fftypes.UUID, send SendFunction) (*core.TokenPool, error) {
 	reply, err := sa.sendAndWait(ctx, sa.namespace, id, tokenPoolConfirm, send)
 	if err != nil {
 		return nil, err
@@ -627,7 +634,7 @@ func (sa *syncAsyncBridge) WaitForTokenPool(ctx context.Context, id *fftypes.UUI
 	return reply.(*core.TokenPool), err
 }
 
-func (sa *syncAsyncBridge) WaitForTokenTransfer(ctx context.Context, id *fftypes.UUID, send RequestSender) (*core.TokenTransfer, error) {
+func (sa *syncAsyncBridge) WaitForTokenTransfer(ctx context.Context, id *fftypes.UUID, send SendFunction) (*core.TokenTransfer, error) {
 	reply, err := sa.sendAndWait(ctx, sa.namespace, id, tokenTransferConfirm, send)
 	if err != nil {
 		return nil, err
@@ -635,7 +642,7 @@ func (sa *syncAsyncBridge) WaitForTokenTransfer(ctx context.Context, id *fftypes
 	return reply.(*core.TokenTransfer), err
 }
 
-func (sa *syncAsyncBridge) WaitForTokenApproval(ctx context.Context, id *fftypes.UUID, send RequestSender) (*core.TokenApproval, error) {
+func (sa *syncAsyncBridge) WaitForTokenApproval(ctx context.Context, id *fftypes.UUID, send SendFunction) (*core.TokenApproval, error) {
 	reply, err := sa.sendAndWait(ctx, sa.namespace, id, tokenApproveConfirm, send)
 	if err != nil {
 		return nil, err
@@ -643,7 +650,7 @@ func (sa *syncAsyncBridge) WaitForTokenApproval(ctx context.Context, id *fftypes
 	return reply.(*core.TokenApproval), err
 }
 
-func (sa *syncAsyncBridge) WaitForInvokeOperation(ctx context.Context, id *fftypes.UUID, send RequestSender) (*core.Operation, error) {
+func (sa *syncAsyncBridge) WaitForInvokeOperation(ctx context.Context, id *fftypes.UUID, send SendFunction) (*core.Operation, error) {
 	reply, err := sa.sendAndWait(ctx, sa.namespace, id, invokeOperationConfirm, send)
 	if err != nil {
 		return nil, err
diff --git a/internal/sysmessaging/message_sender.go b/internal/sysmessaging/message_sender.go
deleted file mode 100644
index 1bd83c20cd..0000000000
--- a/internal/sysmessaging/message_sender.go
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright © 2021 Kaleido, Inc.
-//
-// SPDX-License-Identifier: Apache-2.0
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package sysmessaging
-
-import "context"
-
-type MessageSender interface {
-	Prepare(ctx context.Context) error
-	Send(ctx context.Context) error
-	SendAndWait(ctx context.Context) error
-}
diff --git a/mocks/assetmocks/manager.go b/mocks/assetmocks/manager.go
index 79dbefcb01..1d535c6e9b 100644
--- a/mocks/assetmocks/manager.go
+++ b/mocks/assetmocks/manager.go
@@ -12,7 +12,7 @@ import (
 
 	mock "github.com/stretchr/testify/mock"
 
-	sysmessaging "github.com/hyperledger/firefly/internal/sysmessaging"
+	syncasync "github.com/hyperledger/firefly/internal/syncasync"
 )
 
 // Manager is an autogenerated mock type for the Manager type
@@ -395,15 +395,15 @@ func (_m *Manager) Name() string {
 }
 
 // NewApproval provides a mock function with given fields: approve
-func (_m *Manager) NewApproval(approve *core.TokenApprovalInput) sysmessaging.MessageSender {
+func (_m *Manager) NewApproval(approve *core.TokenApprovalInput) syncasync.Sender {
 	ret := _m.Called(approve)
 
-	var r0 sysmessaging.MessageSender
-	if rf, ok := ret.Get(0).(func(*core.TokenApprovalInput) sysmessaging.MessageSender); ok {
+	var r0 syncasync.Sender
+	if rf, ok := ret.Get(0).(func(*core.TokenApprovalInput) syncasync.Sender); ok {
 		r0 = rf(approve)
 	} else {
 		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(sysmessaging.MessageSender)
+			r0 = ret.Get(0).(syncasync.Sender)
 		}
 	}
 
@@ -411,15 +411,15 @@ func (_m *Manager) NewApproval(approve *core.TokenApprovalInput) sysmessaging.Me
 }
 
 // NewTransfer provides a mock function with given fields: transfer
-func (_m *Manager) NewTransfer(transfer *core.TokenTransferInput) sysmessaging.MessageSender {
+func (_m *Manager) NewTransfer(transfer *core.TokenTransferInput) syncasync.Sender {
 	ret := _m.Called(transfer)
 
-	var r0 sysmessaging.MessageSender
-	if rf, ok := ret.Get(0).(func(*core.TokenTransferInput) sysmessaging.MessageSender); ok {
+	var r0 syncasync.Sender
+	if rf, ok := ret.Get(0).(func(*core.TokenTransferInput) syncasync.Sender); ok {
 		r0 = rf(transfer)
 	} else {
 		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(sysmessaging.MessageSender)
+			r0 = ret.Get(0).(syncasync.Sender)
 		}
 	}
 
diff --git a/mocks/broadcastmocks/manager.go b/mocks/broadcastmocks/manager.go
index 4c778b9847..062d2a2ae4 100644
--- a/mocks/broadcastmocks/manager.go
+++ b/mocks/broadcastmocks/manager.go
@@ -10,7 +10,7 @@ import (
 
 	mock "github.com/stretchr/testify/mock"
 
-	sysmessaging "github.com/hyperledger/firefly/internal/sysmessaging"
+	syncasync "github.com/hyperledger/firefly/internal/syncasync"
 )
 
 // Manager is an autogenerated mock type for the Manager type
@@ -56,15 +56,15 @@ func (_m *Manager) Name() string {
 }
 
 // NewBroadcast provides a mock function with given fields: in
-func (_m *Manager) NewBroadcast(in *core.MessageInOut) sysmessaging.MessageSender {
+func (_m *Manager) NewBroadcast(in *core.MessageInOut) syncasync.Sender {
 	ret := _m.Called(in)
 
-	var r0 sysmessaging.MessageSender
-	if rf, ok := ret.Get(0).(func(*core.MessageInOut) sysmessaging.MessageSender); ok {
+	var r0 syncasync.Sender
+	if rf, ok := ret.Get(0).(func(*core.MessageInOut) syncasync.Sender); ok {
 		r0 = rf(in)
 	} else {
 		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(sysmessaging.MessageSender)
+			r0 = ret.Get(0).(syncasync.Sender)
 		}
 	}
 
diff --git a/mocks/privatemessagingmocks/manager.go b/mocks/privatemessagingmocks/manager.go
index 15eba3c576..e4a320990a 100644
--- a/mocks/privatemessagingmocks/manager.go
+++ b/mocks/privatemessagingmocks/manager.go
@@ -12,7 +12,7 @@ import (
 
 	mock "github.com/stretchr/testify/mock"
 
-	sysmessaging "github.com/hyperledger/firefly/internal/sysmessaging"
+	syncasync "github.com/hyperledger/firefly/internal/syncasync"
 )
 
 // Manager is an autogenerated mock type for the Manager type
@@ -111,15 +111,15 @@ func (_m *Manager) Name() string {
 }
 
 // NewMessage provides a mock function with given fields: msg
-func (_m *Manager) NewMessage(msg *core.MessageInOut) sysmessaging.MessageSender {
+func (_m *Manager) NewMessage(msg *core.MessageInOut) syncasync.Sender {
 	ret := _m.Called(msg)
 
-	var r0 sysmessaging.MessageSender
-	if rf, ok := ret.Get(0).(func(*core.MessageInOut) sysmessaging.MessageSender); ok {
+	var r0 syncasync.Sender
+	if rf, ok := ret.Get(0).(func(*core.MessageInOut) syncasync.Sender); ok {
 		r0 = rf(msg)
 	} else {
 		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(sysmessaging.MessageSender)
+			r0 = ret.Get(0).(syncasync.Sender)
 		}
 	}
 
diff --git a/mocks/syncasyncmocks/bridge.go b/mocks/syncasyncmocks/bridge.go
index ec533534c3..08b12900f1 100644
--- a/mocks/syncasyncmocks/bridge.go
+++ b/mocks/syncasyncmocks/bridge.go
@@ -26,11 +26,11 @@ func (_m *Bridge) Init(sysevents system.EventInterface) {
 }
 
 // WaitForIdentity provides a mock function with given fields: ctx, id, send
-func (_m *Bridge) WaitForIdentity(ctx context.Context, id *fftypes.UUID, send syncasync.RequestSender) (*core.Identity, error) {
+func (_m *Bridge) WaitForIdentity(ctx context.Context, id *fftypes.UUID, send syncasync.SendFunction) (*core.Identity, error) {
 	ret := _m.Called(ctx, id, send)
 
 	var r0 *core.Identity
-	if rf, ok := ret.Get(0).(func(context.Context, *fftypes.UUID, syncasync.RequestSender) *core.Identity); ok {
+	if rf, ok := ret.Get(0).(func(context.Context, *fftypes.UUID, syncasync.SendFunction) *core.Identity); ok {
 		r0 = rf(ctx, id, send)
 	} else {
 		if ret.Get(0) != nil {
@@ -39,7 +39,7 @@ func (_m *Bridge) WaitForIdentity(ctx context.Context, id *fftypes.UUID, send sy
 	}
 
 	var r1 error
-	if rf, ok := ret.Get(1).(func(context.Context, *fftypes.UUID, syncasync.RequestSender) error); ok {
+	if rf, ok := ret.Get(1).(func(context.Context, *fftypes.UUID, syncasync.SendFunction) error); ok {
 		r1 = rf(ctx, id, send)
 	} else {
 		r1 = ret.Error(1)
@@ -49,11 +49,11 @@ func (_m *Bridge) WaitForIdentity(ctx context.Context, id *fftypes.UUID, send sy
 }
 
 // WaitForInvokeOperation provides a mock function with given fields: ctx, id, send
-func (_m *Bridge) WaitForInvokeOperation(ctx context.Context, id *fftypes.UUID, send syncasync.RequestSender) (*core.Operation, error) {
+func (_m *Bridge) WaitForInvokeOperation(ctx context.Context, id *fftypes.UUID, send syncasync.SendFunction) (*core.Operation, error) {
 	ret := _m.Called(ctx, id, send)
 
 	var r0 *core.Operation
-	if rf, ok := ret.Get(0).(func(context.Context, *fftypes.UUID, syncasync.RequestSender) *core.Operation); ok {
+	if rf, ok := ret.Get(0).(func(context.Context, *fftypes.UUID, syncasync.SendFunction) *core.Operation); ok {
 		r0 = rf(ctx, id, send)
 	} else {
 		if ret.Get(0) != nil {
@@ -62,7 +62,7 @@ func (_m *Bridge) WaitForInvokeOperation(ctx context.Context, id *fftypes.UUID,
 	}
 
 	var r1 error
-	if rf, ok := ret.Get(1).(func(context.Context, *fftypes.UUID, syncasync.RequestSender) error); ok {
+	if rf, ok := ret.Get(1).(func(context.Context, *fftypes.UUID, syncasync.SendFunction) error); ok {
 		r1 = rf(ctx, id, send)
 	} else {
 		r1 = ret.Error(1)
@@ -72,11 +72,11 @@ func (_m *Bridge) WaitForInvokeOperation(ctx context.Context, id *fftypes.UUID,
 }
 
 // WaitForMessage provides a mock function with given fields: ctx, id, send
-func (_m *Bridge) WaitForMessage(ctx context.Context, id *fftypes.UUID, send syncasync.RequestSender) (*core.Message, error) {
+func (_m *Bridge) WaitForMessage(ctx context.Context, id *fftypes.UUID, send syncasync.SendFunction) (*core.Message, error) {
 	ret := _m.Called(ctx, id, send)
 
 	var r0 *core.Message
-	if rf, ok := ret.Get(0).(func(context.Context, *fftypes.UUID, syncasync.RequestSender) *core.Message); ok {
+	if rf, ok := ret.Get(0).(func(context.Context, *fftypes.UUID, syncasync.SendFunction) *core.Message); ok {
 		r0 = rf(ctx, id, send)
 	} else {
 		if ret.Get(0) != nil {
@@ -85,7 +85,7 @@ func (_m *Bridge) WaitForMessage(ctx context.Context, id *fftypes.UUID, send syn
 	}
 
 	var r1 error
-	if rf, ok := ret.Get(1).(func(context.Context, *fftypes.UUID, syncasync.RequestSender) error); ok {
+	if rf, ok := ret.Get(1).(func(context.Context, *fftypes.UUID, syncasync.SendFunction) error); ok {
 		r1 = rf(ctx, id, send)
 	} else {
 		r1 = ret.Error(1)
@@ -95,11 +95,11 @@ func (_m *Bridge) WaitForMessage(ctx context.Context, id *fftypes.UUID, send syn
 }
 
 // WaitForReply provides a mock function with given fields: ctx, id, send
-func (_m *Bridge) WaitForReply(ctx context.Context, id *fftypes.UUID, send syncasync.RequestSender) (*core.MessageInOut, error) {
+func (_m *Bridge) WaitForReply(ctx context.Context, id *fftypes.UUID, send syncasync.SendFunction) (*core.MessageInOut, error) {
 	ret := _m.Called(ctx, id, send)
 
 	var r0 *core.MessageInOut
-	if rf, ok := ret.Get(0).(func(context.Context, *fftypes.UUID, syncasync.RequestSender) *core.MessageInOut); ok {
+	if rf, ok := ret.Get(0).(func(context.Context, *fftypes.UUID, syncasync.SendFunction) *core.MessageInOut); ok {
 		r0 = rf(ctx, id, send)
 	} else {
 		if ret.Get(0) != nil {
@@ -108,7 +108,7 @@ func (_m *Bridge) WaitForReply(ctx context.Context, id *fftypes.UUID, send synca
 	}
 
 	var r1 error
-	if rf, ok := ret.Get(1).(func(context.Context, *fftypes.UUID, syncasync.RequestSender) error); ok {
+	if rf, ok := ret.Get(1).(func(context.Context, *fftypes.UUID, syncasync.SendFunction) error); ok {
 		r1 = rf(ctx, id, send)
 	} else {
 		r1 = ret.Error(1)
@@ -118,11 +118,11 @@ func (_m *Bridge) WaitForReply(ctx context.Context, id *fftypes.UUID, send synca
 }
 
 // WaitForTokenApproval provides a mock function with given fields: ctx, id, send
-func (_m *Bridge) WaitForTokenApproval(ctx context.Context, id *fftypes.UUID, send syncasync.RequestSender) (*core.TokenApproval, error) {
+func (_m *Bridge) WaitForTokenApproval(ctx context.Context, id *fftypes.UUID, send syncasync.SendFunction) (*core.TokenApproval, error) {
 	ret := _m.Called(ctx, id, send)
 
 	var r0 *core.TokenApproval
-	if rf, ok := ret.Get(0).(func(context.Context, *fftypes.UUID, syncasync.RequestSender) *core.TokenApproval); ok {
+	if rf, ok := ret.Get(0).(func(context.Context, *fftypes.UUID, syncasync.SendFunction) *core.TokenApproval); ok {
 		r0 = rf(ctx, id, send)
 	} else {
 		if ret.Get(0) != nil {
@@ -131,7 +131,7 @@ func (_m *Bridge) WaitForTokenApproval(ctx context.Context, id *fftypes.UUID, se
 	}
 
 	var r1 error
-	if rf, ok := ret.Get(1).(func(context.Context, *fftypes.UUID, syncasync.RequestSender) error); ok {
+	if rf, ok := ret.Get(1).(func(context.Context, *fftypes.UUID, syncasync.SendFunction) error); ok {
 		r1 = rf(ctx, id, send)
 	} else {
 		r1 = ret.Error(1)
@@ -141,11 +141,11 @@ func (_m *Bridge) WaitForTokenApproval(ctx context.Context, id *fftypes.UUID, se
 }
 
 // WaitForTokenPool provides a mock function with given fields: ctx, id, send
-func (_m *Bridge) WaitForTokenPool(ctx context.Context, id *fftypes.UUID, send syncasync.RequestSender) (*core.TokenPool, error) {
+func (_m *Bridge) WaitForTokenPool(ctx context.Context, id *fftypes.UUID, send syncasync.SendFunction) (*core.TokenPool, error) {
 	ret := _m.Called(ctx, id, send)
 
 	var r0 *core.TokenPool
-	if rf, ok := ret.Get(0).(func(context.Context, *fftypes.UUID, syncasync.RequestSender) *core.TokenPool); ok {
+	if rf, ok := ret.Get(0).(func(context.Context, *fftypes.UUID, syncasync.SendFunction) *core.TokenPool); ok {
 		r0 = rf(ctx, id, send)
 	} else {
 		if ret.Get(0) != nil {
@@ -154,7 +154,7 @@ func (_m *Bridge) WaitForTokenPool(ctx context.Context, id *fftypes.UUID, send s
 	}
 
 	var r1 error
-	if rf, ok := ret.Get(1).(func(context.Context, *fftypes.UUID, syncasync.RequestSender) error); ok {
+	if rf, ok := ret.Get(1).(func(context.Context, *fftypes.UUID, syncasync.SendFunction) error); ok {
 		r1 = rf(ctx, id, send)
 	} else {
 		r1 = ret.Error(1)
@@ -164,11 +164,11 @@ func (_m *Bridge) WaitForTokenPool(ctx context.Context, id *fftypes.UUID, send s
 }
 
 // WaitForTokenTransfer provides a mock function with given fields: ctx, id, send
-func (_m *Bridge) WaitForTokenTransfer(ctx context.Context, id *fftypes.UUID, send syncasync.RequestSender) (*core.TokenTransfer, error) {
+func (_m *Bridge) WaitForTokenTransfer(ctx context.Context, id *fftypes.UUID, send syncasync.SendFunction) (*core.TokenTransfer, error) {
 	ret := _m.Called(ctx, id, send)
 
 	var r0 *core.TokenTransfer
-	if rf, ok := ret.Get(0).(func(context.Context, *fftypes.UUID, syncasync.RequestSender) *core.TokenTransfer); ok {
+	if rf, ok := ret.Get(0).(func(context.Context, *fftypes.UUID, syncasync.SendFunction) *core.TokenTransfer); ok {
 		r0 = rf(ctx, id, send)
 	} else {
 		if ret.Get(0) != nil {
@@ -177,7 +177,7 @@ func (_m *Bridge) WaitForTokenTransfer(ctx context.Context, id *fftypes.UUID, se
 	}
 
 	var r1 error
-	if rf, ok := ret.Get(1).(func(context.Context, *fftypes.UUID, syncasync.RequestSender) error); ok {
+	if rf, ok := ret.Get(1).(func(context.Context, *fftypes.UUID, syncasync.SendFunction) error); ok {
 		r1 = rf(ctx, id, send)
 	} else {
 		r1 = ret.Error(1)
diff --git a/mocks/sysmessagingmocks/message_sender.go b/mocks/syncasyncmocks/sender.go
similarity index 71%
rename from mocks/sysmessagingmocks/message_sender.go
rename to mocks/syncasyncmocks/sender.go
index bc300a98f0..caf2c553d8 100644
--- a/mocks/sysmessagingmocks/message_sender.go
+++ b/mocks/syncasyncmocks/sender.go
@@ -1,6 +1,6 @@
 // Code generated by mockery v1.0.0. DO NOT EDIT.
 
-package sysmessagingmocks
+package syncasyncmocks
 
 import (
 	context "context"
@@ -8,13 +8,13 @@ import (
 	mock "github.com/stretchr/testify/mock"
 )
 
-// MessageSender is an autogenerated mock type for the MessageSender type
-type MessageSender struct {
+// Sender is an autogenerated mock type for the Sender type
+type Sender struct {
 	mock.Mock
 }
 
 // Prepare provides a mock function with given fields: ctx
-func (_m *MessageSender) Prepare(ctx context.Context) error {
+func (_m *Sender) Prepare(ctx context.Context) error {
 	ret := _m.Called(ctx)
 
 	var r0 error
@@ -28,7 +28,7 @@ func (_m *MessageSender) Prepare(ctx context.Context) error {
 }
 
 // Send provides a mock function with given fields: ctx
-func (_m *MessageSender) Send(ctx context.Context) error {
+func (_m *Sender) Send(ctx context.Context) error {
 	ret := _m.Called(ctx)
 
 	var r0 error
@@ -42,7 +42,7 @@ func (_m *MessageSender) Send(ctx context.Context) error {
 }
 
 // SendAndWait provides a mock function with given fields: ctx
-func (_m *MessageSender) SendAndWait(ctx context.Context) error {
+func (_m *Sender) SendAndWait(ctx context.Context) error {
 	ret := _m.Called(ctx)
 
 	var r0 error