diff --git a/http-client/lib/repo/commit.ts b/http-client/lib/repo/commit.ts
index 2279ee768..6b4147bff 100644
--- a/http-client/lib/repo/commit.ts
+++ b/http-client/lib/repo/commit.ts
@@ -142,23 +142,23 @@ const diffChangesetSchema = object({
 });
 
 const diffAddedChangesetSchema = diffChangesetSchema.merge(
-  object({ state: literal("added"), new: diffFileSchema }),
+  object({ status: literal("added"), new: diffFileSchema }),
 );
 
 const diffDeletedChangesetSchema = diffChangesetSchema.merge(
-  object({ state: literal("deleted"), old: diffFileSchema }),
+  object({ status: literal("deleted"), old: diffFileSchema }),
 );
 
 const diffModifiedChangesetSchema = diffChangesetSchema.merge(
   object({
-    state: literal("modified"),
+    status: literal("modified"),
     new: diffFileSchema,
     old: diffFileSchema,
   }),
 );
 
 const diffCopiedChangesetSchema = object({
-  state: literal("copied"),
+  status: literal("copied"),
   newPath: string(),
   oldPath: string(),
 });
@@ -173,7 +173,7 @@ const diffCopiedWithModificationsChangesetSchema =
   );
 
 const diffMovedChangesetSchema = object({
-  state: literal("moved"),
+  status: literal("moved"),
   newPath: string(),
   oldPath: string(),
   current: diffFileSchema,
diff --git a/src/views/repos/Changeset.svelte b/src/views/repos/Changeset.svelte
index a551cba04..0c9676270 100644
--- a/src/views/repos/Changeset.svelte
+++ b/src/views/repos/Changeset.svelte
@@ -22,8 +22,8 @@
   const diffDescription = (diffFiles: Diff["files"]): string =>
     Object.entries(
       diffFiles.reduce(
-        (acc, { state }) => {
-          acc[state]++;
+        (acc, { status }) => {
+          acc[status]++;
           return acc;
         },
         { added: 0, modified: 0, deleted: 0, copied: 0, moved: 0 },
@@ -109,7 +109,7 @@
             filePath={path}
             oldFilePath={"oldPath" in file ? file.oldPath : undefined}
             fileDiff={file.diff}
-            headerBadgeCaption={file.state}
+            headerBadgeCaption={file.status}
             content={"new" in file ? files[file.new.oid]?.content : undefined}
             oldContent={"old" in file
               ? files[file.old.oid]?.content
@@ -117,7 +117,7 @@
             visible={filesVisibility.has(path)} />
         {:else}
           <FileLocationChange
-            headerBadgeCaption={file.state}
+            headerBadgeCaption={file.status}
             oldPath={file.oldPath}
             newPath={file.newPath}
             {repoId}
diff --git a/src/views/repos/Changeset/FileDiff.svelte b/src/views/repos/Changeset/FileDiff.svelte
index a5f71731f..ede0aac09 100644
--- a/src/views/repos/Changeset/FileDiff.svelte
+++ b/src/views/repos/Changeset/FileDiff.svelte
@@ -28,7 +28,7 @@
   export let content: string | undefined = undefined;
   export let oldFilePath: string | undefined = undefined;
   export let fileDiff: DiffContent;
-  export let headerBadgeCaption: ChangesetWithDiff["state"];
+  export let headerBadgeCaption: ChangesetWithDiff["status"];
   export let revision: string | undefined = undefined;
   export let baseUrl: BaseUrl;
   export let repoId: string;
diff --git a/src/views/repos/Changeset/FileLocationChange.svelte b/src/views/repos/Changeset/FileLocationChange.svelte
index 137ba7a22..820364238 100644
--- a/src/views/repos/Changeset/FileLocationChange.svelte
+++ b/src/views/repos/Changeset/FileLocationChange.svelte
@@ -7,7 +7,7 @@
   import Link from "@app/components/Link.svelte";
   import FilePath from "@app/components/FilePath.svelte";
 
-  export let headerBadgeCaption: ChangesetWithoutDiff["state"];
+  export let headerBadgeCaption: ChangesetWithoutDiff["status"];
   export let newPath: string;
   export let oldPath: string;
   export let revision: string | undefined = undefined;