diff --git a/execute/tokendata/usdc/attestation.go b/execute/tokendata/usdc/attestation.go
index 10c3f123..e321a616 100644
--- a/execute/tokendata/usdc/attestation.go
+++ b/execute/tokendata/usdc/attestation.go
@@ -92,10 +92,10 @@ func (s *sequentialAttestationClient) Attestations(
 ) (map[cciptypes.ChainSelector]map[reader.MessageTokenID]AttestationStatus, error) {
 	outcome := make(map[cciptypes.ChainSelector]map[reader.MessageTokenID]AttestationStatus)
 
-	for chainSelector, messagesByTokenId := range messagesByChain {
+	for chainSelector, messagesByTokenID := range messagesByChain {
 		outcome[chainSelector] = make(map[reader.MessageTokenID]AttestationStatus)
 
-		for tokenID, message := range messagesByTokenId {
+		for tokenID, message := range messagesByTokenID {
 			s.lggr.Debugw(
 				"Fetching attestation from the API",
 				"chainSelector", chainSelector,
diff --git a/execute/tokendata/usdc/usdc.go b/execute/tokendata/usdc/usdc.go
index 3d98f9ee..c60a3d92 100644
--- a/execute/tokendata/usdc/usdc.go
+++ b/execute/tokendata/usdc/usdc.go
@@ -61,13 +61,13 @@ func (u *TokenDataObserver) Observe(
 	usdcMessages := u.pickOnlyUSDCMessages(messages)
 
 	// 2. Fetch USDC messages by token id based on the `MessageSent (bytes message)` event
-	usdcMessagesByTokenId, err := u.fetchUSDCEventMessages(ctx, usdcMessages)
+	usdcMessagesByTokenID, err := u.fetchUSDCEventMessages(ctx, usdcMessages)
 	if err != nil {
 		return nil, err
 	}
 
 	// 3. Fetch attestations for USDC messages
-	attestations, err := u.fetchAttestations(ctx, usdcMessagesByTokenId)
+	attestations, err := u.fetchAttestations(ctx, usdcMessagesByTokenID)
 	if err != nil {
 		return nil, err
 	}