diff --git a/baseapp/abci.go b/baseapp/abci.go
index 608ea1e70c88..3b956b4cef01 100644
--- a/baseapp/abci.go
+++ b/baseapp/abci.go
@@ -412,7 +412,7 @@ func (app *BaseApp) PrepareProposal(req *abci.PrepareProposalRequest) (resp *abc
 
 	// Abort any running OE so it cannot overlap with `PrepareProposal`. This could happen if optimistic
 	// `internalFinalizeBlock` from previous round takes a long time, but consensus has moved on to next round.
-	// Overlap is undesirable, since `internalFinalizeBlock` and `PrepareProoposal` could share access to
+	// Overlap is undesirable, since `internalFinalizeBlock` and `PrepareProposal` could share access to
 	// in-memory structs depending on application implementation.
 	// No-op if OE is not enabled.
 	// Similar call to Abort() is done in `ProcessProposal`.
diff --git a/codec/collections.go b/codec/collections.go
index d21a9a92484d..ab6e91ad26fa 100644
--- a/codec/collections.go
+++ b/codec/collections.go
@@ -402,7 +402,7 @@ func protoCol(f protoreflect.FieldDescriptor) schema.Field {
 		case protoreflect.EnumKind:
 			// TODO: support enums
 			col.Kind = schema.EnumKind
-			// use the full name to avoid collissions
+			// use the full name to avoid collisions
 			col.ReferencedType = string(f.Enum().FullName())
 			col.ReferencedType = strings.ReplaceAll(col.ReferencedType, ".", "_")
 		case protoreflect.MessageKind:
diff --git a/server/v2/cometbft/abci.go b/server/v2/cometbft/abci.go
index f97d6fa43b36..31e197737fd8 100644
--- a/server/v2/cometbft/abci.go
+++ b/server/v2/cometbft/abci.go
@@ -374,7 +374,7 @@ func (c *consensus[T]) PrepareProposal(
 
 	// Abort any running OE so it cannot overlap with `PrepareProposal`. This could happen if optimistic
 	// `internalFinalizeBlock` from previous round takes a long time, but consensus has moved on to next round.
-	// Overlap is undesirable, since `internalFinalizeBlock` and `PrepareProoposal` could share access to
+	// Overlap is undesirable, since `internalFinalizeBlock` and `PrepareProposal` could share access to
 	// in-memory structs depending on application implementation.
 	// No-op if OE is not enabled.
 	// Similar call to Abort() is done in `ProcessProposal`.
diff --git a/systemtests/system.go b/systemtests/system.go
index fa39beb4d509..ac38d90d880e 100644
--- a/systemtests/system.go
+++ b/systemtests/system.go
@@ -492,7 +492,7 @@ func (s *SystemUnderTest) ModifyGenesisJSON(t *testing.T, mutators ...GenesisMut
 	s.modifyGenesisJSON(t, mutators...)
 }
 
-// modify json without enforcing a reset
+// modifyGenesisJSON modify json without enforcing a reset
 func (s *SystemUnderTest) modifyGenesisJSON(t *testing.T, mutators ...GenesisMutator) {
 	t.Helper()
 	require.Empty(t, s.currentHeight.Load(), "forced chain reset required")
@@ -606,7 +606,7 @@ func (s *SystemUnderTest) startNodesAsync(t *testing.T, xargs ...string) {
 	})
 }
 
-// tracks the PID in state with a go routine waiting for the shutdown completion to unregister
+// awaitProcessCleanup tracks the PID in state with a go routine waiting for the shutdown completion to unregister
 func (s *SystemUnderTest) awaitProcessCleanup(cmd *exec.Cmd) {
 	pid := cmd.Process.Pid
 	s.pidsLock.Lock()
@@ -777,7 +777,7 @@ func (s *SystemUnderTest) NewEventListener(t *testing.T) *EventListener {
 	return NewEventListener(t, s.rpcAddr)
 }
 
-// is any process let running?
+// anyNodeRunning is any process let running?
 func (s *SystemUnderTest) anyNodeRunning() bool {
 	s.pidsLock.RLock()
 	defer s.pidsLock.RUnlock()