diff --git a/interfaces/IIsmpModule.sol b/interfaces/IIsmpModule.sol
index c8d70c4..1825db3 100644
--- a/interfaces/IIsmpModule.sol
+++ b/interfaces/IIsmpModule.sol
@@ -4,9 +4,10 @@ pragma solidity 0.8.17;
 import {PostRequest, PostResponse, GetResponse, GetRequest} from "./Message.sol";
 import {DispatchPost, DispatchPostResponse, DispatchGet} from "./IDispatcher.sol";
 import {IIsmpHost} from "./IIsmpHost.sol";
-import {Context} from "openzeppelin/utils/Context.sol";
-import {IERC20} from "openzeppelin/token/ERC20/IERC20.sol";
-import {SafeERC20} from "openzeppelin/token/ERC20/utils/SafeERC20.sol";
+
+import {Context} from "@openzeppelin/contracts/utils/Context.sol";
+import {IERC20} from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
+import {SafeERC20} from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
 
 struct IncomingPostRequest {
 	// The Post request
diff --git a/interfaces/StateMachine.sol b/interfaces/StateMachine.sol
index bb0dcb1..2a5c19d 100644
--- a/interfaces/StateMachine.sol
+++ b/interfaces/StateMachine.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: UNLICENSED
 pragma solidity 0.8.17;
 
-import {Strings} from "openzeppelin/utils/Strings.sol";
+import {Strings} from "@openzeppelin/contracts/utils/Strings.sol";
 
 library StateMachine {
 	/// @notice The identifier for the relay chain.
diff --git a/package.json b/package.json
index 828f1c4..bccf2cf 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@polytope-labs/ismp-solidity",
-	"version": "0.6.1",
+	"version": "0.6.2",
 	"description": "Hyperbridge Solidity SDK for the Interoperable state machine protocol",
 	"author": "Polytope Labs <hello@polytope.technology>",
 	"license": "Apache-2.0",
diff --git a/remappings.txt b/remappings.txt
index a1a1b0c..1234135 100644
--- a/remappings.txt
+++ b/remappings.txt
@@ -1,2 +1,2 @@
-openzeppelin/=node_modules/openzeppelin-solidity/contracts/
+@openzeppelin/=node_modules/openzeppelin-solidity
 @polytope-labs/solidity-merkle-trees/=node_modules/@polytope-labs/solidity-merkle-trees/src/