diff --git a/chainio/clients/wallet/fireblocks_wallet.go b/chainio/clients/wallet/fireblocks_wallet.go
index ea8a9f1e..f263c174 100644
--- a/chainio/clients/wallet/fireblocks_wallet.go
+++ b/chainio/clients/wallet/fireblocks_wallet.go
@@ -51,7 +51,7 @@ type fireblocksWallet struct {
 	logger           logging.Logger
 	chainID          *big.Int
 
-	// nonceToTx keeps track of the transaction ID for each nonce
+	// nonceToTxID keeps track of the transaction ID for each nonce
 	// this is used to retrieve the transaction hash for a given nonce
 	// when a replacement transaction is submitted.
 	nonceToTxID map[uint64]TxID
diff --git a/services/avsregistry/avsregistry.go b/services/avsregistry/avsregistry.go
index e731b37b..1048bbb1 100644
--- a/services/avsregistry/avsregistry.go
+++ b/services/avsregistry/avsregistry.go
@@ -12,7 +12,7 @@ import (
 // operator state
 // at certain blocks, including operatorIds, pubkeys, and staking status in each quorum.
 type AvsRegistryService interface {
-	// GetOperatorsAvsState returns the state of an avs wrt to a list of quorums at a certain block.
+	// GetOperatorsAvsStateAtBlock returns the state of an avs wrt to a list of quorums at a certain block.
 	// The state includes the operatorId, pubkey, and staking amount in each quorum.
 	GetOperatorsAvsStateAtBlock(
 		ctx context.Context,
diff --git a/services/operatorsinfo/operatorsinfo_subgraph.go b/services/operatorsinfo/operatorsinfo_subgraph.go
index 9411b3aa..33d37207 100644
--- a/services/operatorsinfo/operatorsinfo_subgraph.go
+++ b/services/operatorsinfo/operatorsinfo_subgraph.go
@@ -36,7 +36,7 @@ type (
 		SocketUpdates []SocketUpdates `graphql:"socketUpdates(first: 1, orderBy: blockNumber, orderDirection: desc)"`
 	}
 	IndexedOperatorInfo struct {
-		// PubKeyG1 and PubKeyG2 are the public keys of the operator, which are retrieved from the
+		// PubkeyG1 and PubkeyG2 are the public keys of the operator, which are retrieved from the
 		// EigenDAPubKeyCompendium smart contract
 		PubkeyG1 *G1Point
 		PubkeyG2 *G2Point