5 files changed, 12 insertions, 12 deletions
diff --git a/crates/tor-proto/Cargo.toml b/crates/tor-proto/Cargo.toml
index 20df80d8d..b2e88e3bf 100644
--- a/crates/tor-proto/Cargo.toml
+++ b/crates/tor-proto/Cargo.toml
@@ -15,11 +15,11 @@ repository = "https://gitlab.torproject.org/tpo/core/arti.git/"
 default = []
 full = ["tokio"]
 
-experimental = ["experimental-api", "onion-client", "onion-service", "ntor_v3"]
+experimental = ["experimental-api", "hs-client", "hs-service", "ntor_v3"]
 ntor_v3 = []
-onion-client = ["onion-common"]
-onion-service = ["onion-common"]
-onion-common = []
+hs-client = ["hs-common"]
+hs-service = ["hs-common"]
+hs-common = []
 experimental-api = []
 # Enable testing-only APIs.  APIs under this feature are not
 # covered by semver.
diff --git a/crates/tor-proto/src/circuit.rs b/crates/tor-proto/src/circuit.rs
index 0868bac23..b71eb451e 100644
--- a/crates/tor-proto/src/circuit.rs
+++ b/crates/tor-proto/src/circuit.rs
@@ -41,7 +41,7 @@
 pub(crate) mod celltypes;
 pub(crate) mod halfcirc;
 mod halfstream;
-#[cfg(feature = "onion-common")]
+#[cfg(feature = "hs-common")]
 pub mod handshake;
 mod path;
 pub(crate) mod reactor;
@@ -317,7 +317,7 @@ impl ClientCirc {
     ///
     /// Only onion services (and eventually) exit relays should call this
     /// method.
-    #[cfg(feature = "onion-service")]
+    #[cfg(feature = "hs-service")]
     #[allow(clippy::missing_panics_doc, unused_variables)] // TODO hs remove
     pub fn allow_stream_requests(
         &self,
@@ -386,7 +386,7 @@ impl ClientCirc {
     // TODO hs: let's try to enforce the "you can't extend a circuit again once
     // it has been extended this way" property.  We could do that with internal
     // state, or some kind of a type state pattern.
-    #[cfg(feature = "onion-common")]
+    #[cfg(feature = "hs-common")]
     #[allow(clippy::missing_panics_doc, unused_variables)]
     pub async fn extend_virtual(
         &self,
diff --git a/crates/tor-proto/src/crypto/handshake.rs b/crates/tor-proto/src/crypto/handshake.rs
index e6322ac49..5fb4924d1 100644
--- a/crates/tor-proto/src/crypto/handshake.rs
+++ b/crates/tor-proto/src/crypto/handshake.rs
@@ -11,7 +11,7 @@
 //! Currently, this module implements only the "ntor" handshake used
 //! for circuits on today's Tor.
 pub(crate) mod fast;
-#[cfg(feature = "onion-common")]
+#[cfg(feature = "hs-common")]
 pub mod hs_ntor;
 pub(crate) mod ntor;
 #[cfg(feature = "ntor_v3")]
diff --git a/crates/tor-proto/src/crypto/handshake/hs_ntor.rs b/crates/tor-proto/src/crypto/handshake/hs_ntor.rs
index 9dcdc6103..92e849afe 100644
--- a/crates/tor-proto/src/crypto/handshake/hs_ntor.rs
+++ b/crates/tor-proto/src/crypto/handshake/hs_ntor.rs
@@ -15,7 +15,7 @@
 //! This module is a work in progress, and is not actually used anywhere yet
 //! or tested: please expect the API to change.
 //!
-//! This module is available only when the `onion-common` feature is enabled.
+//! This module is available only when the `hs-common` feature is enabled.
 //
 // TODO hs: go  through this code carefully and make sure that its APIs and
 // behavior are still what we want.
diff --git a/crates/tor-proto/src/stream.rs b/crates/tor-proto/src/stream.rs
index f4f3ab55c..c6d6b2f03 100644
--- a/crates/tor-proto/src/stream.rs
+++ b/crates/tor-proto/src/stream.rs
@@ -11,7 +11,7 @@
 
 mod cmdcheck;
 mod data;
-#[cfg(feature = "onion-service")]
+#[cfg(feature = "hs-service")]
 mod incoming;
 mod params;
 mod raw;
@@ -19,8 +19,8 @@ mod resolve;
 
 pub(crate) use cmdcheck::{AnyCmdChecker, CmdChecker, StreamStatus};
 pub use data::{DataReader, DataStream, DataWriter};
-#[cfg(feature = "onion-service")]
-#[cfg_attr(docsrs, doc(cfg(feature = "onion-service")))]
+#[cfg(feature = "hs-service")]
+#[cfg_attr(docsrs, doc(cfg(feature = "hs-service")))]
 pub use incoming::{IncomingStream, IncomingStreamRequest};
 pub use params::StreamParameters;
 pub use raw::StreamReader;