diff --git a/packages/core-cairo/src/erc721.test.ts.md b/packages/core-cairo/src/erc721.test.ts.md
index b2f140ff..7fbf37e2 100644
--- a/packages/core-cairo/src/erc721.test.ts.md
+++ b/packages/core-cairo/src/erc721.test.ts.md
@@ -15,20 +15,7 @@ Generated by [AVA](https://avajs.dev).
     from starkware.cairo.common.cairo_builtins import HashBuiltin␊
     from starkware.cairo.common.uint256 import Uint256␊
     ␊
-    from openzeppelin.token.erc721.library import (␊
-        ERC721_name,␊
-        ERC721_symbol,␊
-        ERC721_balanceOf,␊
-        ERC721_ownerOf,␊
-        ERC721_getApproved,␊
-        ERC721_isApprovedForAll,␊
-        ERC721_tokenURI,␊
-        ERC721_approve,␊
-        ERC721_setApprovalForAll,␊
-        ERC721_transferFrom,␊
-        ERC721_safeTransferFrom,␊
-        ERC721_initializer,␊
-    )␊
+    from openzeppelin.token.erc721.library import ERC721␊
     from openzeppelin.introspection.ERC165 import ERC165␊
     ␊
     @constructor␊
@@ -37,7 +24,7 @@ Generated by [AVA](https://avajs.dev).
             pedersen_ptr: HashBuiltin*,␊
             range_check_ptr␊
         }():␊
-        ERC721_initializer('MyToken', 'MTK')␊
+        ERC721.initializer('MyToken', 'MTK')␊
         return ()␊
     end␊
     ␊
@@ -61,7 +48,7 @@ Generated by [AVA](https://avajs.dev).
             pedersen_ptr: HashBuiltin*,␊
             range_check_ptr␊
         }() -> (name: felt):␊
-        let (name) = ERC721_name()␊
+        let (name) = ERC721.name()␊
         return (name)␊
     end␊
     ␊
@@ -71,7 +58,7 @@ Generated by [AVA](https://avajs.dev).
             pedersen_ptr: HashBuiltin*,␊
             range_check_ptr␊
         }() -> (symbol: felt):␊
-        let (symbol) = ERC721_symbol()␊
+        let (symbol) = ERC721.symbol()␊
         return (symbol)␊
     end␊
     ␊
@@ -81,7 +68,7 @@ Generated by [AVA](https://avajs.dev).
             pedersen_ptr: HashBuiltin*,␊
             range_check_ptr␊
         }(owner: felt) -> (balance: Uint256):␊
-        let (balance) = ERC721_balanceOf(owner)␊
+        let (balance) = ERC721.balance_of(owner)␊
         return (balance)␊
     end␊
     ␊
@@ -91,7 +78,7 @@ Generated by [AVA](https://avajs.dev).
             pedersen_ptr: HashBuiltin*,␊
             range_check_ptr␊
         }(token_id: Uint256) -> (owner: felt):␊
-        let (owner) = ERC721_ownerOf(token_id)␊
+        let (owner) = ERC721.owner_of(token_id)␊
         return (owner)␊
     end␊
     ␊
@@ -101,7 +88,7 @@ Generated by [AVA](https://avajs.dev).
             pedersen_ptr: HashBuiltin*,␊
             range_check_ptr␊
         }(token_id: Uint256) -> (approved: felt):␊
-        let (approved) = ERC721_getApproved(token_id)␊
+        let (approved) = ERC721.get_approved(token_id)␊
         return (approved)␊
     end␊
     ␊
@@ -111,7 +98,7 @@ Generated by [AVA](https://avajs.dev).
             pedersen_ptr: HashBuiltin*,␊
             range_check_ptr␊
         }(owner: felt, operator: felt) -> (isApproved: felt):␊
-        let (isApproved) = ERC721_isApprovedForAll(owner, operator)␊
+        let (isApproved) = ERC721.is_approved_for_all(owner, operator)␊
         return (isApproved)␊
     end␊
     ␊
@@ -121,7 +108,7 @@ Generated by [AVA](https://avajs.dev).
             pedersen_ptr: HashBuiltin*,␊
             range_check_ptr␊
         }(tokenId: Uint256) -> (tokenURI: felt):␊
-        let (tokenURI) = ERC721_tokenURI(tokenId)␊
+        let (tokenURI) = ERC721.token_uri(tokenId)␊
         return (tokenURI)␊
     end␊
     ␊
@@ -135,7 +122,7 @@ Generated by [AVA](https://avajs.dev).
             pedersen_ptr: HashBuiltin*,␊
             range_check_ptr␊
         }(to: felt, tokenId: Uint256):␊
-        ERC721_approve(to, tokenId)␊
+        ERC721.approve(to, tokenId)␊
         return ()␊
     end␊
     ␊
@@ -145,7 +132,7 @@ Generated by [AVA](https://avajs.dev).
             pedersen_ptr: HashBuiltin*,␊
             range_check_ptr␊
         }(operator: felt, approved: felt):␊
-        ERC721_setApprovalForAll(operator, approved)␊
+        ERC721.set_approval_for_all(operator, approved)␊
         return ()␊
     end␊
     ␊
@@ -155,7 +142,7 @@ Generated by [AVA](https://avajs.dev).
             pedersen_ptr: HashBuiltin*,␊
             range_check_ptr␊
         }(from_: felt, to: felt, tokenId: Uint256):␊
-        ERC721_transferFrom(from_, to, tokenId)␊
+        ERC721.transfer_from(from_, to, tokenId)␊
         return ()␊
     end␊
     ␊
@@ -165,7 +152,7 @@ Generated by [AVA](https://avajs.dev).
             pedersen_ptr: HashBuiltin*,␊
             range_check_ptr␊
         }(from_: felt, to: felt, tokenId: Uint256, data_len: felt, data: felt*):␊
-        ERC721_safeTransferFrom(from_, to, tokenId, data_len, data)␊
+        ERC721.safe_transfer_from(from_, to, tokenId, data_len, data)␊
         return ()␊
     end␊
     `
@@ -181,22 +168,7 @@ Generated by [AVA](https://avajs.dev).
     from starkware.cairo.common.cairo_builtins import HashBuiltin␊
     from starkware.cairo.common.uint256 import Uint256␊
     ␊
-    from openzeppelin.token.erc721.library import (␊
-        ERC721_name,␊
-        ERC721_symbol,␊
-        ERC721_balanceOf,␊
-        ERC721_ownerOf,␊
-        ERC721_getApproved,␊
-        ERC721_isApprovedForAll,␊
-        ERC721_tokenURI,␊
-        ERC721_approve,␊
-        ERC721_setApprovalForAll,␊
-        ERC721_transferFrom,␊
-        ERC721_safeTransferFrom,␊
-        ERC721_burn,␊
-        ERC721_initializer,␊
-        ERC721_only_token_owner,␊
-    )␊
+    from openzeppelin.token.erc721.library import ERC721␊
     from openzeppelin.introspection.ERC165 import ERC165␊
     ␊
     @constructor␊
@@ -205,7 +177,7 @@ Generated by [AVA](https://avajs.dev).
             pedersen_ptr: HashBuiltin*,␊
             range_check_ptr␊
         }():␊
-        ERC721_initializer('MyToken', 'MTK')␊
+        ERC721.initializer('MyToken', 'MTK')␊
         return ()␊
     end␊
     ␊
@@ -229,7 +201,7 @@ Generated by [AVA](https://avajs.dev).
             pedersen_ptr: HashBuiltin*,␊
             range_check_ptr␊
         }() -> (name: felt):␊
-        let (name) = ERC721_name()␊
+        let (name) = ERC721.name()␊
         return (name)␊
     end␊
     ␊
@@ -239,7 +211,7 @@ Generated by [AVA](https://avajs.dev).
             pedersen_ptr: HashBuiltin*,␊
             range_check_ptr␊
         }() -> (symbol: felt):␊
-        let (symbol) = ERC721_symbol()␊
+        let (symbol) = ERC721.symbol()␊
         return (symbol)␊
     end␊
     ␊
@@ -249,7 +221,7 @@ Generated by [AVA](https://avajs.dev).
             pedersen_ptr: HashBuiltin*,␊
             range_check_ptr␊
         }(owner: felt) -> (balance: Uint256):␊
-        let (balance) = ERC721_balanceOf(owner)␊
+        let (balance) = ERC721.balance_of(owner)␊
         return (balance)␊
     end␊
     ␊
@@ -259,7 +231,7 @@ Generated by [AVA](https://avajs.dev).
             pedersen_ptr: HashBuiltin*,␊
             range_check_ptr␊
         }(token_id: Uint256) -> (owner: felt):␊
-        let (owner) = ERC721_ownerOf(token_id)␊
+        let (owner) = ERC721.owner_of(token_id)␊
         return (owner)␊
     end␊
     ␊
@@ -269,7 +241,7 @@ Generated by [AVA](https://avajs.dev).
             pedersen_ptr: HashBuiltin*,␊
             range_check_ptr␊
         }(token_id: Uint256) -> (approved: felt):␊
-        let (approved) = ERC721_getApproved(token_id)␊
+        let (approved) = ERC721.get_approved(token_id)␊
         return (approved)␊
     end␊
     ␊
@@ -279,7 +251,7 @@ Generated by [AVA](https://avajs.dev).
             pedersen_ptr: HashBuiltin*,␊
             range_check_ptr␊
         }(owner: felt, operator: felt) -> (isApproved: felt):␊
-        let (isApproved) = ERC721_isApprovedForAll(owner, operator)␊
+        let (isApproved) = ERC721.is_approved_for_all(owner, operator)␊
         return (isApproved)␊
     end␊
     ␊
@@ -289,7 +261,7 @@ Generated by [AVA](https://avajs.dev).
             pedersen_ptr: HashBuiltin*,␊
             range_check_ptr␊
         }(tokenId: Uint256) -> (tokenURI: felt):␊
-        let (tokenURI) = ERC721_tokenURI(tokenId)␊
+        let (tokenURI) = ERC721.token_uri(tokenId)␊
         return (tokenURI)␊
     end␊
     ␊
@@ -303,7 +275,7 @@ Generated by [AVA](https://avajs.dev).
             pedersen_ptr: HashBuiltin*,␊
             range_check_ptr␊
         }(to: felt, tokenId: Uint256):␊
-        ERC721_approve(to, tokenId)␊
+        ERC721.approve(to, tokenId)␊
         return ()␊
     end␊
     ␊
@@ -313,7 +285,7 @@ Generated by [AVA](https://avajs.dev).
             pedersen_ptr: HashBuiltin*,␊
             range_check_ptr␊
         }(operator: felt, approved: felt):␊
-        ERC721_setApprovalForAll(operator, approved)␊
+        ERC721.set_approval_for_all(operator, approved)␊
         return ()␊
     end␊
     ␊
@@ -323,7 +295,7 @@ Generated by [AVA](https://avajs.dev).
             pedersen_ptr: HashBuiltin*,␊
             range_check_ptr␊
         }(from_: felt, to: felt, tokenId: Uint256):␊
-        ERC721_transferFrom(from_, to, tokenId)␊
+        ERC721.transfer_from(from_, to, tokenId)␊
         return ()␊
     end␊
     ␊
@@ -333,7 +305,7 @@ Generated by [AVA](https://avajs.dev).
             pedersen_ptr: HashBuiltin*,␊
             range_check_ptr␊
         }(from_: felt, to: felt, tokenId: Uint256, data_len: felt, data: felt*):␊
-        ERC721_safeTransferFrom(from_, to, tokenId, data_len, data)␊
+        ERC721.safe_transfer_from(from_, to, tokenId, data_len, data)␊
         return ()␊
     end␊
     ␊
@@ -343,8 +315,8 @@ Generated by [AVA](https://avajs.dev).
             pedersen_ptr: HashBuiltin*,␊
             range_check_ptr␊
         }(tokenId: Uint256):␊
-        ERC721_only_token_owner(tokenId)␊
-        ERC721_burn(tokenId)␊
+        ERC721.assert_only_token_owner(tokenId)␊
+        ERC721._burn(tokenId)␊
         return ()␊
     end␊
     `
@@ -360,20 +332,7 @@ Generated by [AVA](https://avajs.dev).
     from starkware.cairo.common.cairo_builtins import HashBuiltin␊
     from starkware.cairo.common.uint256 import Uint256␊
     ␊
-    from openzeppelin.token.erc721.library import (␊
-        ERC721_name,␊
-        ERC721_symbol,␊
-        ERC721_balanceOf,␊
-        ERC721_ownerOf,␊
-        ERC721_getApproved,␊
-        ERC721_isApprovedForAll,␊
-        ERC721_tokenURI,␊
-        ERC721_approve,␊
-        ERC721_setApprovalForAll,␊
-        ERC721_transferFrom,␊
-        ERC721_safeTransferFrom,␊
-        ERC721_initializer,␊
-    )␊
+    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␊
@@ -384,7 +343,7 @@ Generated by [AVA](https://avajs.dev).
             pedersen_ptr: HashBuiltin*,␊
             range_check_ptr␊
         }(owner: felt):␊
-        ERC721_initializer('MyToken', 'MTK')␊
+        ERC721.initializer('MyToken', 'MTK')␊
         Ownable.initializer(owner)␊
         return ()␊
     end␊
@@ -409,7 +368,7 @@ Generated by [AVA](https://avajs.dev).
             pedersen_ptr: HashBuiltin*,␊
             range_check_ptr␊
         }() -> (name: felt):␊
-        let (name) = ERC721_name()␊
+        let (name) = ERC721.name()␊
         return (name)␊
     end␊
     ␊
@@ -419,7 +378,7 @@ Generated by [AVA](https://avajs.dev).
             pedersen_ptr: HashBuiltin*,␊
             range_check_ptr␊
         }() -> (symbol: felt):␊
-        let (symbol) = ERC721_symbol()␊
+        let (symbol) = ERC721.symbol()␊
         return (symbol)␊
     end␊
     ␊
@@ -429,7 +388,7 @@ Generated by [AVA](https://avajs.dev).
             pedersen_ptr: HashBuiltin*,␊
             range_check_ptr␊
         }(owner: felt) -> (balance: Uint256):␊
-        let (balance) = ERC721_balanceOf(owner)␊
+        let (balance) = ERC721.balance_of(owner)␊
         return (balance)␊
     end␊
     ␊
@@ -439,7 +398,7 @@ Generated by [AVA](https://avajs.dev).
             pedersen_ptr: HashBuiltin*,␊
             range_check_ptr␊
         }(token_id: Uint256) -> (owner: felt):␊
-        let (owner) = ERC721_ownerOf(token_id)␊
+        let (owner) = ERC721.owner_of(token_id)␊
         return (owner)␊
     end␊
     ␊
@@ -449,7 +408,7 @@ Generated by [AVA](https://avajs.dev).
             pedersen_ptr: HashBuiltin*,␊
             range_check_ptr␊
         }(token_id: Uint256) -> (approved: felt):␊
-        let (approved) = ERC721_getApproved(token_id)␊
+        let (approved) = ERC721.get_approved(token_id)␊
         return (approved)␊
     end␊
     ␊
@@ -459,7 +418,7 @@ Generated by [AVA](https://avajs.dev).
             pedersen_ptr: HashBuiltin*,␊
             range_check_ptr␊
         }(owner: felt, operator: felt) -> (isApproved: felt):␊
-        let (isApproved) = ERC721_isApprovedForAll(owner, operator)␊
+        let (isApproved) = ERC721.is_approved_for_all(owner, operator)␊
         return (isApproved)␊
     end␊
     ␊
@@ -469,7 +428,7 @@ Generated by [AVA](https://avajs.dev).
             pedersen_ptr: HashBuiltin*,␊
             range_check_ptr␊
         }(tokenId: Uint256) -> (tokenURI: felt):␊
-        let (tokenURI) = ERC721_tokenURI(tokenId)␊
+        let (tokenURI) = ERC721.token_uri(tokenId)␊
         return (tokenURI)␊
     end␊
     ␊
@@ -494,7 +453,7 @@ Generated by [AVA](https://avajs.dev).
             range_check_ptr␊
         }(to: felt, tokenId: Uint256):␊
         Pausable.assert_not_paused()␊
-        ERC721_approve(to, tokenId)␊
+        ERC721.approve(to, tokenId)␊
         return ()␊
     end␊
     ␊
@@ -505,7 +464,7 @@ Generated by [AVA](https://avajs.dev).
             range_check_ptr␊
         }(operator: felt, approved: felt):␊
         Pausable.assert_not_paused()␊
-        ERC721_setApprovalForAll(operator, approved)␊
+        ERC721.set_approval_for_all(operator, approved)␊
         return ()␊
     end␊
     ␊
@@ -516,7 +475,7 @@ Generated by [AVA](https://avajs.dev).
             range_check_ptr␊
         }(from_: felt, to: felt, tokenId: Uint256):␊
         Pausable.assert_not_paused()␊
-        ERC721_transferFrom(from_, to, tokenId)␊
+        ERC721.transfer_from(from_, to, tokenId)␊
         return ()␊
     end␊
     ␊
@@ -527,7 +486,7 @@ Generated by [AVA](https://avajs.dev).
             range_check_ptr␊
         }(from_: felt, to: felt, tokenId: Uint256, data_len: felt, data: felt*):␊
         Pausable.assert_not_paused()␊
-        ERC721_safeTransferFrom(from_, to, tokenId, data_len, data)␊
+        ERC721.safe_transfer_from(from_, to, tokenId, data_len, data)␊
         return ()␊
     end␊
     ␊
@@ -585,22 +544,7 @@ Generated by [AVA](https://avajs.dev).
     from starkware.cairo.common.cairo_builtins import HashBuiltin␊
     from starkware.cairo.common.uint256 import Uint256␊
     ␊
-    from openzeppelin.token.erc721.library import (␊
-        ERC721_name,␊
-        ERC721_symbol,␊
-        ERC721_balanceOf,␊
-        ERC721_ownerOf,␊
-        ERC721_getApproved,␊
-        ERC721_isApprovedForAll,␊
-        ERC721_tokenURI,␊
-        ERC721_approve,␊
-        ERC721_setApprovalForAll,␊
-        ERC721_transferFrom,␊
-        ERC721_safeTransferFrom,␊
-        ERC721_safeMint,␊
-        ERC721_initializer,␊
-        ERC721_setTokenURI,␊
-    )␊
+    from openzeppelin.token.erc721.library import ERC721␊
     from openzeppelin.introspection.ERC165 import ERC165␊
     from openzeppelin.access.ownable import Ownable␊
     ␊
@@ -610,7 +554,7 @@ Generated by [AVA](https://avajs.dev).
             pedersen_ptr: HashBuiltin*,␊
             range_check_ptr␊
         }(owner: felt):␊
-        ERC721_initializer('MyToken', 'MTK')␊
+        ERC721.initializer('MyToken', 'MTK')␊
         Ownable.initializer(owner)␊
         return ()␊
     end␊
@@ -635,7 +579,7 @@ Generated by [AVA](https://avajs.dev).
             pedersen_ptr: HashBuiltin*,␊
             range_check_ptr␊
         }() -> (name: felt):␊
-        let (name) = ERC721_name()␊
+        let (name) = ERC721.name()␊
         return (name)␊
     end␊
     ␊
@@ -645,7 +589,7 @@ Generated by [AVA](https://avajs.dev).
             pedersen_ptr: HashBuiltin*,␊
             range_check_ptr␊
         }() -> (symbol: felt):␊
-        let (symbol) = ERC721_symbol()␊
+        let (symbol) = ERC721.symbol()␊
         return (symbol)␊
     end␊
     ␊
@@ -655,7 +599,7 @@ Generated by [AVA](https://avajs.dev).
             pedersen_ptr: HashBuiltin*,␊
             range_check_ptr␊
         }(owner: felt) -> (balance: Uint256):␊
-        let (balance) = ERC721_balanceOf(owner)␊
+        let (balance) = ERC721.balance_of(owner)␊
         return (balance)␊
     end␊
     ␊
@@ -665,7 +609,7 @@ Generated by [AVA](https://avajs.dev).
             pedersen_ptr: HashBuiltin*,␊
             range_check_ptr␊
         }(token_id: Uint256) -> (owner: felt):␊
-        let (owner) = ERC721_ownerOf(token_id)␊
+        let (owner) = ERC721.owner_of(token_id)␊
         return (owner)␊
     end␊
     ␊
@@ -675,7 +619,7 @@ Generated by [AVA](https://avajs.dev).
             pedersen_ptr: HashBuiltin*,␊
             range_check_ptr␊
         }(token_id: Uint256) -> (approved: felt):␊
-        let (approved) = ERC721_getApproved(token_id)␊
+        let (approved) = ERC721.get_approved(token_id)␊
         return (approved)␊
     end␊
     ␊
@@ -685,7 +629,7 @@ Generated by [AVA](https://avajs.dev).
             pedersen_ptr: HashBuiltin*,␊
             range_check_ptr␊
         }(owner: felt, operator: felt) -> (isApproved: felt):␊
-        let (isApproved) = ERC721_isApprovedForAll(owner, operator)␊
+        let (isApproved) = ERC721.is_approved_for_all(owner, operator)␊
         return (isApproved)␊
     end␊
     ␊
@@ -695,7 +639,7 @@ Generated by [AVA](https://avajs.dev).
             pedersen_ptr: HashBuiltin*,␊
             range_check_ptr␊
         }(tokenId: Uint256) -> (tokenURI: felt):␊
-        let (tokenURI) = ERC721_tokenURI(tokenId)␊
+        let (tokenURI) = ERC721.token_uri(tokenId)␊
         return (tokenURI)␊
     end␊
     ␊
@@ -709,7 +653,7 @@ Generated by [AVA](https://avajs.dev).
             pedersen_ptr: HashBuiltin*,␊
             range_check_ptr␊
         }(to: felt, tokenId: Uint256):␊
-        ERC721_approve(to, tokenId)␊
+        ERC721.approve(to, tokenId)␊
         return ()␊
     end␊
     ␊
@@ -719,7 +663,7 @@ Generated by [AVA](https://avajs.dev).
             pedersen_ptr: HashBuiltin*,␊
             range_check_ptr␊
         }(operator: felt, approved: felt):␊
-        ERC721_setApprovalForAll(operator, approved)␊
+        ERC721.set_approval_for_all(operator, approved)␊
         return ()␊
     end␊
     ␊
@@ -729,7 +673,7 @@ Generated by [AVA](https://avajs.dev).
             pedersen_ptr: HashBuiltin*,␊
             range_check_ptr␊
         }(from_: felt, to: felt, tokenId: Uint256):␊
-        ERC721_transferFrom(from_, to, tokenId)␊
+        ERC721.transfer_from(from_, to, tokenId)␊
         return ()␊
     end␊
     ␊
@@ -739,7 +683,7 @@ Generated by [AVA](https://avajs.dev).
             pedersen_ptr: HashBuiltin*,␊
             range_check_ptr␊
         }(from_: felt, to: felt, tokenId: Uint256, data_len: felt, data: felt*):␊
-        ERC721_safeTransferFrom(from_, to, tokenId, data_len, data)␊
+        ERC721.safe_transfer_from(from_, to, tokenId, data_len, data)␊
         return ()␊
     end␊
     ␊
@@ -750,8 +694,8 @@ Generated by [AVA](https://avajs.dev).
             range_check_ptr␊
         }(to: felt, tokenId: Uint256, data_len: felt, data: felt*, tokenURI: felt):␊
         Ownable.assert_only_owner()␊
-        ERC721_safeMint(to, tokenId, data_len, data)␊
-        ERC721_setTokenURI(tokenId, tokenURI)␊
+        ERC721._safe_mint(to, tokenId, data_len, data)␊
+        ERC721._set_token_uri(tokenId, tokenURI)␊
         return ()␊
     end␊
     ␊
@@ -787,24 +731,7 @@ Generated by [AVA](https://avajs.dev).
     from starkware.cairo.common.cairo_builtins import HashBuiltin␊
     from starkware.cairo.common.uint256 import Uint256␊
     ␊
-    from openzeppelin.token.erc721.library import (␊
-        ERC721_name,␊
-        ERC721_symbol,␊
-        ERC721_balanceOf,␊
-        ERC721_ownerOf,␊
-        ERC721_getApproved,␊
-        ERC721_isApprovedForAll,␊
-        ERC721_tokenURI,␊
-        ERC721_approve,␊
-        ERC721_setApprovalForAll,␊
-        ERC721_transferFrom,␊
-        ERC721_safeTransferFrom,␊
-        ERC721_burn,␊
-        ERC721_safeMint,␊
-        ERC721_initializer,␊
-        ERC721_only_token_owner,␊
-        ERC721_setTokenURI,␊
-    )␊
+    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␊
@@ -816,7 +743,7 @@ Generated by [AVA](https://avajs.dev).
             pedersen_ptr: HashBuiltin*,␊
             range_check_ptr␊
         }(owner: felt, proxy_admin: felt):␊
-        ERC721_initializer('MyToken', 'MTK')␊
+        ERC721.initializer('MyToken', 'MTK')␊
         Ownable.initializer(owner)␊
         Proxy.initializer(proxy_admin)␊
         return ()␊
@@ -842,7 +769,7 @@ Generated by [AVA](https://avajs.dev).
             pedersen_ptr: HashBuiltin*,␊
             range_check_ptr␊
         }() -> (name: felt):␊
-        let (name) = ERC721_name()␊
+        let (name) = ERC721.name()␊
         return (name)␊
     end␊
     ␊
@@ -852,7 +779,7 @@ Generated by [AVA](https://avajs.dev).
             pedersen_ptr: HashBuiltin*,␊
             range_check_ptr␊
         }() -> (symbol: felt):␊
-        let (symbol) = ERC721_symbol()␊
+        let (symbol) = ERC721.symbol()␊
         return (symbol)␊
     end␊
     ␊
@@ -862,7 +789,7 @@ Generated by [AVA](https://avajs.dev).
             pedersen_ptr: HashBuiltin*,␊
             range_check_ptr␊
         }(owner: felt) -> (balance: Uint256):␊
-        let (balance) = ERC721_balanceOf(owner)␊
+        let (balance) = ERC721.balance_of(owner)␊
         return (balance)␊
     end␊
     ␊
@@ -872,7 +799,7 @@ Generated by [AVA](https://avajs.dev).
             pedersen_ptr: HashBuiltin*,␊
             range_check_ptr␊
         }(token_id: Uint256) -> (owner: felt):␊
-        let (owner) = ERC721_ownerOf(token_id)␊
+        let (owner) = ERC721.owner_of(token_id)␊
         return (owner)␊
     end␊
     ␊
@@ -882,7 +809,7 @@ Generated by [AVA](https://avajs.dev).
             pedersen_ptr: HashBuiltin*,␊
             range_check_ptr␊
         }(token_id: Uint256) -> (approved: felt):␊
-        let (approved) = ERC721_getApproved(token_id)␊
+        let (approved) = ERC721.get_approved(token_id)␊
         return (approved)␊
     end␊
     ␊
@@ -892,7 +819,7 @@ Generated by [AVA](https://avajs.dev).
             pedersen_ptr: HashBuiltin*,␊
             range_check_ptr␊
         }(owner: felt, operator: felt) -> (isApproved: felt):␊
-        let (isApproved) = ERC721_isApprovedForAll(owner, operator)␊
+        let (isApproved) = ERC721.is_approved_for_all(owner, operator)␊
         return (isApproved)␊
     end␊
     ␊
@@ -902,7 +829,7 @@ Generated by [AVA](https://avajs.dev).
             pedersen_ptr: HashBuiltin*,␊
             range_check_ptr␊
         }(tokenId: Uint256) -> (tokenURI: felt):␊
-        let (tokenURI) = ERC721_tokenURI(tokenId)␊
+        let (tokenURI) = ERC721.token_uri(tokenId)␊
         return (tokenURI)␊
     end␊
     ␊
@@ -927,7 +854,7 @@ Generated by [AVA](https://avajs.dev).
             range_check_ptr␊
         }(to: felt, tokenId: Uint256):␊
         Pausable.assert_not_paused()␊
-        ERC721_approve(to, tokenId)␊
+        ERC721.approve(to, tokenId)␊
         return ()␊
     end␊
     ␊
@@ -938,7 +865,7 @@ Generated by [AVA](https://avajs.dev).
             range_check_ptr␊
         }(operator: felt, approved: felt):␊
         Pausable.assert_not_paused()␊
-        ERC721_setApprovalForAll(operator, approved)␊
+        ERC721.set_approval_for_all(operator, approved)␊
         return ()␊
     end␊
     ␊
@@ -949,7 +876,7 @@ Generated by [AVA](https://avajs.dev).
             range_check_ptr␊
         }(from_: felt, to: felt, tokenId: Uint256):␊
         Pausable.assert_not_paused()␊
-        ERC721_transferFrom(from_, to, tokenId)␊
+        ERC721.transfer_from(from_, to, tokenId)␊
         return ()␊
     end␊
     ␊
@@ -960,7 +887,7 @@ Generated by [AVA](https://avajs.dev).
             range_check_ptr␊
         }(from_: felt, to: felt, tokenId: Uint256, data_len: felt, data: felt*):␊
         Pausable.assert_not_paused()␊
-        ERC721_safeTransferFrom(from_, to, tokenId, data_len, data)␊
+        ERC721.safe_transfer_from(from_, to, tokenId, data_len, data)␊
         return ()␊
     end␊
     ␊
@@ -1013,8 +940,8 @@ Generated by [AVA](https://avajs.dev).
             range_check_ptr␊
         }(tokenId: Uint256):␊
         Pausable.assert_not_paused()␊
-        ERC721_only_token_owner(tokenId)␊
-        ERC721_burn(tokenId)␊
+        ERC721.assert_only_token_owner(tokenId)␊
+        ERC721._burn(tokenId)␊
         return ()␊
     end␊
     ␊
@@ -1026,8 +953,8 @@ Generated by [AVA](https://avajs.dev).
         }(to: felt, tokenId: Uint256, data_len: felt, data: felt*, tokenURI: felt):␊
         Pausable.assert_not_paused()␊
         Ownable.assert_only_owner()␊
-        ERC721_safeMint(to, tokenId, data_len, data)␊
-        ERC721_setTokenURI(tokenId, tokenURI)␊
+        ERC721._safe_mint(to, tokenId, data_len, data)␊
+        ERC721._set_token_uri(tokenId, tokenURI)␊
         return ()␊
     end␊
     ␊
@@ -1054,20 +981,7 @@ Generated by [AVA](https://avajs.dev).
     from starkware.cairo.common.cairo_builtins import HashBuiltin␊
     from starkware.cairo.common.uint256 import Uint256␊
     ␊
-    from openzeppelin.token.erc721.library import (␊
-        ERC721_name,␊
-        ERC721_symbol,␊
-        ERC721_balanceOf,␊
-        ERC721_ownerOf,␊
-        ERC721_getApproved,␊
-        ERC721_isApprovedForAll,␊
-        ERC721_tokenURI,␊
-        ERC721_approve,␊
-        ERC721_setApprovalForAll,␊
-        ERC721_transferFrom,␊
-        ERC721_safeTransferFrom,␊
-        ERC721_initializer,␊
-    )␊
+    from openzeppelin.token.erc721.library import ERC721␊
     from openzeppelin.introspection.ERC165 import ERC165␊
     ␊
     @constructor␊
@@ -1076,7 +990,7 @@ Generated by [AVA](https://avajs.dev).
             pedersen_ptr: HashBuiltin*,␊
             range_check_ptr␊
         }():␊
-        ERC721_initializer('MyToken', 'MTK')␊
+        ERC721.initializer('MyToken', 'MTK')␊
         return ()␊
     end␊
     ␊
@@ -1100,7 +1014,7 @@ Generated by [AVA](https://avajs.dev).
             pedersen_ptr: HashBuiltin*,␊
             range_check_ptr␊
         }() -> (name: felt):␊
-        let (name) = ERC721_name()␊
+        let (name) = ERC721.name()␊
         return (name)␊
     end␊
     ␊
@@ -1110,7 +1024,7 @@ Generated by [AVA](https://avajs.dev).
             pedersen_ptr: HashBuiltin*,␊
             range_check_ptr␊
         }() -> (symbol: felt):␊
-        let (symbol) = ERC721_symbol()␊
+        let (symbol) = ERC721.symbol()␊
         return (symbol)␊
     end␊
     ␊
@@ -1120,7 +1034,7 @@ Generated by [AVA](https://avajs.dev).
             pedersen_ptr: HashBuiltin*,␊
             range_check_ptr␊
         }(owner: felt) -> (balance: Uint256):␊
-        let (balance) = ERC721_balanceOf(owner)␊
+        let (balance) = ERC721.balance_of(owner)␊
         return (balance)␊
     end␊
     ␊
@@ -1130,7 +1044,7 @@ Generated by [AVA](https://avajs.dev).
             pedersen_ptr: HashBuiltin*,␊
             range_check_ptr␊
         }(token_id: Uint256) -> (owner: felt):␊
-        let (owner) = ERC721_ownerOf(token_id)␊
+        let (owner) = ERC721.owner_of(token_id)␊
         return (owner)␊
     end␊
     ␊
@@ -1140,7 +1054,7 @@ Generated by [AVA](https://avajs.dev).
             pedersen_ptr: HashBuiltin*,␊
             range_check_ptr␊
         }(token_id: Uint256) -> (approved: felt):␊
-        let (approved) = ERC721_getApproved(token_id)␊
+        let (approved) = ERC721.get_approved(token_id)␊
         return (approved)␊
     end␊
     ␊
@@ -1150,7 +1064,7 @@ Generated by [AVA](https://avajs.dev).
             pedersen_ptr: HashBuiltin*,␊
             range_check_ptr␊
         }(owner: felt, operator: felt) -> (isApproved: felt):␊
-        let (isApproved) = ERC721_isApprovedForAll(owner, operator)␊
+        let (isApproved) = ERC721.is_approved_for_all(owner, operator)␊
         return (isApproved)␊
     end␊
     ␊
@@ -1160,7 +1074,7 @@ Generated by [AVA](https://avajs.dev).
             pedersen_ptr: HashBuiltin*,␊
             range_check_ptr␊
         }(tokenId: Uint256) -> (tokenURI: felt):␊
-        let (tokenURI) = ERC721_tokenURI(tokenId)␊
+        let (tokenURI) = ERC721.token_uri(tokenId)␊
         return (tokenURI)␊
     end␊
     ␊
@@ -1174,7 +1088,7 @@ Generated by [AVA](https://avajs.dev).
             pedersen_ptr: HashBuiltin*,␊
             range_check_ptr␊
         }(to: felt, tokenId: Uint256):␊
-        ERC721_approve(to, tokenId)␊
+        ERC721.approve(to, tokenId)␊
         return ()␊
     end␊
     ␊
@@ -1184,7 +1098,7 @@ Generated by [AVA](https://avajs.dev).
             pedersen_ptr: HashBuiltin*,␊
             range_check_ptr␊
         }(operator: felt, approved: felt):␊
-        ERC721_setApprovalForAll(operator, approved)␊
+        ERC721.set_approval_for_all(operator, approved)␊
         return ()␊
     end␊
     ␊
@@ -1194,7 +1108,7 @@ Generated by [AVA](https://avajs.dev).
             pedersen_ptr: HashBuiltin*,␊
             range_check_ptr␊
         }(from_: felt, to: felt, tokenId: Uint256):␊
-        ERC721_transferFrom(from_, to, tokenId)␊
+        ERC721.transfer_from(from_, to, tokenId)␊
         return ()␊
     end␊
     ␊
@@ -1204,7 +1118,7 @@ Generated by [AVA](https://avajs.dev).
             pedersen_ptr: HashBuiltin*,␊
             range_check_ptr␊
         }(from_: felt, to: felt, tokenId: Uint256, data_len: felt, data: felt*):␊
-        ERC721_safeTransferFrom(from_, to, tokenId, data_len, data)␊
+        ERC721.safe_transfer_from(from_, to, tokenId, data_len, data)␊
         return ()␊
     end␊
     `
@@ -1220,20 +1134,7 @@ Generated by [AVA](https://avajs.dev).
     from starkware.cairo.common.cairo_builtins import HashBuiltin␊
     from starkware.cairo.common.uint256 import Uint256␊
     ␊
-    from openzeppelin.token.erc721.library import (␊
-        ERC721_name,␊
-        ERC721_symbol,␊
-        ERC721_balanceOf,␊
-        ERC721_ownerOf,␊
-        ERC721_getApproved,␊
-        ERC721_isApprovedForAll,␊
-        ERC721_tokenURI,␊
-        ERC721_approve,␊
-        ERC721_setApprovalForAll,␊
-        ERC721_transferFrom,␊
-        ERC721_safeTransferFrom,␊
-        ERC721_initializer,␊
-    )␊
+    from openzeppelin.token.erc721.library import ERC721␊
     from openzeppelin.introspection.ERC165 import ERC165␊
     ␊
     @constructor␊
@@ -1242,7 +1143,7 @@ Generated by [AVA](https://avajs.dev).
             pedersen_ptr: HashBuiltin*,␊
             range_check_ptr␊
         }():␊
-        ERC721_initializer('CustomToken', 'CTK')␊
+        ERC721.initializer('CustomToken', 'CTK')␊
         return ()␊
     end␊
     ␊
@@ -1266,7 +1167,7 @@ Generated by [AVA](https://avajs.dev).
             pedersen_ptr: HashBuiltin*,␊
             range_check_ptr␊
         }() -> (name: felt):␊
-        let (name) = ERC721_name()␊
+        let (name) = ERC721.name()␊
         return (name)␊
     end␊
     ␊
@@ -1276,7 +1177,7 @@ Generated by [AVA](https://avajs.dev).
             pedersen_ptr: HashBuiltin*,␊
             range_check_ptr␊
         }() -> (symbol: felt):␊
-        let (symbol) = ERC721_symbol()␊
+        let (symbol) = ERC721.symbol()␊
         return (symbol)␊
     end␊
     ␊
@@ -1286,7 +1187,7 @@ Generated by [AVA](https://avajs.dev).
             pedersen_ptr: HashBuiltin*,␊
             range_check_ptr␊
         }(owner: felt) -> (balance: Uint256):␊
-        let (balance) = ERC721_balanceOf(owner)␊
+        let (balance) = ERC721.balance_of(owner)␊
         return (balance)␊
     end␊
     ␊
@@ -1296,7 +1197,7 @@ Generated by [AVA](https://avajs.dev).
             pedersen_ptr: HashBuiltin*,␊
             range_check_ptr␊
         }(token_id: Uint256) -> (owner: felt):␊
-        let (owner) = ERC721_ownerOf(token_id)␊
+        let (owner) = ERC721.owner_of(token_id)␊
         return (owner)␊
     end␊
     ␊
@@ -1306,7 +1207,7 @@ Generated by [AVA](https://avajs.dev).
             pedersen_ptr: HashBuiltin*,␊
             range_check_ptr␊
         }(token_id: Uint256) -> (approved: felt):␊
-        let (approved) = ERC721_getApproved(token_id)␊
+        let (approved) = ERC721.get_approved(token_id)␊
         return (approved)␊
     end␊
     ␊
@@ -1316,7 +1217,7 @@ Generated by [AVA](https://avajs.dev).
             pedersen_ptr: HashBuiltin*,␊
             range_check_ptr␊
         }(owner: felt, operator: felt) -> (isApproved: felt):␊
-        let (isApproved) = ERC721_isApprovedForAll(owner, operator)␊
+        let (isApproved) = ERC721.is_approved_for_all(owner, operator)␊
         return (isApproved)␊
     end␊
     ␊
@@ -1326,7 +1227,7 @@ Generated by [AVA](https://avajs.dev).
             pedersen_ptr: HashBuiltin*,␊
             range_check_ptr␊
         }(tokenId: Uint256) -> (tokenURI: felt):␊
-        let (tokenURI) = ERC721_tokenURI(tokenId)␊
+        let (tokenURI) = ERC721.token_uri(tokenId)␊
         return (tokenURI)␊
     end␊
     ␊
@@ -1340,7 +1241,7 @@ Generated by [AVA](https://avajs.dev).
             pedersen_ptr: HashBuiltin*,␊
             range_check_ptr␊
         }(to: felt, tokenId: Uint256):␊
-        ERC721_approve(to, tokenId)␊
+        ERC721.approve(to, tokenId)␊
         return ()␊
     end␊
     ␊
@@ -1350,7 +1251,7 @@ Generated by [AVA](https://avajs.dev).
             pedersen_ptr: HashBuiltin*,␊
             range_check_ptr␊
         }(operator: felt, approved: felt):␊
-        ERC721_setApprovalForAll(operator, approved)␊
+        ERC721.set_approval_for_all(operator, approved)␊
         return ()␊
     end␊
     ␊
@@ -1360,7 +1261,7 @@ Generated by [AVA](https://avajs.dev).
             pedersen_ptr: HashBuiltin*,␊
             range_check_ptr␊
         }(from_: felt, to: felt, tokenId: Uint256):␊
-        ERC721_transferFrom(from_, to, tokenId)␊
+        ERC721.transfer_from(from_, to, tokenId)␊
         return ()␊
     end␊
     ␊
@@ -1370,7 +1271,7 @@ Generated by [AVA](https://avajs.dev).
             pedersen_ptr: HashBuiltin*,␊
             range_check_ptr␊
         }(from_: felt, to: felt, tokenId: Uint256, data_len: felt, data: felt*):␊
-        ERC721_safeTransferFrom(from_, to, tokenId, data_len, data)␊
+        ERC721.safe_transfer_from(from_, to, tokenId, data_len, data)␊
         return ()␊
     end␊
     `
@@ -1386,24 +1287,7 @@ Generated by [AVA](https://avajs.dev).
     from starkware.cairo.common.cairo_builtins import HashBuiltin␊
     from starkware.cairo.common.uint256 import Uint256␊
     ␊
-    from openzeppelin.token.erc721.library import (␊
-        ERC721_name,␊
-        ERC721_symbol,␊
-        ERC721_balanceOf,␊
-        ERC721_ownerOf,␊
-        ERC721_getApproved,␊
-        ERC721_isApprovedForAll,␊
-        ERC721_tokenURI,␊
-        ERC721_approve,␊
-        ERC721_setApprovalForAll,␊
-        ERC721_transferFrom,␊
-        ERC721_safeTransferFrom,␊
-        ERC721_burn,␊
-        ERC721_safeMint,␊
-        ERC721_initializer,␊
-        ERC721_only_token_owner,␊
-        ERC721_setTokenURI,␊
-    )␊
+    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␊
@@ -1415,7 +1299,7 @@ Generated by [AVA](https://avajs.dev).
             pedersen_ptr: HashBuiltin*,␊
             range_check_ptr␊
         }(owner: felt, proxy_admin: felt):␊
-        ERC721_initializer('CustomToken', 'CTK')␊
+        ERC721.initializer('CustomToken', 'CTK')␊
         Ownable.initializer(owner)␊
         Proxy.initializer(proxy_admin)␊
         return ()␊
@@ -1441,7 +1325,7 @@ Generated by [AVA](https://avajs.dev).
             pedersen_ptr: HashBuiltin*,␊
             range_check_ptr␊
         }() -> (name: felt):␊
-        let (name) = ERC721_name()␊
+        let (name) = ERC721.name()␊
         return (name)␊
     end␊
     ␊
@@ -1451,7 +1335,7 @@ Generated by [AVA](https://avajs.dev).
             pedersen_ptr: HashBuiltin*,␊
             range_check_ptr␊
         }() -> (symbol: felt):␊
-        let (symbol) = ERC721_symbol()␊
+        let (symbol) = ERC721.symbol()␊
         return (symbol)␊
     end␊
     ␊
@@ -1461,7 +1345,7 @@ Generated by [AVA](https://avajs.dev).
             pedersen_ptr: HashBuiltin*,␊
             range_check_ptr␊
         }(owner: felt) -> (balance: Uint256):␊
-        let (balance) = ERC721_balanceOf(owner)␊
+        let (balance) = ERC721.balance_of(owner)␊
         return (balance)␊
     end␊
     ␊
@@ -1471,7 +1355,7 @@ Generated by [AVA](https://avajs.dev).
             pedersen_ptr: HashBuiltin*,␊
             range_check_ptr␊
         }(token_id: Uint256) -> (owner: felt):␊
-        let (owner) = ERC721_ownerOf(token_id)␊
+        let (owner) = ERC721.owner_of(token_id)␊
         return (owner)␊
     end␊
     ␊
@@ -1481,7 +1365,7 @@ Generated by [AVA](https://avajs.dev).
             pedersen_ptr: HashBuiltin*,␊
             range_check_ptr␊
         }(token_id: Uint256) -> (approved: felt):␊
-        let (approved) = ERC721_getApproved(token_id)␊
+        let (approved) = ERC721.get_approved(token_id)␊
         return (approved)␊
     end␊
     ␊
@@ -1491,7 +1375,7 @@ Generated by [AVA](https://avajs.dev).
             pedersen_ptr: HashBuiltin*,␊
             range_check_ptr␊
         }(owner: felt, operator: felt) -> (isApproved: felt):␊
-        let (isApproved) = ERC721_isApprovedForAll(owner, operator)␊
+        let (isApproved) = ERC721.is_approved_for_all(owner, operator)␊
         return (isApproved)␊
     end␊
     ␊
@@ -1501,7 +1385,7 @@ Generated by [AVA](https://avajs.dev).
             pedersen_ptr: HashBuiltin*,␊
             range_check_ptr␊
         }(tokenId: Uint256) -> (tokenURI: felt):␊
-        let (tokenURI) = ERC721_tokenURI(tokenId)␊
+        let (tokenURI) = ERC721.token_uri(tokenId)␊
         return (tokenURI)␊
     end␊
     ␊
@@ -1526,7 +1410,7 @@ Generated by [AVA](https://avajs.dev).
             range_check_ptr␊
         }(to: felt, tokenId: Uint256):␊
         Pausable.assert_not_paused()␊
-        ERC721_approve(to, tokenId)␊
+        ERC721.approve(to, tokenId)␊
         return ()␊
     end␊
     ␊
@@ -1537,7 +1421,7 @@ Generated by [AVA](https://avajs.dev).
             range_check_ptr␊
         }(operator: felt, approved: felt):␊
         Pausable.assert_not_paused()␊
-        ERC721_setApprovalForAll(operator, approved)␊
+        ERC721.set_approval_for_all(operator, approved)␊
         return ()␊
     end␊
     ␊
@@ -1548,7 +1432,7 @@ Generated by [AVA](https://avajs.dev).
             range_check_ptr␊
         }(from_: felt, to: felt, tokenId: Uint256):␊
         Pausable.assert_not_paused()␊
-        ERC721_transferFrom(from_, to, tokenId)␊
+        ERC721.transfer_from(from_, to, tokenId)␊
         return ()␊
     end␊
     ␊
@@ -1559,7 +1443,7 @@ Generated by [AVA](https://avajs.dev).
             range_check_ptr␊
         }(from_: felt, to: felt, tokenId: Uint256, data_len: felt, data: felt*):␊
         Pausable.assert_not_paused()␊
-        ERC721_safeTransferFrom(from_, to, tokenId, data_len, data)␊
+        ERC721.safe_transfer_from(from_, to, tokenId, data_len, data)␊
         return ()␊
     end␊
     ␊
@@ -1612,8 +1496,8 @@ Generated by [AVA](https://avajs.dev).
             range_check_ptr␊
         }(tokenId: Uint256):␊
         Pausable.assert_not_paused()␊
-        ERC721_only_token_owner(tokenId)␊
-        ERC721_burn(tokenId)␊
+        ERC721.assert_only_token_owner(tokenId)␊
+        ERC721._burn(tokenId)␊
         return ()␊
     end␊
     ␊
@@ -1625,8 +1509,8 @@ Generated by [AVA](https://avajs.dev).
         }(to: felt, tokenId: Uint256, data_len: felt, data: felt*, tokenURI: felt):␊
         Pausable.assert_not_paused()␊
         Ownable.assert_only_owner()␊
-        ERC721_safeMint(to, tokenId, data_len, data)␊
-        ERC721_setTokenURI(tokenId, tokenURI)␊
+        ERC721._safe_mint(to, tokenId, data_len, data)␊
+        ERC721._set_token_uri(tokenId, tokenURI)␊
         return ()␊
     end␊
     ␊
diff --git a/packages/core-cairo/src/erc721.test.ts.snap b/packages/core-cairo/src/erc721.test.ts.snap
index 6b952c48..2439da68 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 cc6b7e3f..5188a316 100644
--- a/packages/core-cairo/src/erc721.ts
+++ b/packages/core-cairo/src/erc721.ts
@@ -101,16 +101,17 @@ function addBase(c: ContractBuilder, name: string, symbol: string) {
     modules.ERC721,
     [name, symbol],
     [functions.approve, functions.setApprovalForAll, functions.transferFrom, functions.safeTransferFrom],
+    true,
+    namespaces.ERC721
   );
 }
 
 function addBurnable(c: ContractBuilder) {
   c.addFunction(functions.burn);
-  c.addModuleFunction(modules.ERC721, 'ERC721_only_token_owner');
   c.setFunctionBody(
     [
-      'ERC721_only_token_owner(tokenId)',
-      'ERC721_burn(tokenId)'
+      'ERC721.assert_only_token_owner(tokenId)',
+      'ERC721._burn(tokenId)'
     ],
     functions.burn
   );
@@ -118,11 +119,10 @@ function addBurnable(c: ContractBuilder) {
 
 function addMintable(c: ContractBuilder, access: Access) {
   setAccessControl(c, functions.safeMint, access);
-  c.addModuleFunction(modules.ERC721, 'ERC721_setTokenURI');
   c.setFunctionBody(
     [
-      'ERC721_safeMint(to, tokenId, data_len, data)', 
-      'ERC721_setTokenURI(tokenId, tokenURI)'
+      'ERC721._safe_mint(to, tokenId, data_len, data)', 
+      'ERC721._set_token_uri(tokenId, tokenURI)'
     ],
     functions.safeMint
   );
@@ -169,6 +169,7 @@ const functions = defineFunctions({
 
   name: {
     module: modules.ERC721,
+    namespace: namespaces.ERC721,
     kind: 'view' as const,
     implicitArgs: withImplicitArgs(),
     args: [
@@ -179,6 +180,7 @@ const functions = defineFunctions({
 
   symbol: {
     module: modules.ERC721,
+    namespace: namespaces.ERC721,
     kind: 'view' as const,
     implicitArgs: withImplicitArgs(),
     args: [
@@ -189,6 +191,7 @@ const functions = defineFunctions({
 
   balanceOf: {
     module: modules.ERC721,
+    namespace: namespaces.ERC721,
     kind: 'view' as const,
     implicitArgs: withImplicitArgs(),
     args: [
@@ -196,10 +199,12 @@ const functions = defineFunctions({
     ],
     returns: [{ name: 'balance', type: 'Uint256' }],
     passthrough: true,
+    parentFunctionName: 'balance_of',
   },
 
   ownerOf: {
     module: modules.ERC721,
+    namespace: namespaces.ERC721,
     kind: 'view' as const,
     implicitArgs: withImplicitArgs(),
     args: [
@@ -207,10 +212,12 @@ const functions = defineFunctions({
     ],
     returns: [{ name: 'owner', type: 'felt' }],
     passthrough: true,
+    parentFunctionName: 'owner_of',
   },
 
   getApproved: {
     module: modules.ERC721,
+    namespace: namespaces.ERC721,
     kind: 'view' as const,
     implicitArgs: withImplicitArgs(),
     args: [
@@ -218,10 +225,12 @@ const functions = defineFunctions({
     ],
     returns: [{ name: 'approved', type: 'felt' }],
     passthrough: true,
+    parentFunctionName: 'get_approved',
   },
 
   isApprovedForAll: {
     module: modules.ERC721,
+    namespace: namespaces.ERC721,
     kind: 'view' as const,
     implicitArgs: withImplicitArgs(),
     args: [
@@ -230,10 +239,12 @@ const functions = defineFunctions({
     ],
     returns: [{ name: 'isApproved', type: 'felt' }],
     passthrough: true,
+    parentFunctionName: 'is_approved_for_all',
   },
 
   tokenURI: {
     module: modules.ERC721,
+    namespace: namespaces.ERC721,
     kind: 'view' as const,
     implicitArgs: withImplicitArgs(),
     args: [
@@ -241,12 +252,14 @@ const functions = defineFunctions({
     ],
     returns: [{ name: 'tokenURI', type: 'felt' }],
     passthrough: true,
+    parentFunctionName: 'token_uri',
   },
 
   // --- external functions ---
 
   approve: {
     module: modules.ERC721,
+    namespace: namespaces.ERC721,
     kind: 'external' as const,
     implicitArgs: withImplicitArgs(),
     args: [
@@ -257,16 +270,19 @@ const functions = defineFunctions({
 
   setApprovalForAll: {
     module: modules.ERC721,
+    namespace: namespaces.ERC721,
     kind: 'external' as const,
     implicitArgs: withImplicitArgs(),
     args: [
       { name: 'operator', type: 'felt' },
       { name: 'approved', type: 'felt' },
     ],
+    parentFunctionName: 'set_approval_for_all',
   },
 
   transferFrom: {
     module: modules.ERC721,
+    namespace: namespaces.ERC721,
     kind: 'external' as const,
     implicitArgs: withImplicitArgs(),
     args: [
@@ -274,10 +290,12 @@ const functions = defineFunctions({
       { name: 'to', type: 'felt' },
       { name: 'tokenId', type: 'Uint256' },
     ],
+    parentFunctionName: 'transfer_from',
   },
 
   safeTransferFrom: {
     module: modules.ERC721,
+    namespace: namespaces.ERC721,
     kind: 'external' as const,
     implicitArgs: withImplicitArgs(),
     args: [
@@ -287,10 +305,12 @@ const functions = defineFunctions({
       { name: 'data_len', type: 'felt' },
       { name: 'data', type: 'felt*' },
     ],
+    parentFunctionName: 'safe_transfer_from',
   },
 
   safeMint: {
     module: modules.ERC721,
+    namespace: namespaces.ERC721,
     kind: 'external' as const,
     implicitArgs: withImplicitArgs(),
     args: [
@@ -300,10 +320,12 @@ const functions = defineFunctions({
       { name: 'data', type: 'felt*' },
       { name: 'tokenURI', type: 'felt' },
     ],
+    parentFunctionName: '_safe_mint',
   },
   
   burn: {
     module: modules.ERC721,
+    namespace: namespaces.ERC721,
     kind: 'external' as const,
     implicitArgs: withImplicitArgs(),
     args: [