diff --git a/contracts/src/v0.8/l2ep/test/mocks/optimism/MockOVMCrossDomainMessenger.sol b/contracts/src/v0.8/l2ep/test/mocks/optimism/MockOVMCrossDomainMessenger.sol
index a66de4ee6d0..a0916819c79 100644
--- a/contracts/src/v0.8/l2ep/test/mocks/optimism/MockOVMCrossDomainMessenger.sol
+++ b/contracts/src/v0.8/l2ep/test/mocks/optimism/MockOVMCrossDomainMessenger.sol
@@ -3,21 +3,21 @@
 pragma solidity >=0.7.6 <0.9.0;
 
 import {iOVM_CrossDomainMessenger} from "../../../../vendor/@eth-optimism/contracts/v0.4.7/contracts/optimistic-ethereum/iOVM/bridge/messaging/iOVM_CrossDomainMessenger.sol";
-import "../../../../vendor/openzeppelin-solidity/v4.8.3/contracts/utils/Address.sol";
+import {Address} from "../../../../vendor/openzeppelin-solidity/v4.8.3/contracts/utils/Address.sol";
 
 contract MockOVMCrossDomainMessenger is iOVM_CrossDomainMessenger {
-  address internal mockMessageSender;
+  address internal s_mockMessageSender;
 
   constructor(address sender) {
-    mockMessageSender = sender;
+    s_mockMessageSender = sender;
   }
 
   function xDomainMessageSender() external view override returns (address) {
-    return mockMessageSender;
+    return s_mockMessageSender;
   }
 
   function _setMockMessageSender(address sender) external {
-    mockMessageSender = sender;
+    s_mockMessageSender = sender;
   }
 
   /********************
@@ -32,4 +32,6 @@ contract MockOVMCrossDomainMessenger is iOVM_CrossDomainMessenger {
   function sendMessage(address _target, bytes calldata _message, uint32) external override {
     Address.functionCall(_target, _message, "sendMessage reverted");
   }
+
 }
+
diff --git a/contracts/src/v0.8/l2ep/test/mocks/scroll/MockScrollCrossDomainMessenger.sol b/contracts/src/v0.8/l2ep/test/mocks/scroll/MockScrollCrossDomainMessenger.sol
index 562da37aa01..6e7a4357703 100644
--- a/contracts/src/v0.8/l2ep/test/mocks/scroll/MockScrollCrossDomainMessenger.sol
+++ b/contracts/src/v0.8/l2ep/test/mocks/scroll/MockScrollCrossDomainMessenger.sol
@@ -1,22 +1,22 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.16;
 
-import "../../../../../v0.8/vendor/openzeppelin-solidity/v4.8.3/contracts/utils/Address.sol";
+import {Address} from "../../../../../v0.8/vendor/openzeppelin-solidity/v4.8.3/contracts/utils/Address.sol";
 import {IScrollMessenger} from "@scroll-tech/contracts/libraries/IScrollMessenger.sol";
 
 contract MockScrollCrossDomainMessenger is IScrollMessenger {
-  address internal mockMessageSender;
+  address internal s_mockMessageSender;
 
   constructor(address sender) {
-    mockMessageSender = sender;
+    s_mockMessageSender = sender;
   }
 
   function xDomainMessageSender() external view override returns (address) {
-    return mockMessageSender;
+    return s_mockMessageSender;
   }
 
   function _setMockMessageSender(address sender) external {
-    mockMessageSender = sender;
+    s_mockMessageSender = sender;
   }
 
   /// *****************************
@@ -36,4 +36,6 @@ contract MockScrollCrossDomainMessenger is IScrollMessenger {
   function sendMessage(address _target, uint256, bytes calldata _message, uint256, address) external payable override {
     Address.functionCall(_target, _message, "sendMessage reverted");
   }
+
 }
+