diff --git a/Cargo.lock b/Cargo.lock
index 6d1fb2e..0a6b43d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -606,9 +606,9 @@ name = "libsdrehub"
 version = "4.0.0-alpha1"
 dependencies = [
  "libsdrehubcommon",
+ "libshapi",
+ "libshconfig",
  "log",
- "sdrehub_api",
- "sdrehub_config",
  "tokio",
 ]
 
@@ -619,6 +619,30 @@ dependencies = [
  "async-trait",
 ]
 
+[[package]]
+name = "libshapi"
+version = "4.0.0-alpha1"
+dependencies = [
+ "async-trait",
+ "axum",
+ "libsdrehubcommon",
+ "log",
+ "tokio",
+]
+
+[[package]]
+name = "libshconfig"
+version = "4.0.0-alpha1"
+dependencies = [
+ "figment",
+ "log",
+ "sdre-rust-logging",
+ "serde",
+ "serde-inline-default",
+ "toml",
+ "void",
+]
+
 [[package]]
 name = "lock_api"
 version = "0.4.11"
@@ -925,8 +949,8 @@ name = "sdre-hub"
 version = "4.0.0-alpha1"
 dependencies = [
  "libsdrehub",
- "sdrehub_api",
- "sdrehub_config",
+ "libshapi",
+ "libshconfig",
  "tokio",
 ]
 
@@ -942,30 +966,6 @@ dependencies = [
  "log",
 ]
 
-[[package]]
-name = "sdrehub_api"
-version = "4.0.0-alpha1"
-dependencies = [
- "async-trait",
- "axum",
- "libsdrehubcommon",
- "log",
- "tokio",
-]
-
-[[package]]
-name = "sdrehub_config"
-version = "4.0.0-alpha1"
-dependencies = [
- "figment",
- "log",
- "sdre-rust-logging",
- "serde",
- "serde-inline-default",
- "toml",
- "void",
-]
-
 [[package]]
 name = "serde"
 version = "1.0.197"
diff --git a/Cargo.toml b/Cargo.toml
index 914e105..e7588da 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,10 +1,10 @@
 [workspace]
 members = [
     "src/bin/sdre-hub",
+    "src/libraries/libshapi",
+    "src/libraries/libshconfig",
     "src/libraries/libsdrehub",
     "src/libraries/libsdrehubcommon",
-    "src/libraries/sdrehub-api",
-    "src/libraries/sdrehub-config",
 ]
 
 resolver = "2"
diff --git a/src/bin/sdre-hub/Cargo.toml b/src/bin/sdre-hub/Cargo.toml
index 324c943..4a31d17 100644
--- a/src/bin/sdre-hub/Cargo.toml
+++ b/src/bin/sdre-hub/Cargo.toml
@@ -15,6 +15,6 @@ keywords.workspace = true
 
 [dependencies]
 libsdrehub = { path = "../../libraries/libsdrehub" }
-sdrehub_api = { path = "../../libraries/sdrehub-api" }
-sdrehub_config = { path = "../../libraries/sdrehub-config" }
+libshapi = { path = "../../libraries/libshapi" }
+libshconfig = { path = "../../libraries/libshconfig" }
 tokio = { version = "1.37.0", features = ["full", "tracing"] }
diff --git a/src/bin/sdre-hub/src/main.rs b/src/bin/sdre-hub/src/main.rs
index ca7f14d..122e207 100644
--- a/src/bin/sdre-hub/src/main.rs
+++ b/src/bin/sdre-hub/src/main.rs
@@ -13,7 +13,7 @@
 )]
 
 use libsdrehub::SdreHub;
-use sdrehub_config::ShConfig;
+use libshconfig::ShConfig;
 use std::error::Error;
 
 #[tokio::main]
diff --git a/src/libraries/libsdrehub/Cargo.toml b/src/libraries/libsdrehub/Cargo.toml
index e47631e..67d851d 100644
--- a/src/libraries/libsdrehub/Cargo.toml
+++ b/src/libraries/libsdrehub/Cargo.toml
@@ -18,6 +18,6 @@ keywords.workspace = true
 [dependencies]
 libsdrehubcommon = { path = "../libsdrehubcommon" }
 log = "0.4.21"
