diff --git a/Cargo.lock b/Cargo.lock
index 6811b55..a938ecf 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -584,51 +584,35 @@ dependencies = [
 ]
 
 [[package]]
-name = "gpl-session-macros"
-version = "0.1.0"
-dependencies = [
- "gpl-session-macros-attribute",
-]
-
-[[package]]
-name = "gpl-session-macros-attribute"
-version = "0.1.0"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "gpl_compression"
+name = "gpl-compression"
 version = "0.1.1"
 dependencies = [
  "anchor-lang",
- "gpl_core",
+ "gpl-core",
  "solana-security-txt",
  "spl-account-compression",
 ]
 
 [[package]]
-name = "gpl_core"
+name = "gpl-core"
 version = "0.1.0"
 dependencies = [
  "anchor-lang",
- "gpl_session",
+ "gpl-session",
  "solana-security-txt",
  "strum",
  "strum_macros",
 ]
 
 [[package]]
-name = "gpl_nameservice"
+name = "gpl-nameservice"
 version = "0.1.0"
 dependencies = [
  "anchor-lang",
 ]
 
 [[package]]
-name = "gpl_session"
+name = "gpl-session"
 version = "0.1.0"
 dependencies = [
  "anchor-lang",
@@ -636,6 +620,22 @@ dependencies = [
  "solana-security-txt",
 ]
 
+[[package]]
+name = "gpl-session-macros"
+version = "0.1.0"
+dependencies = [
+ "gpl-session-macros-attribute",
+]
+
+[[package]]
+name = "gpl-session-macros-attribute"
+version = "0.1.0"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "hashbrown"
 version = "0.11.2"
diff --git a/programs/gpl_compression/Cargo.toml b/programs/gpl_compression/Cargo.toml
index a535c2f..956cbf5 100644
--- a/programs/gpl_compression/Cargo.toml
+++ b/programs/gpl_compression/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "gpl_compression"
+name = "gpl-compression"
 version = "0.1.1"
 description = "Created with Anchor"
 edition = "2021"
@@ -17,6 +17,6 @@ default = []
 
 [dependencies]
 anchor-lang = "0.26.0"
-gpl_core = { version = "0.1.0", path = "../gpl_core", features = ["cpi"] }
+gpl-core = { version = "0.1.0", path = "../gpl_core", features = ["cpi"] }
 solana-security-txt = "1.1.0"
 spl-account-compression = {version = "0.1.7", features = ["cpi"]}
diff --git a/programs/gpl_core/Cargo.toml b/programs/gpl_core/Cargo.toml
index c0ddecc..d526999 100644
--- a/programs/gpl_core/Cargo.toml
+++ b/programs/gpl_core/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "gpl_core"
+name = "gpl-core"
 version = "0.1.0"
 description = "Gum Protocol Core"
 edition = "2021"
@@ -17,7 +17,7 @@ default = []
 
 [dependencies]
 anchor-lang = { version = "0.26.0" }
-gpl_session = { version = "0.1.0", path = "../gpl_session", features = ["no-entrypoint"] }
+gpl-session = { version = "0.1.0", path = "../gpl_session", features = ["no-entrypoint"] }
 solana-security-txt = "1.1.0"
 strum = "0.24.1"
 strum_macros = "0.24.3"
diff --git a/programs/gpl_nameservice/Cargo.toml b/programs/gpl_nameservice/Cargo.toml
index b243455..4f21a64 100644
--- a/programs/gpl_nameservice/Cargo.toml
+++ b/programs/gpl_nameservice/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "gpl_nameservice"
+name = "gpl-nameservice"
 version = "0.1.0"
 description = "Created with Anchor"
 edition = "2021"
diff --git a/programs/gpl_session/Cargo.toml b/programs/gpl_session/Cargo.toml
index 4811c90..2b19fc8 100644
--- a/programs/gpl_session/Cargo.toml
+++ b/programs/gpl_session/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "gpl_session"
+name = "gpl-session"
 version = "0.1.0"
 description = "Created with Anchor"
 edition = "2021"
@@ -9,7 +9,7 @@ crate-type = ["cdylib", "lib"]
 name = "gpl_session"
 
 [features]
-no-entrypoint = []
+no-entrypoint = ["gpl-session-macros"]
 no-idl = []
 no-log-ix-name = []
 cpi = ["no-entrypoint"]
@@ -17,5 +17,5 @@ default = []
 
 [dependencies]
 anchor-lang = "0.26.0"
-gpl-session-macros = { version = "0.1.0", path = "macros" }
 solana-security-txt = "1.1.0"
+gpl-session-macros = { version = "0.1.0", path = "macros", optional = true }