diff --git a/src/encoding/evm/strategy_encoder/mod.rs b/src/encoding/evm/strategy_encoder/mod.rs
index 9d36e12..44c9689 100644
--- a/src/encoding/evm/strategy_encoder/mod.rs
+++ b/src/encoding/evm/strategy_encoder/mod.rs
@@ -1,2 +1,2 @@
-mod encoder;
-mod selector;
+mod strategy_encoders;
+mod strategy_selector;
diff --git a/src/encoding/evm/strategy_encoder/encoder.rs b/src/encoding/evm/strategy_encoder/strategy_encoders.rs
similarity index 100%
rename from src/encoding/evm/strategy_encoder/encoder.rs
rename to src/encoding/evm/strategy_encoder/strategy_encoders.rs
diff --git a/src/encoding/evm/strategy_encoder/selector.rs b/src/encoding/evm/strategy_encoder/strategy_selector.rs
similarity index 87%
rename from src/encoding/evm/strategy_encoder/selector.rs
rename to src/encoding/evm/strategy_encoder/strategy_selector.rs
index b8e675c..2451711 100644
--- a/src/encoding/evm/strategy_encoder/selector.rs
+++ b/src/encoding/evm/strategy_encoder/strategy_selector.rs
@@ -2,7 +2,9 @@ use tycho_core::models::Chain;
 
 use crate::encoding::{
     errors::EncodingError,
-    evm::strategy_encoder::encoder::{SplitSwapStrategyEncoder, StraightToPoolStrategyEncoder},
+    evm::strategy_encoder::strategy_encoders::{
+        SplitSwapStrategyEncoder, StraightToPoolStrategyEncoder,
+    },
     models::Solution,
     strategy_encoder::{StrategyEncoder, StrategySelector},
 };
diff --git a/src/encoding/evm/swap_encoder/builder.rs b/src/encoding/evm/swap_encoder/builder.rs
index 141370e..cd5525b 100644
--- a/src/encoding/evm/swap_encoder/builder.rs
+++ b/src/encoding/evm/swap_encoder/builder.rs
@@ -1,5 +1,5 @@
 use crate::encoding::{
-    evm::swap_encoder::encoders::{BalancerV2SwapEncoder, UniswapV2SwapEncoder},
+    evm::swap_encoder::swap_encoders::{BalancerV2SwapEncoder, UniswapV2SwapEncoder},
     swap_encoder::SwapEncoder,
 };
 
diff --git a/src/encoding/evm/swap_encoder/mod.rs b/src/encoding/evm/swap_encoder/mod.rs
index ebdb2d5..1148d2d 100644
--- a/src/encoding/evm/swap_encoder/mod.rs
+++ b/src/encoding/evm/swap_encoder/mod.rs
@@ -1,6 +1,6 @@
 mod builder;
-mod encoders;
 mod registry;
+mod swap_encoders;
 
 use std::sync::RwLock;
 
diff --git a/src/encoding/evm/swap_encoder/encoders.rs b/src/encoding/evm/swap_encoder/swap_encoders.rs
similarity index 100%
rename from src/encoding/evm/swap_encoder/encoders.rs
rename to src/encoding/evm/swap_encoder/swap_encoders.rs