diff --git a/core/services/blockhashstore/feeder.go b/core/services/blockhashstore/feeder.go
index e5367cba69..f33989f5f9 100644
--- a/core/services/blockhashstore/feeder.go
+++ b/core/services/blockhashstore/feeder.go
@@ -58,7 +58,7 @@ type Feeder struct {
 	lookbackBlocks      int
 	latestBlock         func(ctx context.Context) (uint64, error)
 
-	// heartbeatPeriodTime is a heartbeat period in seconds by which
+	// heartbeatPeriod is a heartbeat period in seconds by which
 	// the feeder will always store a blockhash, even if there are no
 	// unfulfilled requests. This is to ensure that there are blockhashes
 	// in the store to start from if we ever need to run backwards mode.
diff --git a/core/services/job/models.go b/core/services/job/models.go
index b9ec8e726f..9768a01b93 100644
--- a/core/services/job/models.go
+++ b/core/services/job/models.go
@@ -625,7 +625,7 @@ type BlockhashStoreSpec struct {
 	// WaitBlocks defines the minimum age of blocks whose hashes should be stored.
 	WaitBlocks int32 `toml:"waitBlocks"`
 
-	// HeartbeatPeriodTime defines the number of seconds by which we "heartbeat store"
+	// HeartbeatPeriod defines the number of seconds by which we "heartbeat store"
 	// a blockhash into the blockhash store contract.
 	// This is so that we always have a blockhash to anchor to in the event we need to do a
 	// backwards mode on the contract.
@@ -650,7 +650,7 @@ type BlockhashStoreSpec struct {
 	// EVMChainID defines the chain ID for monitoring and storing of blockhashes.
 	EVMChainID *big.Big `toml:"evmChainID"`
 
-	// FromAddress is the sender address that should be used to store blockhashes.
+	// FromAddresses is the sender address that should be used to store blockhashes.
 	FromAddresses []evmtypes.EIP55Address `toml:"fromAddresses"`
 
 	// CreatedAt is the time this job was created.
@@ -699,7 +699,7 @@ type BlockHeaderFeederSpec struct {
 	// EVMChainID defines the chain ID for monitoring and storing of blockhashes.
 	EVMChainID *big.Big `toml:"evmChainID"`
 
-	// FromAddress is the sender address that should be used to store blockhashes.
+	// FromAddresses is the sender address that should be used to store blockhashes.
 	FromAddresses []evmtypes.EIP55Address `toml:"fromAddresses"`
 
 	// GetBlockHashesBatchSize is the RPC call batch size for retrieving blockhashes
@@ -730,7 +730,7 @@ type LegacyGasStationServerSpec struct {
 	// This selector is equivalent to (source) chainID specified in SendTransaction request
 	CCIPChainSelector *big.Big `toml:"ccipChainSelector"`
 
-	// FromAddress is the sender address that should be used to send meta-transactions
+	// FromAddresses is the sender address that should be used to send meta-transactions
 	FromAddresses []evmtypes.EIP55Address `toml:"fromAddresses"`
 
 	// CreatedAt is the time this job was created.
@@ -836,7 +836,7 @@ type EALSpec struct {
 	// EVMChainID defines the chain ID from which the meta-transaction request originates.
 	EVMChainID *big.Big `toml:"evmChainID"`
 
-	// FromAddress is the sender address that should be used to send meta-transactions
+	// FromAddresses is the sender address that should be used to send meta-transactions
 	FromAddresses []evmtypes.EIP55Address `toml:"fromAddresses"`
 
 	// LookbackBlocks defines the maximum age of blocks to lookback in status tracker