diff --git a/internal/data/data_manager.go b/internal/data/data_manager.go
index d807698fda..26cac1336b 100644
--- a/internal/data/data_manager.go
+++ b/internal/data/data_manager.go
@@ -186,7 +186,7 @@ func (dm *dataManager) getValidatorForDatatype(ctx context.Context, validator co
 	return v, err
 }
 
-// GetMessageWithData performs a cached lookup of a message with all of the associated data.
+// GetMessageWithDataCached performs a cached lookup of a message with all of the associated data.
 //   - Use this in performance sensitive code, but note mutable fields like the status of the
 //     message CANNOT be relied upon (due to the caching).
 func (dm *dataManager) GetMessageWithDataCached(ctx context.Context, msgID *fftypes.UUID, options ...CacheReadOption) (msg *core.Message, data core.DataArray, foundAllData bool, err error) {
@@ -201,7 +201,7 @@ func (dm *dataManager) GetMessageWithDataCached(ctx context.Context, msgID *ffty
 	return msg, data, foundAllData, err
 }
 
-// GetMessageData looks for all the data attached to the message, including caching.
+// GetMessageDataCached looks for all the data attached to the message, including caching.
 // It only returns persistence errors.
 // For all cases where the data is not found (or the hashes mismatch)
 func (dm *dataManager) GetMessageDataCached(ctx context.Context, msg *core.Message, options ...CacheReadOption) (data core.DataArray, foundAll bool, err error) {
diff --git a/internal/operations/manager.go b/internal/operations/manager.go
index 1c9c1ae27d..b0e6b0d9f9 100644
--- a/internal/operations/manager.go
+++ b/internal/operations/manager.go
@@ -78,7 +78,7 @@ type operationsManager struct {
 	cache     cache.CInterface
 }
 
-// SubmitBulkOperationUpdate implements Manager.
+// SubmitBulkOperationUpdates implements Manager.
 func (om *operationsManager) SubmitBulkOperationUpdates(ctx context.Context, updates []*core.OperationUpdate) error {
 	for _, update := range updates {
 		errString := ""