diff --git a/Cargo.lock b/Cargo.lock
index 86e092dba05a90e32e984dc01b83be54a0db93a3..7eced57b8610ee8c7a639904c1a62ac00f43e656 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1263,13 +1263,6 @@ dependencies = [
  "zeroize",
 ]
 
-[[package]]
-name = "sshwire_derive"
-version = "0.1.0"
-dependencies = [
- "virtue",
-]
-
 [[package]]
 name = "stable_deref_trait"
 version = "1.2.0"
@@ -1309,7 +1302,7 @@ dependencies = [
  "simplelog",
  "snafu",
  "ssh-key",
- "sshwire_derive",
+ "sunset-sshwire-derive",
 ]
 
 [[package]]
@@ -1333,6 +1326,13 @@ dependencies = [
  "tokio",
 ]
 
+[[package]]
+name = "sunset-sshwire-derive"
+version = "0.1.0"
+dependencies = [
+ "virtue",
+]
+
 [[package]]
 name = "syn"
 version = "1.0.98"
diff --git a/Cargo.toml b/Cargo.toml
index 77389707929d073a5037b977394198cd07b11bac..6d4f0a60d45210f04102a68ef7593d13db69e93f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -10,7 +10,7 @@ keywords = ["ssh"]
 
 [workspace]
 members = [
-    "sshwire_derive",
+    "sshwire-derive",
     "async",
 ]
 
@@ -20,7 +20,7 @@ lto = "fat"
 debug = 1
 
 [dependencies]
-sshwire_derive = { version = "0.1", path = "sshwire_derive" }
+sunset-sshwire-derive = { version = "0.1", path = "sshwire-derive" }
 
 snafu = { version = "0.7", default-features = false, features = ["rust_1_46"] }
 # TODO: check that log macro calls disappear in no_std builds
diff --git a/async/Cargo.toml b/async/Cargo.toml
index 418f58cb0b121259003d9d81ca0e12cda8b7fcb9..6f27e9db33d9e2ad0a6574ef0a5c2e9cfd72fa93 100644
--- a/async/Cargo.toml
+++ b/async/Cargo.toml
@@ -2,6 +2,7 @@
 name = "sunset-async"
 version = "0.1.0"
 edition = "2021"
+repository = "https://github.com/mkj/sunset"
 
 [dependencies]
 sunset = { path = "..", features = ["std"] }
diff --git a/src/namelist.rs b/src/namelist.rs
index 74c11b1c995ba01357dc8c81c943b21def3d687d..cbf4105f21517d435418358bddd5d012c87e0186 100644
--- a/src/namelist.rs
+++ b/src/namelist.rs
@@ -7,7 +7,7 @@ use {
 
 use ascii::{AsciiStr, AsciiChar::Comma};
 
-use sshwire_derive::{SSHEncode, SSHDecode};
+use sunset_sshwire_derive::{SSHEncode, SSHDecode};
 
 use crate::*;
 use sshwire::{SSHEncode, SSHDecode, SSHSource, SSHSink, BinString, WireResult};
diff --git a/src/packets.rs b/src/packets.rs
index 3c3e745795f94b51e40a43b83642c4397f7769aa..106987338cf4db230c84ab63643cc52906b696a3 100644
--- a/src/packets.rs
+++ b/src/packets.rs
@@ -15,7 +15,7 @@ use {
 use heapless::String;
 use pretty_hex::PrettyHex;
 
-use sshwire_derive::*;
+use sunset_sshwire_derive::*;
 
 use crate::*;
 use namelist::NameList;
diff --git a/sshwire_derive/Cargo.toml b/sshwire-derive/Cargo.toml
similarity index 57%
rename from sshwire_derive/Cargo.toml
rename to sshwire-derive/Cargo.toml
index 8f1f45b8acce36d2d8da8c44408bf047ea74fd69..e13e0802d8c8d6ad8ec80979a6901c09fa37277d 100644
--- a/sshwire_derive/Cargo.toml
+++ b/sshwire-derive/Cargo.toml
@@ -1,7 +1,8 @@
 [package]
-name = "sshwire_derive"
+name = "sunset-sshwire-derive"
 version = "0.1.0"
 edition = "2021"
+repository = "https://github.com/mkj/sunset"
 
 [lib]
 proc-macro = true
diff --git a/sshwire_derive/src/lib.rs b/sshwire-derive/src/lib.rs
similarity index 100%
rename from sshwire_derive/src/lib.rs
rename to sshwire-derive/src/lib.rs