diff --git a/packages/core-cairo/src/add-pausable.ts b/packages/core-cairo/src/add-pausable.ts
index dfaa4f2a8..edd997221 100644
--- a/packages/core-cairo/src/add-pausable.ts
+++ b/packages/core-cairo/src/add-pausable.ts
@@ -19,7 +19,7 @@ export function addPausable(c: ContractBuilder, access: Access, pausableFns: Bas
 
 const modules = defineModules( {
   Pausable: {
-    path: 'openzeppelin/security/pausable', 
+    path: 'openzeppelin.security.pausable.library', 
     useNamespace: true
   },
 });
diff --git a/packages/core-cairo/src/custom.test.ts.md b/packages/core-cairo/src/custom.test.ts.md
index 1c1ab71b0..56b44ab9a 100644
--- a/packages/core-cairo/src/custom.test.ts.md
+++ b/packages/core-cairo/src/custom.test.ts.md
@@ -23,8 +23,8 @@ Generated by [AVA](https://avajs.dev).
     ␊
     from starkware.cairo.common.cairo_builtins import HashBuiltin␊
     ␊
-    from openzeppelin.security.pausable import Pausable␊
-    from openzeppelin.access.ownable import Ownable␊
+    from openzeppelin.security.pausable.library import Pausable␊
+    from openzeppelin.access.ownable.library import Ownable␊
     ␊
     @constructor␊
     func constructor{␊
@@ -154,7 +154,7 @@ Generated by [AVA](https://avajs.dev).
     ␊
     from starkware.cairo.common.cairo_builtins import HashBuiltin␊
     ␊
-    from openzeppelin.access.ownable import Ownable␊
+    from openzeppelin.access.ownable.library import Ownable␊
     ␊
     @constructor␊
     func constructor{␊
@@ -201,8 +201,8 @@ Generated by [AVA](https://avajs.dev).
     ␊
     from starkware.cairo.common.cairo_builtins import HashBuiltin␊
     ␊
-    from openzeppelin.access.accesscontrol import AccessControl␊
-    from openzeppelin.utils.constants import DEFAULT_ADMIN_ROLE␊
+    from openzeppelin.access.accesscontrol.library import AccessControl␊
+    from openzeppelin.utils.constants.library import DEFAULT_ADMIN_ROLE␊
     ␊
     @constructor␊
     func constructor{␊
@@ -285,8 +285,8 @@ Generated by [AVA](https://avajs.dev).
     ␊
     from starkware.cairo.common.cairo_builtins import HashBuiltin␊
     ␊
-    from openzeppelin.security.pausable import Pausable␊
-    from openzeppelin.access.ownable import Ownable␊
+    from openzeppelin.security.pausable.library import Pausable␊
+    from openzeppelin.access.ownable.library import Ownable␊
     ␊
     @constructor␊
     func constructor{␊
diff --git a/packages/core-cairo/src/custom.test.ts.snap b/packages/core-cairo/src/custom.test.ts.snap
index 71573ed30..3a86a9fb7 100644
Binary files a/packages/core-cairo/src/custom.test.ts.snap and b/packages/core-cairo/src/custom.test.ts.snap differ
diff --git a/packages/core-cairo/src/erc20.test.ts.md b/packages/core-cairo/src/erc20.test.ts.md
index 9fbd19f2c..41c193022 100644
--- a/packages/core-cairo/src/erc20.test.ts.md
+++ b/packages/core-cairo/src/erc20.test.ts.md
@@ -315,8 +315,8 @@ Generated by [AVA](https://avajs.dev).
     from starkware.cairo.common.bool import TRUE␊
     ␊
     from openzeppelin.token.erc20.library import ERC20␊
-    from openzeppelin.security.pausable import Pausable␊
-    from openzeppelin.access.ownable import Ownable␊
+    from openzeppelin.security.pausable.library import Pausable␊
+    from openzeppelin.access.ownable.library import Ownable␊
     ␊
     @constructor␊
     func constructor{␊
@@ -518,9 +518,9 @@ Generated by [AVA](https://avajs.dev).
     from starkware.cairo.common.bool import TRUE␊
     ␊
     from openzeppelin.token.erc20.library import ERC20␊
-    from openzeppelin.security.pausable import Pausable␊
-    from openzeppelin.access.accesscontrol import AccessControl␊
-    from openzeppelin.utils.constants import DEFAULT_ADMIN_ROLE␊
+    from openzeppelin.security.pausable.library import Pausable␊
+    from openzeppelin.access.accesscontrol.library import AccessControl␊
+    from openzeppelin.utils.constants.library import DEFAULT_ADMIN_ROLE␊
     ␊
     const PAUSER_ROLE = 0x65d7a28e3265b37a6474929f336521b332c1681b933f6cb9f3376673440d862 # keccak256('PAUSER_ROLE')[0:251 bits]␊
     ␊
@@ -758,8 +758,8 @@ Generated by [AVA](https://avajs.dev).
     from starkware.starknet.common.syscalls import get_caller_address␊
     ␊
     from openzeppelin.token.erc20.library import ERC20␊
-    from openzeppelin.security.pausable import Pausable␊
-    from openzeppelin.access.ownable import Ownable␊
+    from openzeppelin.security.pausable.library import Pausable␊
+    from openzeppelin.access.ownable.library import Ownable␊
     ␊
     @constructor␊
     func constructor{␊
@@ -1261,7 +1261,7 @@ Generated by [AVA](https://avajs.dev).
     from starkware.cairo.common.bool import TRUE␊
     ␊
     from openzeppelin.token.erc20.library import ERC20␊
-    from openzeppelin.access.ownable import Ownable␊
+    from openzeppelin.access.ownable.library import Ownable␊
     ␊
     @constructor␊
     func constructor{␊
@@ -1437,8 +1437,8 @@ Generated by [AVA](https://avajs.dev).
     from starkware.cairo.common.bool import TRUE␊
     ␊
     from openzeppelin.token.erc20.library import ERC20␊
-    from openzeppelin.access.accesscontrol import AccessControl␊
-    from openzeppelin.utils.constants import DEFAULT_ADMIN_ROLE␊
+    from openzeppelin.access.accesscontrol.library import AccessControl␊
+    from openzeppelin.utils.constants.library import DEFAULT_ADMIN_ROLE␊
     ␊
     const MINTER_ROLE = 0x4f96f87f6963bb246f2c30526628466840c642dc5c50d5a67777c6cc0e44ab5 # keccak256('MINTER_ROLE')[0:251 bits]␊
     ␊
@@ -1650,8 +1650,8 @@ Generated by [AVA](https://avajs.dev).
     from starkware.starknet.common.syscalls import get_caller_address␊
     ␊
     from openzeppelin.token.erc20.library import ERC20␊
-    from openzeppelin.security.pausable import Pausable␊
-    from openzeppelin.access.ownable import Ownable␊
+    from openzeppelin.security.pausable.library import Pausable␊
+    from openzeppelin.access.ownable.library import Ownable␊
     from openzeppelin.upgrades.library import Proxy␊
     ␊
     @external␊
@@ -1892,9 +1892,9 @@ Generated by [AVA](https://avajs.dev).
     from starkware.starknet.common.syscalls import get_caller_address␊
     ␊
     from openzeppelin.token.erc20.library import ERC20␊
-    from openzeppelin.security.pausable import Pausable␊
-    from openzeppelin.access.accesscontrol import AccessControl␊
-    from openzeppelin.utils.constants import DEFAULT_ADMIN_ROLE␊
+    from openzeppelin.security.pausable.library import Pausable␊
+    from openzeppelin.access.accesscontrol.library import AccessControl␊
+    from openzeppelin.utils.constants.library import DEFAULT_ADMIN_ROLE␊
     from openzeppelin.upgrades.library import Proxy␊
     ␊
     const PAUSER_ROLE = 0x65d7a28e3265b37a6474929f336521b332c1681b933f6cb9f3376673440d862 # keccak256('PAUSER_ROLE')[0:251 bits]␊
diff --git a/packages/core-cairo/src/erc20.test.ts.snap b/packages/core-cairo/src/erc20.test.ts.snap
index 9137829f8..30eefe170 100644
Binary files a/packages/core-cairo/src/erc20.test.ts.snap and b/packages/core-cairo/src/erc20.test.ts.snap differ
diff --git a/packages/core-cairo/src/erc20.ts b/packages/core-cairo/src/erc20.ts
index bb51891ba..1c229fe51 100644
--- a/packages/core-cairo/src/erc20.ts
+++ b/packages/core-cairo/src/erc20.ts
@@ -227,7 +227,7 @@ function addMintable(c: ContractBuilder, access: Access) {
 
 const modules = defineModules( {
   ERC20: {
-    path: 'openzeppelin/token/erc20/library',
+    path: 'openzeppelin.token.erc20.library',
     useNamespace: true
   },
 
diff --git a/packages/core-cairo/src/erc721.test.ts.md b/packages/core-cairo/src/erc721.test.ts.md
index 1bab93149..6c84ac3e6 100644
--- a/packages/core-cairo/src/erc721.test.ts.md
+++ b/packages/core-cairo/src/erc721.test.ts.md
@@ -16,7 +16,7 @@ Generated by [AVA](https://avajs.dev).
     from starkware.cairo.common.uint256 import Uint256␊
     ␊
     from openzeppelin.token.erc721.library import ERC721␊
-    from openzeppelin.introspection.ERC165 import ERC165␊
+    from openzeppelin.introspection.erc165.library import ERC165␊
     ␊
     @constructor␊
     func constructor{␊
@@ -169,7 +169,7 @@ Generated by [AVA](https://avajs.dev).
     from starkware.cairo.common.uint256 import Uint256␊
     ␊
     from openzeppelin.token.erc721.library import ERC721␊
-    from openzeppelin.introspection.ERC165 import ERC165␊
+    from openzeppelin.introspection.erc165.library import ERC165␊
     ␊
     @constructor␊
     func constructor{␊
@@ -333,9 +333,9 @@ Generated by [AVA](https://avajs.dev).
     from starkware.cairo.common.uint256 import Uint256␊
     ␊
     from openzeppelin.token.erc721.library import ERC721␊
-    from openzeppelin.introspection.ERC165 import ERC165␊
-    from openzeppelin.security.pausable import Pausable␊
-    from openzeppelin.access.ownable import Ownable␊
+    from openzeppelin.introspection.erc165.library import ERC165␊
+    from openzeppelin.security.pausable.library import Pausable␊
+    from openzeppelin.access.ownable.library import Ownable␊
     ␊
     @constructor␊
     func constructor{␊
@@ -545,8 +545,8 @@ Generated by [AVA](https://avajs.dev).
     from starkware.cairo.common.uint256 import Uint256␊
     ␊
     from openzeppelin.token.erc721.library import ERC721␊
-    from openzeppelin.introspection.ERC165 import ERC165␊
-    from openzeppelin.access.ownable import Ownable␊
+    from openzeppelin.introspection.erc165.library import ERC165␊
+    from openzeppelin.access.ownable.library import Ownable␊
     ␊
     @constructor␊
     func constructor{␊
@@ -732,9 +732,9 @@ Generated by [AVA](https://avajs.dev).
     from starkware.cairo.common.uint256 import Uint256␊
     ␊
     from openzeppelin.token.erc721.library import ERC721␊
-    from openzeppelin.introspection.ERC165 import ERC165␊
-    from openzeppelin.access.accesscontrol import AccessControl␊
-    from openzeppelin.utils.constants import DEFAULT_ADMIN_ROLE␊
+    from openzeppelin.introspection.erc165.library import ERC165␊
+    from openzeppelin.access.accesscontrol.library import AccessControl␊
+    from openzeppelin.utils.constants.library import DEFAULT_ADMIN_ROLE␊
     ␊
     const MINTER_ROLE = 0x4f96f87f6963bb246f2c30526628466840c642dc5c50d5a67777c6cc0e44ab5 # keccak256('MINTER_ROLE')[0:251 bits]␊
     ␊
@@ -955,9 +955,9 @@ Generated by [AVA](https://avajs.dev).
     from starkware.cairo.common.uint256 import Uint256␊
     ␊
     from openzeppelin.token.erc721.library import ERC721␊
-    from openzeppelin.introspection.ERC165 import ERC165␊
-    from openzeppelin.security.pausable import Pausable␊
-    from openzeppelin.access.ownable import Ownable␊
+    from openzeppelin.introspection.erc165.library import ERC165␊
+    from openzeppelin.security.pausable.library import Pausable␊
+    from openzeppelin.access.ownable.library import Ownable␊
     from openzeppelin.upgrades.library import Proxy␊
     ␊
     @external␊
diff --git a/packages/core-cairo/src/erc721.test.ts.snap b/packages/core-cairo/src/erc721.test.ts.snap
index 7dfae4207..d41fb2f4d 100644
Binary files a/packages/core-cairo/src/erc721.test.ts.snap and b/packages/core-cairo/src/erc721.test.ts.snap differ
diff --git a/packages/core-cairo/src/erc721.ts b/packages/core-cairo/src/erc721.ts
index 522f42bb6..6019bb5fa 100644
--- a/packages/core-cairo/src/erc721.ts
+++ b/packages/core-cairo/src/erc721.ts
@@ -136,12 +136,12 @@ function addMintable(c: ContractBuilder, access: Access) {
 
 const modules = defineModules( {
   ERC165: {
-    path: 'openzeppelin.introspection.ERC165',
+    path: 'openzeppelin.introspection.erc165.library',
     useNamespace: true
   },
 
   ERC721: {
-    path: 'openzeppelin/token/erc721/library',
+    path: 'openzeppelin.token.erc721.library',
     useNamespace: true
   },
 })
diff --git a/packages/core-cairo/src/set-access-control.ts b/packages/core-cairo/src/set-access-control.ts
index 428a19b73..ed18e8bbe 100644
--- a/packages/core-cairo/src/set-access-control.ts
+++ b/packages/core-cairo/src/set-access-control.ts
@@ -81,15 +81,15 @@ function importDefaultAdminRole(c: ContractBuilder) {
 
 const modules = defineModules( {
   Ownable: {
-    path: 'openzeppelin/access/ownable',
+    path: 'openzeppelin.access.ownable.library',
     useNamespace: true
   },
   AccessControl: {
-    path: 'openzeppelin/access/accesscontrol',
+    path: 'openzeppelin.access.accesscontrol.library',
     useNamespace: true
   },
   constants: {
-    path: 'openzeppelin/utils/constants',
+    path: 'openzeppelin.utils.constants.library',
     useNamespace: false
   }
 })
diff --git a/packages/core-cairo/src/set-upgradeable.ts b/packages/core-cairo/src/set-upgradeable.ts
index 5770ab43b..10f9be745 100644
--- a/packages/core-cairo/src/set-upgradeable.ts
+++ b/packages/core-cairo/src/set-upgradeable.ts
@@ -27,7 +27,7 @@ export function setUpgradeable(c: ContractBuilder, upgradeable: Upgradeable) {
 
 const modules = defineModules( {
   Proxy: {
-    path: 'openzeppelin/upgrades/library',
+    path: 'openzeppelin.upgrades.library',
     useNamespace: true
   },
 });
diff --git a/packages/core-cairo/src/test.ts b/packages/core-cairo/src/test.ts
index 873e7c7db..0fef5a08d 100644
--- a/packages/core-cairo/src/test.ts
+++ b/packages/core-cairo/src/test.ts
@@ -19,7 +19,7 @@ function isAccessControlRequired(opts: GenericOptions) {
 
 test('is access control required', async t => {
   for (const contract of generateSources('all')) {
-    const regexOwnable = /(from openzeppelin.access.ownable import Ownable)/gm;
+    const regexOwnable = /(from openzeppelin.access.ownable.library import Ownable)/gm;
 
     if (!contract.options.access) {
       if (isAccessControlRequired(contract.options)) {