diff --git a/Cargo.lock b/Cargo.lock
index 78cdaf9..ac9f18c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -568,7 +568,7 @@ dependencies = [
  "postcard",
  "serde",
  "serde_json",
- "spacepackets",
+ "spacepackets 0.3.1 (git+https://egit.irs.uni-stuttgart.de/rust/spacepackets.git?branch=all_features)",
  "zerocopy",
 ]
 
@@ -581,7 +581,7 @@ dependencies = [
  "delegate",
  "satrs-core",
  "satrs-mib",
- "spacepackets",
+ "spacepackets 0.3.1 (git+https://egit.irs.uni-stuttgart.de/rust/spacepackets.git?branch=all_features)",
  "zerocopy",
 ]
 
@@ -696,6 +696,19 @@ dependencies = [
  "zerocopy",
 ]
 
+[[package]]
+name = "spacepackets"
+version = "0.3.1"
+source = "git+https://egit.irs.uni-stuttgart.de/rust/spacepackets.git?branch=all_features#ae55c394bb2455eed3b05a5b587048a931d27238"
+dependencies = [
+ "chrono",
+ "crc",
+ "delegate",
+ "num-traits",
+ "serde",
+ "zerocopy",
+]
+
 [[package]]
 name = "spin"
 version = "0.9.4"
diff --git a/satrs-core/Cargo.toml b/satrs-core/Cargo.toml
index 0c6c2eb..f4fcde8 100644
--- a/satrs-core/Cargo.toml
+++ b/satrs-core/Cargo.toml
@@ -39,7 +39,8 @@ default-features = false
 optional = true
 
 [dependencies.spacepackets]
-path = "../spacepackets"
+git = "https://egit.irs.uni-stuttgart.de/rust/spacepackets.git"
+branch = "all_features"
 default-features = false
 
 [dev-dependencies]
diff --git a/satrs-core/src/pus/verification.rs b/satrs-core/src/pus/verification.rs
index 5e01ba2..1f6c6da 100644
--- a/satrs-core/src/pus/verification.rs
+++ b/satrs-core/src/pus/verification.rs
@@ -104,7 +104,7 @@ pub use stdmod::{
 };
 
 #[derive(Debug, Eq, PartialEq, Copy, Clone)]
-pub enum Subservices {
+pub enum Subservice {
     TmAcceptanceSuccess = 1,
     TmAcceptanceFailure = 2,
     TmStartSuccess = 3,
@@ -115,8 +115,8 @@ pub enum Subservices {
     TmCompletionFailure = 8,
 }
 
-impl From<Subservices> for u8 {
-    fn from(enumeration: Subservices) -> Self {
+impl From<Subservice> for u8 {
+    fn from(enumeration: Subservice) -> Self {
         enumeration as u8
     }
 }
@@ -347,7 +347,7 @@ impl VerificationReporterBasic {
         let tm = self
             .create_pus_verif_success_tm(
                 buf,
-                Subservices::TmAcceptanceSuccess.into(),
+                Subservice::TmAcceptanceSuccess.into(),
                 seq_counter.get(),
                 &token.req_id,
                 time_stamp,
@@ -377,7 +377,7 @@ impl VerificationReporterBasic {
         let tm = self
             .create_pus_verif_fail_tm(
                 buf,
-                Subservices::TmAcceptanceFailure.into(),
+                Subservice::TmAcceptanceFailure.into(),
                 seq_counter.get(),
                 &token.req_id,
                 None::<&dyn EcssEnumeration>,
@@ -406,7 +406,7 @@ impl VerificationReporterBasic {
         let tm = self
             .create_pus_verif_success_tm(
                 buf,
-                Subservices::TmStartSuccess.into(),
+                Subservice::TmStartSuccess.into(),
                 seq_counter.get(),
                 &token.req_id,
                 time_stamp,
@@ -438,7 +438,7 @@ impl VerificationReporterBasic {
         let tm = self
             .create_pus_verif_fail_tm(
                 buf,
-                Subservices::TmStartFailure.into(),
+                Subservice::TmStartFailure.into(),
                 seq_counter.get(),
                 &token.req_id,
                 None::<&dyn EcssEnumeration>,
@@ -466,7 +466,7 @@ impl VerificationReporterBasic {
     ) -> Result<(), EcssTmError<E>> {
         let tm = self.create_pus_verif_success_tm(
             buf,
-            Subservices::TmStepSuccess.into(),
+            Subservice::TmStepSuccess.into(),
             seq_counter.get(),
             &token.req_id,
             time_stamp,
@@ -492,7 +492,7 @@ impl VerificationReporterBasic {
         let tm = self
             .create_pus_verif_fail_tm(
                 buf,
-                Subservices::TmStepFailure.into(),
+                Subservice::TmStepFailure.into(),
                 seq_counter.get(),
                 &token.req_id,
                 Some(params.step),
@@ -521,7 +521,7 @@ impl VerificationReporterBasic {
         let tm = self
             .create_pus_verif_success_tm(
                 buf,
-                Subservices::TmCompletionSuccess.into(),
+                Subservice::TmCompletionSuccess.into(),
                 seq_counter.get(),
                 &token.req_id,
                 time_stamp,
@@ -550,7 +550,7 @@ impl VerificationReporterBasic {
         let tm = self
             .create_pus_verif_fail_tm(
                 buf,
-                Subservices::TmCompletionFailure.into(),
+                Subservice::TmCompletionFailure.into(),
                 seq_counter.get(),
                 &token.req_id,
                 None::<&dyn EcssEnumeration>,
diff --git a/satrs-example/Cargo.toml b/satrs-example/Cargo.toml
index c6626ee..70013c4 100644
--- a/satrs-example/Cargo.toml
+++ b/satrs-example/Cargo.toml
@@ -12,7 +12,8 @@ zerocopy = "0.6"
 csv = "1"
 
 [dependencies.spacepackets]
-path = "../spacepackets"
+git = "https://egit.irs.uni-stuttgart.de/rust/spacepackets.git"
+branch = "all_features"
 
 [dependencies.satrs-core]
 path = "../satrs-core"