diff --git a/dashboard/src/components/task.tsx b/dashboard/src/components/task.tsx
index b7ce460..d3f8f9c 100644
--- a/dashboard/src/components/task.tsx
+++ b/dashboard/src/components/task.tsx
@@ -23,7 +23,7 @@ const Task = (props: TaskProps) => {
     const [confirming, setConfirming] = useState(false);
     const [confirmError, setConfirmError] = useState<string | null>(null);
 
-    const needsValidation = task.status.state === "NEEDS_USER_VALIDATION" || task.status.state === "NEEDSUSERVALIDATION";
+    const needsValidation = task.status.state === "NEEDS_USER_VALIDATION";
 
     const onConfirm = async () => {
         try {
diff --git a/vicky/src/lib/database/entities/lock.rs b/vicky/src/lib/database/entities/lock.rs
index a326472..6e515a1 100644
--- a/vicky/src/lib/database/entities/lock.rs
+++ b/vicky/src/lib/database/entities/lock.rs
@@ -20,8 +20,8 @@ use crate::database::entities::task::db_impl::DbTask;
     FromSqlRow,
     AsExpression,
 )]
-#[serde(rename_all = "UPPERCASE")]
-#[strum(serialize_all = "UPPERCASE")]
+#[serde(rename_all = "SCREAMING_SNAKE_CASE")]
+#[strum(serialize_all = "SCREAMING_SNAKE_CASE")]
 #[diesel(sql_type = db_impl::LockKindSqlType)]
 pub enum LockKind {
     Read,
diff --git a/vicky/src/lib/database/entities/task.rs b/vicky/src/lib/database/entities/task.rs
index 01ee3d4..780f5cd 100644
--- a/vicky/src/lib/database/entities/task.rs
+++ b/vicky/src/lib/database/entities/task.rs
@@ -15,7 +15,7 @@ pub const HEARTBEAT_TIMEOUT_SEC: i64 = 60;
 pub const EXPECTED_HEARTBEAT_INTERVAL_SEC: i64 = 15;
 
 #[derive(Copy, Clone, Debug, PartialEq, Eq, Serialize, Deserialize, clap::ValueEnum)]
-#[serde(tag = "result", rename_all = "UPPERCASE")]
+#[serde(tag = "result", rename_all = "SCREAMING_SNAKE_CASE")]
 pub enum TaskResult {
     Success,
     Error,
@@ -23,7 +23,7 @@ pub enum TaskResult {
 }
 
 #[derive(Copy, Clone, Debug, PartialEq, Eq, Serialize, Deserialize, FromSqlRow, AsExpression)]
-#[serde(tag = "state", rename_all = "UPPERCASE")]
+#[serde(tag = "state", rename_all = "SCREAMING_SNAKE_CASE")]
 #[diesel(sql_type = db_impl::TaskStatusSqlType)]
 pub enum TaskStatus {
     NeedsUserValidation,