diff --git a/src/api2/types/mod.rs b/src/api2/types/mod.rs
index 48aba561..2838a609 100644
--- a/src/api2/types/mod.rs
+++ b/src/api2/types/mod.rs
@@ -1548,8 +1548,8 @@ impl std::convert::TryFrom<openssl::rsa::Rsa<openssl::pkey::Public>> for RsaPubK
         },
     }
 )]
-#[serde(rename_all="kebab-case")]
 #[derive(Serialize,Deserialize,Default)]
+#[serde(rename_all="kebab-case")]
 /// Job Scheduling Status
 pub struct JobScheduleStatus {
     #[serde(skip_serializing_if="Option::is_none")]
diff --git a/src/config/datastore.rs b/src/config/datastore.rs
index 7b16ab14..673033a0 100644
--- a/src/config/datastore.rs
+++ b/src/config/datastore.rs
@@ -82,8 +82,8 @@ pub const DIR_NAME_SCHEMA: Schema = StringSchema::new("Directory name").schema()
         },
     }
 )]
-#[serde(rename_all="kebab-case")]
 #[derive(Serialize,Deserialize)]
+#[serde(rename_all="kebab-case")]
 /// Datastore configuration properties.
 pub struct DataStoreConfig {
     pub name: String,
diff --git a/src/config/sync.rs b/src/config/sync.rs
index 33bec113..2fd3a2c1 100644
--- a/src/config/sync.rs
+++ b/src/config/sync.rs
@@ -53,8 +53,8 @@ lazy_static! {
         },
     }
 )]
-#[serde(rename_all="kebab-case")]
 #[derive(Serialize,Deserialize,Clone)]
+#[serde(rename_all="kebab-case")]
 /// Sync Job
 pub struct SyncJobConfig {
     pub id: String,
@@ -82,8 +82,8 @@ pub struct SyncJobConfig {
     },
 )]
 
-#[serde(rename_all="kebab-case")]
 #[derive(Serialize,Deserialize)]
+#[serde(rename_all="kebab-case")]
 /// Status of Sync Job
 pub struct SyncJobStatus {
     #[serde(flatten)]
diff --git a/src/config/tape_job.rs b/src/config/tape_job.rs
index f9c6205d..a5901e86 100644
--- a/src/config/tape_job.rs
+++ b/src/config/tape_job.rs
@@ -62,8 +62,8 @@ lazy_static! {
         },
     }
 )]
-#[serde(rename_all="kebab-case")]
 #[derive(Serialize,Deserialize,Clone)]
+#[serde(rename_all="kebab-case")]
 /// Tape Backup Job Setup
 pub struct TapeBackupJobSetup {
     pub store: String,
@@ -98,8 +98,8 @@ pub struct TapeBackupJobSetup {
         },
     }
 )]
-#[serde(rename_all="kebab-case")]
 #[derive(Serialize,Deserialize,Clone)]
+#[serde(rename_all="kebab-case")]
 /// Tape Backup Job
 pub struct TapeBackupJobConfig {
     pub id: String,
@@ -121,8 +121,8 @@ pub struct TapeBackupJobConfig {
         },
     },
 )]
-#[serde(rename_all="kebab-case")]
 #[derive(Serialize,Deserialize)]
+#[serde(rename_all="kebab-case")]
 /// Status of Tape Backup Job
 pub struct TapeBackupJobStatus {
     #[serde(flatten)]
diff --git a/src/config/token_shadow.rs b/src/config/token_shadow.rs
index 26516454..14acdbeb 100644
--- a/src/config/token_shadow.rs
+++ b/src/config/token_shadow.rs
@@ -14,8 +14,8 @@ const LOCK_FILE: &str = configdir!("/token.shadow.lock");
 const CONF_FILE: &str = configdir!("/token.shadow");
 const LOCK_TIMEOUT: Duration = Duration::from_secs(5);
 
-#[serde(rename_all="kebab-case")]
 #[derive(Serialize, Deserialize)]
+#[serde(rename_all="kebab-case")]
 /// ApiToken id / secret pair
 pub struct ApiTokenSecret {
     pub tokenid: Authid,
diff --git a/src/config/verify.rs b/src/config/verify.rs
index 07b5b7ee..549f9801 100644
--- a/src/config/verify.rs
+++ b/src/config/verify.rs
@@ -48,8 +48,8 @@ lazy_static! {
         },
     }
 )]
-#[serde(rename_all="kebab-case")]
 #[derive(Serialize,Deserialize)]
+#[serde(rename_all="kebab-case")]
 /// Verification Job
 pub struct VerificationJobConfig {
     /// unique ID to address this job
@@ -80,8 +80,8 @@ pub struct VerificationJobConfig {
         },
     },
 )]
-#[serde(rename_all="kebab-case")]
 #[derive(Serialize,Deserialize)]
+#[serde(rename_all="kebab-case")]
 /// Status of Verification Job
 pub struct VerificationJobStatus {
     #[serde(flatten)]
diff --git a/src/server/jobstate.rs b/src/server/jobstate.rs
index 30029bfd..96dd21aa 100644
--- a/src/server/jobstate.rs
+++ b/src/server/jobstate.rs
@@ -61,8 +61,8 @@ use crate::{
     },
 };
 
-#[serde(rename_all = "kebab-case")]
 #[derive(Serialize, Deserialize)]
+#[serde(rename_all = "kebab-case")]
 /// Represents the State of a specific Job
 pub enum JobState {
     /// A job was created at 'time', but never started/finished