diff --git a/op-node/rollup/derive/attributes_queue.go b/op-node/rollup/derive/attributes_queue.go
index ecace5f874b8..c15079c6bfa9 100644
--- a/op-node/rollup/derive/attributes_queue.go
+++ b/op-node/rollup/derive/attributes_queue.go
@@ -12,7 +12,7 @@ import (
 	"github.com/ethereum-optimism/optimism/op-service/eth"
 )
 
-// The attributes queue sits in between the batch queue and the engine queue
+// The attributes queue sits after the batch queue.
 // It transforms batches into payload attributes. The outputted payload
 // attributes cannot be buffered because each batch->attributes transformation
 // pulls in data about the current L2 safe head.
diff --git a/op-node/rollup/derive/iface.go b/op-node/rollup/derive/iface.go
index 117e49c23852..4190d84fa534 100644
--- a/op-node/rollup/derive/iface.go
+++ b/op-node/rollup/derive/iface.go
@@ -15,7 +15,7 @@ import (
 // The l1Block specified is the first L1 block that includes sufficient information to derive the new safe head
 type SafeHeadListener interface {
 
-	// Enabled reports if this safe head listener is actively using the posted data. This allows the engine queue to
+	// Enabled reports if this safe head listener is actively using the posted data. This allows the ResetEngine to
 	// optionally skip making calls that may be expensive to prepare.
 	// Callbacks may still be made if Enabled returns false but are not guaranteed.
 	Enabled() bool
diff --git a/op-node/rollup/derive/pipeline.go b/op-node/rollup/derive/pipeline.go
index 56086f8cc8c5..2a15dd73badb 100644
--- a/op-node/rollup/derive/pipeline.go
+++ b/op-node/rollup/derive/pipeline.go
@@ -79,9 +79,9 @@ func NewDerivationPipeline(log log.Logger, rollupCfg *rollup.Config, l1Fetcher L
 	attrBuilder := NewFetchingAttributesBuilder(rollupCfg, l1Fetcher, l2Source)
 	attributesQueue := NewAttributesQueue(log, rollupCfg, attrBuilder, batchQueue)
 
-	// Reset from engine queue then up from L1 Traversal. The stages do not talk to each other during
-	// the reset, but after the engine queue, this is the order in which the stages could talk to each other.
-	// Note: The engine queue stage is the only reset that can fail.
+	// Reset from ResetEngine then up from L1 Traversal. The stages do not talk to each other during
+	// the ResetEngine, but after the ResetEngine, this is the order in which the stages could talk to each other.
+	// Note: The ResetEngine is the only reset that can fail.
 	stages := []ResettableStage{l1Traversal, l1Src, plasma, frameQueue, bank, chInReader, batchQueue, attributesQueue}
 
 	return &DerivationPipeline{