diff --git a/src/components/lockable/lockable.cairo b/src/components/lockable/lockable.cairo
index 6fbac1e..977391a 100644
--- a/src/components/lockable/lockable.cairo
+++ b/src/components/lockable/lockable.cairo
@@ -62,15 +62,15 @@ pub mod LockableComponent {
     pub const YEAR_DAYS_SECONDS: u64 = 31536000;
 
     // *************************************************************************
-    //                              EXTERNAL FUNCTIONS
+    //                              PRIVATE FUNCTIONS
     // *************************************************************************
-    #[embeddable_as(LockableImpl)]
-    pub impl Lockable<
+    #[generate_trait]
+    pub impl Private<
         TContractState,
         +HasComponent<TContractState>,
         +Drop<TContractState>,
-        impl Account: AccountComponent::HasComponent<TContractState>
-    > of ILockable<ComponentState<TContractState>> {
+        impl Account: AccountComponent::HasComponent<TContractState>,
+    > of PrivateTrait<TContractState> {
         // @notice locks an account
         // @param lock_until duration for which account should be locked
         fn lock(ref self: ComponentState<TContractState>, lock_until: u64) {
diff --git a/src/components/permissionable/permissionable.cairo b/src/components/permissionable/permissionable.cairo
index c7ae7fc..0e0c8d0 100644
--- a/src/components/permissionable/permissionable.cairo
+++ b/src/components/permissionable/permissionable.cairo
@@ -54,17 +54,16 @@ pub mod PermissionableComponent {
         pub const UNAUTHORIZED: felt252 = 'Account: unauthorized';
     }
 
-
     // *************************************************************************
-    //                              EXTERNAL FUNCTIONS
+    //                              PRIVATE FUNCTIONS
     // *************************************************************************
-    #[embeddable_as(PermissionableImpl)]
-    pub impl Permissionable<
+    #[generate_trait]
+    pub impl Private<
         TContractState,
         +HasComponent<TContractState>,
         +Drop<TContractState>,
-        impl Account: AccountComponent::HasComponent<TContractState>
-    > of IPermissionable<ComponentState<TContractState>> {
+        impl Account: AccountComponent::HasComponent<TContractState>,
+    > of PrivateTrait<TContractState> {
         // @notice sets permission for an account
         // @permissioned_addresses array of addresses who's permission is to be updated
         // @param permssions permission value <true, false>
diff --git a/src/components/presets/account_preset.cairo b/src/components/presets/account_preset.cairo
index 5fa7848..7ca3da2 100644
--- a/src/components/presets/account_preset.cairo
+++ b/src/components/presets/account_preset.cairo
@@ -26,8 +26,9 @@ pub mod AccountPreset {
 
     impl AccountInternalImpl = AccountComponent::InternalImpl<ContractState>;
     impl UpgradeableInternalImpl = UpgradeableComponent::Private<ContractState>;
-    impl LockableImpl = LockableComponent::LockableImpl<ContractState>;
-    impl SignerImpl = SignatoryComponent::Private<ContractState>;
+    impl LockableImpl = LockableComponent::Private<ContractState>;
+    impl SignerImpl = SignatoryComponent::SingnatoryPrivate<ContractState>;
+    impl PermissionableImpl = PermissionableComponent::Private<ContractState>;
 
     // *************************************************************************
     //                             STORAGE
diff --git a/src/components/signatory/signatory.cairo b/src/components/signatory/signatory.cairo
index bbc3f6c..0b65f7d 100644
--- a/src/components/signatory/signatory.cairo
+++ b/src/components/signatory/signatory.cairo
@@ -10,7 +10,7 @@ pub mod SignatoryComponent {
     use token_bound_accounts::components::account::account::AccountComponent;
     use token_bound_accounts::components::account::account::AccountComponent::InternalImpl;
     use token_bound_accounts::components::permissionable::permissionable::PermissionableComponent;
-    use token_bound_accounts::components::permissionable::permissionable::PermissionableComponent::PermissionableImpl;
+    use token_bound_accounts::components::permissionable::permissionable::PermissionableComponent::Private;
     use token_bound_accounts::interfaces::ISRC6::{ISRC6Dispatcher, ISRC6DispatcherTrait};
 
     // *************************************************************************
@@ -32,7 +32,7 @@ pub mod SignatoryComponent {
     //                              PRIVATE FUNCTIONS
     // *************************************************************************
     #[generate_trait]
-    pub impl Private<
+    pub impl SingnatoryPrivate<
         TContractState,
         +HasComponent<TContractState>,
         +Drop<TContractState>,