diff --git a/AccessQueueService/Data/AccessQueueRepository.cs b/AccessQueueService/Data/AccessQueueRepository.cs
index 6edef9f..2361c83 100644
--- a/AccessQueueService/Data/AccessQueueRepository.cs
+++ b/AccessQueueService/Data/AccessQueueRepository.cs
@@ -179,9 +179,12 @@ namespace AccessQueueService.Data
             _nextUnusedTicket = newIndex;
         }
 
-        public TakeANumberAccessQueueRepoState ToState()
+        public AccessQueueRepositoryState ToState()
         {
-            var state = new TakeANumberAccessQueueRepoState
+            var accessTickets = new Dictionary<string, AccessTicket>(_accessTickets);
+            var accessQueue = new Dictionary<ulong, AccessTicket>(_accessQueue);
+
+            var state = new AccessQueueRepositoryState
             {
                 AccessTickets = new Dictionary<string, AccessTicket>(_accessTickets),
                 AccessQueue = new Dictionary<ulong, AccessTicket>(_accessQueue),
@@ -189,7 +192,7 @@ namespace AccessQueueService.Data
             return state;
         }
 
-        public static AccessQueueRepository FromState(TakeANumberAccessQueueRepoState state)
+        public static AccessQueueRepository FromState(AccessQueueRepositoryState state)
         {
             if (state?.AccessTickets == null || state?.AccessQueue == null)
             {
diff --git a/AccessQueueService/Models/TakeANumberAccessQueueRepoState.cs b/AccessQueueService/Models/AccessQueueRepositoryState.cs
similarity index 81%
rename from AccessQueueService/Models/TakeANumberAccessQueueRepoState.cs
rename to AccessQueueService/Models/AccessQueueRepositoryState.cs
index 93f328a..ed072fe 100644
--- a/AccessQueueService/Models/TakeANumberAccessQueueRepoState.cs
+++ b/AccessQueueService/Models/AccessQueueRepositoryState.cs
@@ -1,6 +1,6 @@
 namespace AccessQueueService.Models
 {
-    public class TakeANumberAccessQueueRepoState
+    public class AccessQueueRepositoryState
     {
         public Dictionary<string, AccessTicket> AccessTickets { get; set; } = [];
         public Dictionary<ulong, AccessTicket> AccessQueue { get; set; } = [];
diff --git a/AccessQueueService/Program.cs b/AccessQueueService/Program.cs
index 1c6ba7b..8764210 100644
--- a/AccessQueueService/Program.cs
+++ b/AccessQueueService/Program.cs
@@ -27,7 +27,7 @@ builder.Services.AddSingleton<AccessQueueRepository>(sp =>
         try
         {
             string json = File.ReadAllText(filePath);
-            var state = JsonSerializer.Deserialize<TakeANumberAccessQueueRepoState>(json);
+            var state = JsonSerializer.Deserialize<AccessQueueRepositoryState>(json);
             if (state == null)
             {
                 Console.WriteLine($"Failed to load state from {filePath}. Deserialized object was null.");