diff --git a/fee-market/sc-config.toml b/fee-market/sc-config.toml
index 78a84c24..a53b25d4 100644
--- a/fee-market/sc-config.toml
+++ b/fee-market/sc-config.toml
@@ -17,3 +17,6 @@ add-labels = ["fee-market-external-view"]
 
 [[proxy]]
 path = "src/fee_market_proxy.rs"
+
+[[proxy]]
+path = "../esdt-safe/interactor/src/proxies/fee_market_proxy.rs"
diff --git a/fee-market/src/fee_market_proxy.rs b/fee-market/src/fee_market_proxy.rs
index 36ed1bc8..d65c1106 100644
--- a/fee-market/src/fee_market_proxy.rs
+++ b/fee-market/src/fee_market_proxy.rs
@@ -114,7 +114,7 @@ where
             .original_result()
     }
 
-    pub fn disable_fee<
+    pub fn remove_fee<
         Arg0: ProxyArg<TokenIdentifier<Env::Api>>,
     >(
         self,
diff --git a/fee-market/src/fee_type.rs b/fee-market/src/fee_type.rs
index 9621d436..50e7d4f9 100644
--- a/fee-market/src/fee_type.rs
+++ b/fee-market/src/fee_type.rs
@@ -61,7 +61,7 @@ pub trait FeeTypeModule: utils::UtilsModule + bls_signature::BlsSignatureModule
 
     #[only_owner]
     #[endpoint(removeFee)]
-    fn disable_fee(&self, base_token: TokenIdentifier) {
+    fn remove_fee(&self, base_token: TokenIdentifier) {
         self.token_fee(&base_token).clear();
         self.fee_enabled().set(false);
     }
diff --git a/fee-market/wasm-fee-marker-full/src/lib.rs b/fee-market/wasm-fee-marker-full/src/lib.rs
index a07b92d6..7e1433a9 100644
--- a/fee-market/wasm-fee-marker-full/src/lib.rs
+++ b/fee-market/wasm-fee-marker-full/src/lib.rs
@@ -22,7 +22,7 @@ multiversx_sc_wasm_adapter::endpoints! {
         upgrade => upgrade
         setPriceAggregatorAddress => set_price_aggregator_address
         addFee => set_fee
-        removeFee => disable_fee
+        removeFee => remove_fee
         getTokenFee => token_fee
         addUsersToWhitelist => add_users_to_whitelist
         removeUsersFromWhitelist => remove_users_from_whitelist
diff --git a/fee-market/wasm/src/lib.rs b/fee-market/wasm/src/lib.rs
index a07b92d6..7e1433a9 100644
--- a/fee-market/wasm/src/lib.rs
+++ b/fee-market/wasm/src/lib.rs
@@ -22,7 +22,7 @@ multiversx_sc_wasm_adapter::endpoints! {
         upgrade => upgrade
         setPriceAggregatorAddress => set_price_aggregator_address
         addFee => set_fee
-        removeFee => disable_fee
+        removeFee => remove_fee
         getTokenFee => token_fee
         addUsersToWhitelist => add_users_to_whitelist
         removeUsersFromWhitelist => remove_users_from_whitelist