diff --git a/aquatic_common/Cargo.toml b/aquatic_common/Cargo.toml
index a487088..1012103 100644
--- a/aquatic_common/Cargo.toml
+++ b/aquatic_common/Cargo.toml
@@ -12,9 +12,7 @@ readme = "../README.md"
 name = "aquatic_common"
 
 [features]
-with-glommio = ["glommio"]
-with-hwloc = ["hwloc"]
-rustls-config = ["rustls", "rustls-pemfile"]
+rustls = ["dep:rustls", "rustls-pemfile"]
 
 [dependencies]
 aquatic_toml_config = { version = "0.2.0", path = "../aquatic_toml_config" }
@@ -38,7 +36,5 @@ toml = "0.5"
 # Optional
 glommio = { version = "0.7", optional = true }
 hwloc = { version = "0.5", optional = true }
-
-# rustls-config
 rustls = { version = "0.20", optional = true }
 rustls-pemfile = { version = "0.3", optional = true }
diff --git a/aquatic_common/src/cpu_pinning.rs b/aquatic_common/src/cpu_pinning.rs
index 0e03e52..57335f0 100644
--- a/aquatic_common/src/cpu_pinning.rs
+++ b/aquatic_common/src/cpu_pinning.rs
@@ -16,7 +16,7 @@ impl Default for CpuPinningDirection {
     }
 }
 