-sdrehub_api = { path = "../sdrehub-api" }
-sdrehub_config = { path = "../sdrehub-config" }
+libshapi = { path = "../libshapi" }
+libshconfig = { path = "../libshconfig" }
 tokio = { version = "1.37.0", features = ["full", "tracing"] }
diff --git a/src/libraries/libsdrehub/src/lib.rs b/src/libraries/libsdrehub/src/lib.rs
index 153af9d..1ab6543 100644
--- a/src/libraries/libsdrehub/src/lib.rs
+++ b/src/libraries/libsdrehub/src/lib.rs
@@ -26,8 +26,8 @@
 extern crate log;
 
 use libsdrehubcommon::ShDataUserList;
-use sdrehub_api::ShWebServer;
-use sdrehub_config::ShConfig;
+use libshapi::ShWebServer;
+use libshconfig::ShConfig;
 use tokio::task::JoinSet;
 
 pub struct SdreHub {
diff --git a/src/libraries/sdrehub-api/Cargo.toml b/src/libraries/libshapi/Cargo.toml
similarity index 96%
rename from src/libraries/sdrehub-api/Cargo.toml
rename to src/libraries/libshapi/Cargo.toml
index c6093ef..67c6758 100644
--- a/src/libraries/sdrehub-api/Cargo.toml
+++ b/src/libraries/libshapi/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "sdrehub_api"
+name = "libshapi"
 version.workspace = true
 edition.workspace = true
 authors.workspace = true
diff --git a/src/libraries/sdrehub-api/src/lib.rs b/src/libraries/libshapi/src/lib.rs
similarity index 100%
rename from src/libraries/sdrehub-api/src/lib.rs
rename to src/libraries/libshapi/src/lib.rs
diff --git a/src/libraries/sdrehub-config/Cargo.toml b/src/libraries/libshconfig/Cargo.toml
similarity index 96%
rename from src/libraries/sdrehub-config/Cargo.toml
rename to src/libraries/libshconfig/Cargo.toml
index 90d3e4d..33d7820 100644
--- a/src/libraries/sdrehub-config/Cargo.toml
+++ b/src/libraries/libshconfig/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "sdrehub_config"
+name = "libshconfig"
 version.workspace = true
 edition.workspace = true
 authors.workspace = true
diff --git a/src/libraries/sdrehub-config/src/acars_router_source.rs b/src/libraries/libshconfig/src/acars_router_source.rs
similarity index 100%
rename from src/libraries/sdrehub-config/src/acars_router_source.rs
rename to src/libraries/libshconfig/src/acars_router_source.rs
diff --git a/src/libraries/sdrehub-config/src/address.rs b/src/libraries/libshconfig/src/address.rs
similarity index 100%
rename from src/libraries/sdrehub-config/src/address.rs
rename to src/libraries/libshconfig/src/address.rs
diff --git a/src/libraries/sdrehub-config/src/adsb_source.rs b/src/libraries/libshconfig/src/adsb_source.rs
similarity index 100%
rename from src/libraries/sdrehub-config/src/adsb_source.rs
rename to src/libraries/libshconfig/src/adsb_source.rs
diff --git a/src/libraries/sdrehub-config/src/lib.rs b/src/libraries/libshconfig/src/lib.rs
similarity index 100%
rename from src/libraries/sdrehub-config/src/lib.rs
rename to src/libraries/libshconfig/src/lib.rs
diff --git a/src/libraries/sdrehub-config/src/map.rs b/src/libraries/libshconfig/src/map.rs
similarity index 100%
rename from src/libraries/sdrehub-config/src/map.rs
rename to src/libraries/libshconfig/src/map.rs
diff --git a/src/libraries/sdrehub-config/src/sdrehub.rs b/src/libraries/libshconfig/src/sdrehub.rs
similarity index 100%
rename from src/libraries/sdrehub-config/src/sdrehub.rs
rename to src/libraries/libshconfig/src/sdrehub.rs
diff --git a/src/libraries/sdrehub-config/src/source.rs b/src/libraries/libshconfig/src/source.rs
similarity index 100%
rename from src/libraries/sdrehub-config/src/source.rs
rename to src/libraries/libshconfig/src/source.rs