diff --git a/src/components/account/account.cairo b/src/components/account/account.cairo
index 0a5c9b0..4ebf690 100644
--- a/src/components/account/account.cairo
+++ b/src/components/account/account.cairo
@@ -88,7 +88,7 @@ pub mod AccountComponent {
     // *************************************************************************
     //                              EXTERNAL FUNCTIONS
     // *************************************************************************
-    #[embeddable_as(AccountImpl)]
+    #[embeddable_as(AccountInternalImpl)]
     pub impl Account<
         TContractState, +HasComponent<TContractState>, +Drop<TContractState>
     > of IAccount<ComponentState<TContractState>> {
diff --git a/src/components/presets/account_preset.cairo b/src/components/presets/account_preset.cairo
index 1533f9b..5538fb8 100644
--- a/src/components/presets/account_preset.cairo
+++ b/src/components/presets/account_preset.cairo
@@ -22,10 +22,10 @@ pub mod AccountPreset {
 
     // Account
     #[abi(embed_v0)]
-    impl AccountImpl = AccountComponent::AccountImpl<ContractState>;
+    impl AccountImpl = AccountComponent::AccountInternalImpl<ContractState>;
 
     impl AccountInternalImpl = AccountComponent::AccountPrivateImpl<ContractState>;
-    impl UpgradeableInternalImpl = UpgradeableComponent::Private<ContractState>;
+    impl UpgradeableInternalImpl = UpgradeableComponent::UpgradeablePrivateImpl<ContractState>;
     impl LockableImpl = LockableComponent::LockablePrivateImpl<ContractState>;
     impl SignerImpl = SignatoryComponent::SignatoryPrivateImpl<ContractState>;
     impl PermissionableImpl = PermissionableComponent::PermissionablePrivateImpl<ContractState>;
diff --git a/src/components/signatory/signatory.cairo b/src/components/signatory/signatory.cairo
index 5978832..874ec7d 100644
--- a/src/components/signatory/signatory.cairo
+++ b/src/components/signatory/signatory.cairo
@@ -9,7 +9,7 @@ pub mod SignatoryComponent {
     use starknet::{get_caller_address, get_contract_address, ContractAddress};
     use token_bound_accounts::components::account::account::AccountComponent;
     use token_bound_accounts::components::account::account::AccountComponent::AccountPrivateImpl;
-    use token_bound_accounts::components::account::account::AccountComponent::AccountImpl;
+    use token_bound_accounts::components::account::account::AccountComponent::AccountInternalImpl;
 
     use token_bound_accounts::components::permissionable::permissionable::PermissionableComponent;
     use token_bound_accounts::components::permissionable::permissionable::PermissionableComponent::PermissionablePrivateImpl;
diff --git a/src/components/upgradeable/upgradeable.cairo b/src/components/upgradeable/upgradeable.cairo
index a3b20a4..1a12cc2 100644
--- a/src/components/upgradeable/upgradeable.cairo
+++ b/src/components/upgradeable/upgradeable.cairo
@@ -47,12 +47,12 @@ pub mod UpgradeableComponent {
     //                              PRIVATE FUNCTIONS
     // *************************************************************************
     #[generate_trait]
-    pub impl Private<
+    pub impl UpgradeablePrivateImpl<
         TContractState,
         +HasComponent<TContractState>,
         +Drop<TContractState>,
         impl Account: AccountComponent::HasComponent<TContractState>
-    > of PrivateTrait<TContractState> {
+    > of UpgradeablePrivateTrait<TContractState> {
         /// @notice replaces the contract's class hash with `new_class_hash`.
         /// Emits an `Upgraded` event.
         fn _upgrade(ref self: ComponentState<TContractState>, new_class_hash: ClassHash) {