5 files changed, 11 insertions, 11 deletions
diff --git a/crates/tor-netdoc/Cargo.toml b/crates/tor-netdoc/Cargo.toml
index d4c8c02f5..93c82c0b5 100644
--- a/crates/tor-netdoc/Cargo.toml
+++ b/crates/tor-netdoc/Cargo.toml
@@ -18,8 +18,8 @@ full = ["routerdesc", "ns_consensus"]
 experimental = [
     "build_docs",
     "experimental-api",
-    "onion-client",
-    "onion-service",
+    "hs-client",
+    "hs-service",
     "hsdesc-inner-docs",
 ]
 
@@ -36,9 +36,9 @@ ns_consensus = []
 # Client-side and service-side support for onion services. 
 # Experimental: not covered by semver guarantees.
 # TODO hs: mark these as part of "full" once they are done and stable.
-onion-client = ["onion-common"]
-onion-service = ["onion-common", "rand"]
-onion-common = ["tor-hscrypto", "tor-linkspec", "tor-units"]
+hs-client = ["hs-common"]
+hs-service = ["hs-common", "rand"]
+hs-common = ["tor-hscrypto", "tor-linkspec", "tor-units"]
 # Testing only : expose code to parse inner layers of onion service descriptors.
 hsdesc-inner-docs = ["visibility"]
 
diff --git a/crates/tor-netdoc/fuzz/Cargo.toml b/crates/tor-netdoc/fuzz/Cargo.toml
index bc7076671..b6b33b473 100644
--- a/crates/tor-netdoc/fuzz/Cargo.toml
+++ b/crates/tor-netdoc/fuzz/Cargo.toml
@@ -14,7 +14,7 @@ libfuzzer-sys = "0.4"
 
 [dependencies.tor-netdoc]
 path = ".."
-features = ["routerdesc", "ns_consensus", "hsdesc-inner-docs", "onion-service"]
+features = ["routerdesc", "ns_consensus", "hsdesc-inner-docs", "hs-service"]
 
 # Prevent this from interfering with workspaces
 [workspace]
diff --git a/crates/tor-netdoc/src/doc.rs b/crates/tor-netdoc/src/doc.rs
index f538b6246..ddec3e64e 100644
--- a/crates/tor-netdoc/src/doc.rs
+++ b/crates/tor-netdoc/src/doc.rs
@@ -32,7 +32,7 @@
 use crate::util::intern::InternCache;
 
 pub mod authcert;
-#[cfg(feature = "onion-common")]
+#[cfg(feature = "hs-common")]
 pub mod hsdesc;
 pub mod microdesc;
 pub mod netstatus;
diff --git a/crates/tor-netdoc/src/lib.rs b/crates/tor-netdoc/src/lib.rs
index 50af9b967..474379a4e 100644
--- a/crates/tor-netdoc/src/lib.rs
+++ b/crates/tor-netdoc/src/lib.rs
@@ -38,7 +38,7 @@
 #![allow(clippy::result_large_err)] // temporary workaround for arti#587
 //! <!-- @@ end lint list maintained by maint/add_warning @@ -->
 
-#[cfg(feature = "onion-service")]
+#[cfg(feature = "hs-service")]
 pub(crate) mod build;
 #[macro_use]
 pub(crate) mod parse;
@@ -54,8 +54,8 @@ pub use util::batching_split_before;
 
 pub use err::{BuildError, Error, ParseErrorKind, Pos};
 
-#[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 build::NetdocText;
 
 /// Alias for the Result type returned by most objects in this module.
diff --git a/crates/tor-netdoc/src/parse/tokenize.rs b/crates/tor-netdoc/src/parse/tokenize.rs
index 7e67261ee..2e4acfad1 100644
--- a/crates/tor-netdoc/src/parse/tokenize.rs
+++ b/crates/tor-netdoc/src/parse/tokenize.rs
@@ -24,7 +24,7 @@ pub(crate) mod object {
     /// indicates the end of a begin or end tag.
     pub(crate) const TAG_END: &str = "-----";
     /// Maximum PEM base64 line length (not enforced during parsing)
-    #[cfg(feature = "onion-service")]
+    #[cfg(feature = "hs-service")]
     pub(crate) const BASE64_PEM_MAX_LINE: usize = 64;
 }