diff --git a/state/helper.go b/state/helper.go
index 3b37d121ee..0d4a51c274 100644
--- a/state/helper.go
+++ b/state/helper.go
@@ -287,7 +287,9 @@ func GenerateReceipt(blockNumber *big.Int, processedTx *ProcessTransactionRespon
 		ContractAddress:  processedTx.CreateAddress,
 		Logs:             processedTx.Logs,
 	}
-	if forkID <= FORKID_ETROG {
+
+	// for XLayer
+	if forkID <= FORKID_ELDERBERRY {
 		receipt.PostState = processedTx.StateRoot.Bytes()
 		receipt.CumulativeGasUsed = processedTx.GasUsed
 	} else {
@@ -311,7 +313,9 @@ func GenerateReceipt(blockNumber *big.Int, processedTx *ProcessTransactionRespon
 	for i := 0; i < len(receipt.Logs); i++ {
 		receipt.Logs[i].TxHash = processedTx.Tx.Hash()
 	}
-	if forkID <= FORKID_ETROG {
+
+	// for XLayer
+	if forkID <= FORKID_ELDERBERRY {
 		if processedTx.RomError == nil {
 			receipt.Status = types.ReceiptStatusSuccessful
 		} else {
diff --git a/state/transaction.go b/state/transaction.go
index 355fdad9ad..98f92c22aa 100644
--- a/state/transaction.go
+++ b/state/transaction.go
@@ -216,7 +216,7 @@ func (s *State) StoreL2Block(ctx context.Context, batchNumber uint64, l2Block *P
 
 	gasLimit := l2Block.GasLimit
 	// We check/set the maximum value of gasLimit for batches <= to ETROG fork. For batches >= to ELDERBERRY fork we use always the value returned by the executor
-	if forkID <= FORKID_ETROG && gasLimit > MaxL2BlockGasLimit {
+	if forkID <= FORKID_ELDERBERRY && gasLimit > MaxL2BlockGasLimit {
 		gasLimit = MaxL2BlockGasLimit
 	}