diff --git a/zetaclient/chains/evm/signer/signer_test.go b/zetaclient/chains/evm/signer/signer_test.go
index 5bd1b6a967..06e33571a5 100644
--- a/zetaclient/chains/evm/signer/signer_test.go
+++ b/zetaclient/chains/evm/signer/signer_test.go
@@ -145,13 +145,13 @@ func TestSigner_TryProcessOutbound(t *testing.T) {
 	evmSigner, err := getNewEvmSigner(nil)
 	require.NoError(t, err)
 	cctx := getCCTX(t)
-	processorManager := getNewOutboundProcessor()
+	processor := getNewOutboundProcessor()
 	mockObserver, err := getNewEvmChainObserver(nil)
 	require.NoError(t, err)
 
 	// Test with mock client that has keys
 	client := mocks.NewMockZetacoreClient().WithKeys(&keys.Keys{})
-	evmSigner.TryProcessOutbound(cctx, processorManager, "123", mockObserver, client, 123)
+	evmSigner.TryProcessOutbound(cctx, processor, "123", mockObserver, client, 123)
 
 	// Check if cctx was signed and broadcasted
 	list := evmSigner.GetReportedTxList()
diff --git a/zetaclient/orchestrator/orchestrator.go b/zetaclient/orchestrator/orchestrator.go
index f9678301ff..7967231de0 100644
--- a/zetaclient/orchestrator/orchestrator.go
+++ b/zetaclient/orchestrator/orchestrator.go
@@ -82,7 +82,7 @@ func NewOrchestrator(
 	oc.signerMap = signerMap
 	oc.observerMap = observerMap
 
-	// create outbound processor manager
+	// create outbound processor
 	oc.outboundProc = outboundprocessor.NewProcessor(logger)
 
 	balance, err := zetacoreClient.GetZetaHotKeyBalance()
diff --git a/zetaclient/outboundprocessor/outbound_processor_manager.go b/zetaclient/outboundprocessor/outbound_processor.go
similarity index 94%
rename from zetaclient/outboundprocessor/outbound_processor_manager.go
rename to zetaclient/outboundprocessor/outbound_processor.go
index 8499252ede..feb4caafa7 100644
--- a/zetaclient/outboundprocessor/outbound_processor_manager.go
+++ b/zetaclient/outboundprocessor/outbound_processor.go
@@ -23,7 +23,7 @@ func NewProcessor(logger zerolog.Logger) *Processor {
 		outboundEndTime:    make(map[string]time.Time),
 		outboundActive:     make(map[string]struct{}),
 		mu:                 sync.Mutex{},
-		Logger:             logger.With().Str("module", "OutboundProcessorManager").Logger(),
+		Logger:             logger.With().Str("module", "OutboundProcessor").Logger(),
 		numActiveProcessor: 0,
 	}
 }
@@ -63,7 +63,7 @@ func (p *Processor) TimeInTryProcess(outboundID string) time.Duration {
 	return 0
 }
 
-// ToOutboundID returns the outbound ID for OutboundProcessorManager to track
+// ToOutboundID returns the outbound ID for OutboundProcessor to track
 func ToOutboundID(index string, receiverChainID int64, nonce uint64) string {
 	return fmt.Sprintf("%s-%d-%d", index, receiverChainID, nonce)
 }
diff --git a/zetaclient/outboundprocessor/outbound_processor_manager_test.go b/zetaclient/outboundprocessor/outbound_processor_test.go
similarity index 100%
rename from zetaclient/outboundprocessor/outbound_processor_manager_test.go
rename to zetaclient/outboundprocessor/outbound_processor_test.go