diff --git a/diode-server/.mockery.yaml b/diode-server/.mockery.yaml
index 8e03f81f..013d14a2 100644
--- a/diode-server/.mockery.yaml
+++ b/diode-server/.mockery.yaml
@@ -1,8 +1,8 @@
 mockname: "{{.InterfaceName}}"
-structname: "{{.InterfaceName}}.go"
 filename: "{{.InterfaceName | lower }}.go"
 with-expecter: true
 issue-845-fix: true
+resolve-type-alias: False
 packages:
   github.com/netboxlabs/diode/diode-server/netboxdiodeplugin:
     config:
diff --git a/diode-server/gen/dbstore/postgres/deviations.sql.go b/diode-server/gen/dbstore/postgres/deviations.sql.go
index 5ad21ec9..59d6394e 100644
--- a/diode-server/gen/dbstore/postgres/deviations.sql.go
+++ b/diode-server/gen/dbstore/postgres/deviations.sql.go
@@ -15,8 +15,10 @@ const retrieveDeviations = `-- name: RetrieveDeviations :many
 SELECT v_ingestion_logs_with_change_set.id, v_ingestion_logs_with_change_set.external_id, v_ingestion_logs_with_change_set.object_type, v_ingestion_logs_with_change_set.state, v_ingestion_logs_with_change_set.request_id, v_ingestion_logs_with_change_set.ingestion_ts, v_ingestion_logs_with_change_set.producer_app_name, v_ingestion_logs_with_change_set.producer_app_version, v_ingestion_logs_with_change_set.sdk_name, v_ingestion_logs_with_change_set.sdk_version, v_ingestion_logs_with_change_set.entity, v_ingestion_logs_with_change_set.error, v_ingestion_logs_with_change_set.source_metadata, v_ingestion_logs_with_change_set.created_at, v_ingestion_logs_with_change_set.updated_at, v_ingestion_logs_with_change_set.change_set, v_ingestion_logs_with_change_set.changes
 FROM v_ingestion_logs_with_change_set
 WHERE (v_ingestion_logs_with_change_set.state = ANY ($1::text[]) OR $1 IS NULL)
-  AND (v_ingestion_logs_with_change_set.object_type = ANY ($2::text[]) OR $2 IS NULL)
-  AND (v_ingestion_logs_with_change_set.branch_id = ANY ($3::text[]) OR $3 IS NULL)
+  AND (v_ingestion_logs_with_change_set.object_type = ANY ($2::text[]) OR
+       $2 IS NULL)
+  AND (v_ingestion_logs_with_change_set.branch_id = ANY ($3::text[]) OR
+       $3 IS NULL)
   AND (v_ingestion_logs_with_change_set.ingestion_ts >= $4 OR
        $4 IS NULL)
   AND (v_ingestion_logs_with_change_set.ingestion_ts <= $5 OR
diff --git a/diode-server/netboxdiodeplugin/mocks/netboxapi.go b/diode-server/netboxdiodeplugin/mocks/netboxapi.go
index 38e2fa55..46b82906 100644
--- a/diode-server/netboxdiodeplugin/mocks/netboxapi.go
+++ b/diode-server/netboxdiodeplugin/mocks/netboxapi.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.50.1. DO NOT EDIT.
+// Code generated by mockery v2.51.0. DO NOT EDIT.
 
 package mocks
 
diff --git a/diode-server/reconciler/mocks/ingestionprocessorops.go b/diode-server/reconciler/mocks/ingestionprocessorops.go
index 399c3ccd..77c57e97 100644
--- a/diode-server/reconciler/mocks/ingestionprocessorops.go
+++ b/diode-server/reconciler/mocks/ingestionprocessorops.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.50.1. DO NOT EDIT.
+// Code generated by mockery v2.51.0. DO NOT EDIT.
 
 package mocks
 
diff --git a/diode-server/reconciler/mocks/redisclient.go b/diode-server/reconciler/mocks/redisclient.go
index dbe9207c..2816ddb9 100644
--- a/diode-server/reconciler/mocks/redisclient.go
+++ b/diode-server/reconciler/mocks/redisclient.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.50.1. DO NOT EDIT.
+// Code generated by mockery v2.51.0. DO NOT EDIT.
 
 package mocks
 
diff --git a/diode-server/reconciler/mocks/repository.go b/diode-server/reconciler/mocks/repository.go
index 01aa9fae..c260bd4a 100644
--- a/diode-server/reconciler/mocks/repository.go
+++ b/diode-server/reconciler/mocks/repository.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.50.1. DO NOT EDIT.
+// Code generated by mockery v2.51.0. DO NOT EDIT.
 
 package mocks