-#[cfg(feature = "with-glommio")]
+#[cfg(feature = "glommio")]
 #[derive(Clone, Copy, Debug, PartialEq, TomlConfig, Serialize, Deserialize)]
 #[serde(rename_all = "kebab-case")]
 pub enum HyperThreadMapping {
@@ -25,7 +25,7 @@ pub enum HyperThreadMapping {
     Split,
 }
 
-#[cfg(feature = "with-glommio")]
+#[cfg(feature = "glommio")]
 impl Default for HyperThreadMapping {
     fn default() -> Self {
         Self::System
@@ -35,7 +35,7 @@ impl Default for HyperThreadMapping {
 pub trait CpuPinningConfig {
     fn active(&self) -> bool;
     fn direction(&self) -> CpuPinningDirection;
-    #[cfg(feature = "with-glommio")]
+    #[cfg(feature = "glommio")]
     fn hyperthread(&self) -> HyperThreadMapping;
     fn core_offset(&self) -> usize;
 }
@@ -54,7 +54,7 @@ pub mod mod_name {
     pub struct struct_name {
         pub active: bool,
         pub direction: CpuPinningDirection,
-        #[cfg(feature = "with-glommio")]
+        #[cfg(feature = "glommio")]
         pub hyperthread: HyperThreadMapping,
         pub core_offset: usize,
     }
@@ -64,7 +64,7 @@ pub mod mod_name {
             Self {
                 active: false,
                 direction: cpu_pinning_direction,
-                #[cfg(feature = "with-glommio")]
+                #[cfg(feature = "glommio")]
                 hyperthread: Default::default(),
                 core_offset: 0,
             }
@@ -77,7 +77,7 @@ pub mod mod_name {
         fn direction(&self) -> CpuPinningDirection {
             self.direction
         }
-        #[cfg(feature = "with-glommio")]
+        #[cfg(feature = "glommio")]
         fn hyperthread(&self) -> HyperThreadMapping {
             self.hyperthread
         }
@@ -119,7 +119,7 @@ impl WorkerIndex {
     }
 }
 
-#[cfg(feature = "with-glommio")]
+#[cfg(feature = "glommio")]
 pub mod glommio {
     use ::glommio::{CpuSet, Placement};
 
@@ -271,7 +271,7 @@ pub mod glommio {
 /// Pin current thread to a suitable core
 ///
 /// Requires hwloc (`apt-get install libhwloc-dev`)
-#[cfg(feature = "with-hwloc")]
+#[cfg(feature = "hwloc")]
 pub fn pin_current_if_configured_to<C: CpuPinningConfig>(
     config: &C,
     socket_workers: usize,
diff --git a/aquatic_common/src/lib.rs b/aquatic_common/src/lib.rs
index 6888649..1f08cc5 100644
--- a/aquatic_common/src/lib.rs
+++ b/aquatic_common/src/lib.rs
@@ -10,7 +10,7 @@ pub mod access_list;
 pub mod cli;
 pub mod cpu_pinning;
 pub mod privileges;
-#[cfg(feature = "rustls-config")]
+#[cfg(feature = "rustls")]
 pub mod rustls_config;
 
 /// Amortized IndexMap using AHash hasher
diff --git a/aquatic_http/Cargo.toml b/aquatic_http/Cargo.toml
index 5809cd7..c5181c8 100644
--- a/aquatic_http/Cargo.toml
+++ b/aquatic_http/Cargo.toml
@@ -16,7 +16,7 @@ name = "aquatic_http"
 name = "aquatic_http"
 
 [dependencies]
-aquatic_common = { version = "0.2.0", path = "../aquatic_common", features = ["rustls-config", "with-glommio"] }
+aquatic_common = { version = "0.2.0", path = "../aquatic_common", features = ["rustls", "glommio"] }
 aquatic_http_protocol = { version = "0.2.0", path = "../aquatic_http_protocol" }
 aquatic_toml_config = { version = "0.2.0", path = "../aquatic_toml_config" }
 
diff --git a/aquatic_http_load_test/Cargo.toml b/aquatic_http_load_test/Cargo.toml
index 5663acb..861505c 100644
--- a/aquatic_http_load_test/Cargo.toml
+++ b/aquatic_http_load_test/Cargo.toml
@@ -13,7 +13,7 @@ readme = "../README.md"
 name = "aquatic_http_load_test"
 
 [dependencies]
-aquatic_common = { version = "0.2.0", path = "../aquatic_common", features = ["with-glommio"] }
+aquatic_common = { version = "0.2.0", path = "../aquatic_common", features = ["glommio"] }
 aquatic_http_protocol = { version = "0.2.0", path = "../aquatic_http_protocol" }
 aquatic_toml_config = { version = "0.2.0", path = "../aquatic_toml_config" }
 
diff --git a/aquatic_http_private/Cargo.toml b/aquatic_http_private/Cargo.toml
index 7d400f2..1994dbe 100644
--- a/aquatic_http_private/Cargo.toml
+++ b/aquatic_http_private/Cargo.toml
@@ -14,8 +14,8 @@ name = "aquatic_http_private"
 name = "aquatic_http_private"
 
 [dependencies]
-aquatic_common = { version = "0.2.0", path = "../aquatic_common", features = ["rustls-config"] }
-aquatic_http_protocol = { version = "0.2.0", path = "../aquatic_http_protocol", features = ["with-axum"] }
+aquatic_common = { version = "0.2.0", path = "../aquatic_common", features = ["rustls"] }
+aquatic_http_protocol = { version = "0.2.0", path = "../aquatic_http_protocol", features = ["axum"] }
 aquatic_toml_config = { version = "0.2.0", path = "../aquatic_toml_config" }
 
 anyhow = "1"
diff --git a/aquatic_http_protocol/Cargo.toml b/aquatic_http_protocol/Cargo.toml
index 0b31222..467a36c 100644
--- a/aquatic_http_protocol/Cargo.toml
+++ b/aquatic_http_protocol/Cargo.toml
@@ -22,9 +22,6 @@ name = "bench_announce_response_to_bytes"
 path = "benches/bench_announce_response_to_bytes.rs"
 harness = false
 
-[features]
-with-axum = ["axum"]
-
 [dependencies]
 anyhow = "1"
 axum = { version = "0.5", optional = true, default-features = false }
diff --git a/aquatic_http_protocol/src/response.rs b/aquatic_http_protocol/src/response.rs
index b770658..45f1139 100644
--- a/aquatic_http_protocol/src/response.rs
+++ b/aquatic_http_protocol/src/response.rs
@@ -117,7 +117,7 @@ impl AnnounceResponse {
     }
 }
 
-#[cfg(feature = "with-axum")]
+#[cfg(feature = "axum")]
 impl axum::response::IntoResponse for AnnounceResponse {
     fn into_response(self) -> axum::response::Response {
         let mut response_bytes = Vec::with_capacity(128);
@@ -158,7 +158,7 @@ impl ScrapeResponse {
     }
 }
 
-#[cfg(feature = "with-axum")]
+#[cfg(feature = "axum")]
 impl axum::response::IntoResponse for ScrapeResponse {
     fn into_response(self) -> axum::response::Response {
         let mut response_bytes = Vec::with_capacity(128);
@@ -197,7 +197,7 @@ impl FailureResponse {
     }
 }
 
-#[cfg(feature = "with-axum")]
+#[cfg(feature = "axum")]
 impl axum::response::IntoResponse for FailureResponse {
     fn into_response(self) -> axum::response::Response {
         let mut response_bytes = Vec::with_capacity(64);
@@ -229,7 +229,7 @@ impl Response {
     }
 }
 
-#[cfg(feature = "with-axum")]
+#[cfg(feature = "axum")]
 impl axum::response::IntoResponse for Response {
     fn into_response(self) -> axum::response::Response {
         match self {
diff --git a/aquatic_udp/Cargo.toml b/aquatic_udp/Cargo.toml
index ed6686b..d4d5922 100644
--- a/aquatic_udp/Cargo.toml
+++ b/aquatic_udp/Cargo.toml
@@ -16,7 +16,7 @@ name = "aquatic_udp"
 name = "aquatic_udp"
 
 [features]
-cpu-pinning = ["aquatic_common/with-hwloc"]
+cpu-pinning = ["aquatic_common/hwloc"]
 
 [dependencies]
 aquatic_common = { version = "0.2.0", path = "../aquatic_common" }
diff --git a/aquatic_udp_load_test/Cargo.toml b/aquatic_udp_load_test/Cargo.toml
index 662676b..62aa53a 100644
--- a/aquatic_udp_load_test/Cargo.toml
+++ b/aquatic_udp_load_test/Cargo.toml
@@ -10,7 +10,7 @@ keywords = ["udp", "benchmark", "peer-to-peer", "torrent", "bittorrent"]
 readme = "../README.md"
 
 [features]
-cpu-pinning = ["aquatic_common/with-hwloc"]
+cpu-pinning = ["aquatic_common/hwloc"]
 
 [[bin]]
 name = "aquatic_udp_load_test"
diff --git a/aquatic_ws/Cargo.toml b/aquatic_ws/Cargo.toml
index 65491c7..18f5ba9 100644
--- a/aquatic_ws/Cargo.toml
+++ b/aquatic_ws/Cargo.toml
@@ -16,7 +16,7 @@ name = "aquatic_ws"
 name = "aquatic_ws"
 
 [dependencies]
-aquatic_common = { version = "0.2.0", path = "../aquatic_common", features = ["rustls-config", "with-glommio"] }
+aquatic_common = { version = "0.2.0", path = "../aquatic_common", features = ["rustls", "glommio"] }
 aquatic_toml_config = { version = "0.2.0", path = "../aquatic_toml_config" }
 aquatic_ws_protocol = { version = "0.2.0", path = "../aquatic_ws_protocol" }
 
diff --git a/aquatic_ws_load_test/Cargo.toml b/aquatic_ws_load_test/Cargo.toml
index 457a4d2..39e5d4f 100644
--- a/aquatic_ws_load_test/Cargo.toml
+++ b/aquatic_ws_load_test/Cargo.toml
@@ -13,7 +13,7 @@ readme = "../README.md"
 name = "aquatic_ws_load_test"
 
 [dependencies]
-aquatic_common = { version = "0.2.0", path = "../aquatic_common", features = ["with-glommio"] }
+aquatic_common = { version = "0.2.0", path = "../aquatic_common", features = ["glommio"] }
 aquatic_toml_config = { version = "0.2.0", path = "../aquatic_toml_config" }
 aquatic_ws_protocol = { version = "0.2.0", path = "../aquatic_ws_protocol" }