diff --git a/src/JobsJobsJobs/Client/Pages/Citizen/Authorized.razor b/src/JobsJobsJobs/Client/Pages/Citizens/Authorized.razor
similarity index 100%
rename from src/JobsJobsJobs/Client/Pages/Citizen/Authorized.razor
rename to src/JobsJobsJobs/Client/Pages/Citizens/Authorized.razor
diff --git a/src/JobsJobsJobs/Client/Pages/Citizen/Authorized.razor.cs b/src/JobsJobsJobs/Client/Pages/Citizens/Authorized.razor.cs
similarity index 96%
rename from src/JobsJobsJobs/Client/Pages/Citizen/Authorized.razor.cs
rename to src/JobsJobsJobs/Client/Pages/Citizens/Authorized.razor.cs
index 06d6c2c..e997597 100644
--- a/src/JobsJobsJobs/Client/Pages/Citizen/Authorized.razor.cs
+++ b/src/JobsJobsJobs/Client/Pages/Citizens/Authorized.razor.cs
@@ -2,7 +2,7 @@
 using Microsoft.AspNetCore.WebUtilities;
 using System.Threading.Tasks;
 
-namespace JobsJobsJobs.Client.Pages.Citizen
+namespace JobsJobsJobs.Client.Pages.Citizens
 {
     public partial class Authorized : ComponentBase
     {
diff --git a/src/JobsJobsJobs/Client/Pages/Citizen/Dashboard.razor b/src/JobsJobsJobs/Client/Pages/Citizens/Dashboard.razor
similarity index 100%
rename from src/JobsJobsJobs/Client/Pages/Citizen/Dashboard.razor
rename to src/JobsJobsJobs/Client/Pages/Citizens/Dashboard.razor
diff --git a/src/JobsJobsJobs/Client/Pages/Citizen/Dashboard.razor.cs b/src/JobsJobsJobs/Client/Pages/Citizens/Dashboard.razor.cs
similarity index 90%
rename from src/JobsJobsJobs/Client/Pages/Citizen/Dashboard.razor.cs
rename to src/JobsJobsJobs/Client/Pages/Citizens/Dashboard.razor.cs
index dd967e5..63f390e 100644
--- a/src/JobsJobsJobs/Client/Pages/Citizen/Dashboard.razor.cs
+++ b/src/JobsJobsJobs/Client/Pages/Citizens/Dashboard.razor.cs
@@ -1,10 +1,10 @@
-using JobsJobsJobs.Shared.Api;
+using JobsJobsJobs.Shared;
+using JobsJobsJobs.Shared.Api;
 using Microsoft.AspNetCore.Components;
 using System.Collections.Generic;
 using System.Threading.Tasks;
-using Domain = JobsJobsJobs.Shared;
 
-namespace JobsJobsJobs.Client.Pages.Citizen
+namespace JobsJobsJobs.Client.Pages.Citizens
 {
     /// <summary>
     /// The first page a user sees after signing in
@@ -14,7 +14,7 @@ namespace JobsJobsJobs.Client.Pages.Citizen
         /// <summary>
         /// The user's profile
         /// </summary>
-        private Domain.Profile? Profile { get; set; } = null;
+        private Profile? Profile { get; set; } = null;
 
         /// <summary>
         /// The number of profiles
diff --git a/src/JobsJobsJobs/Client/Pages/Citizen/EditProfile.razor b/src/JobsJobsJobs/Client/Pages/Citizens/EditProfile.razor
similarity index 100%
rename from src/JobsJobsJobs/Client/Pages/Citizen/EditProfile.razor
rename to src/JobsJobsJobs/Client/Pages/Citizens/EditProfile.razor
diff --git a/src/JobsJobsJobs/Client/Pages/Citizen/EditProfile.razor.cs b/src/JobsJobsJobs/Client/Pages/Citizens/EditProfile.razor.cs
similarity index 98%
rename from src/JobsJobsJobs/Client/Pages/Citizen/EditProfile.razor.cs
rename to src/JobsJobsJobs/Client/Pages/Citizens/EditProfile.razor.cs
index dec8acc..c4a4d82 100644
--- a/src/JobsJobsJobs/Client/Pages/Citizen/EditProfile.razor.cs
+++ b/src/JobsJobsJobs/Client/Pages/Citizens/EditProfile.razor.cs
@@ -6,7 +6,7 @@ using System.Linq;
 using System.Net.Http.Json;
 using System.Threading.Tasks;
 
-namespace JobsJobsJobs.Client.Pages.Citizen
+namespace JobsJobsJobs.Client.Pages.Citizens
 {
     /// <summary>
     /// Profile edit page (called EditProfile so as not to create naming conflicts)
diff --git a/src/JobsJobsJobs/Client/Pages/Citizen/LogOff.razor b/src/JobsJobsJobs/Client/Pages/Citizens/LogOff.razor
similarity index 100%
rename from src/JobsJobsJobs/Client/Pages/Citizen/LogOff.razor
rename to src/JobsJobsJobs/Client/Pages/Citizens/LogOff.razor
diff --git a/src/JobsJobsJobs/Client/Pages/Profile/Search.razor b/src/JobsJobsJobs/Client/Pages/Profiles/Search.razor
similarity index 100%
rename from src/JobsJobsJobs/Client/Pages/Profile/Search.razor
rename to src/JobsJobsJobs/Client/Pages/Profiles/Search.razor
diff --git a/src/JobsJobsJobs/Client/Pages/Profile/Search.razor.cs b/src/JobsJobsJobs/Client/Pages/Profiles/Search.razor.cs
similarity index 99%
rename from src/JobsJobsJobs/Client/Pages/Profile/Search.razor.cs
rename to src/JobsJobsJobs/Client/Pages/Profiles/Search.razor.cs
index 990a5d1..bc725c7 100644
--- a/src/JobsJobsJobs/Client/Pages/Profile/Search.razor.cs
+++ b/src/JobsJobsJobs/Client/Pages/Profiles/Search.razor.cs
@@ -8,7 +8,7 @@ using System.Linq;
 using System.Net;
 using System.Threading.Tasks;
 
-namespace JobsJobsJobs.Client.Pages.Profile
+namespace JobsJobsJobs.Client.Pages.Profiles
 {
     public partial class Search : ComponentBase
     {
diff --git a/src/JobsJobsJobs/Client/Pages/Profile/View.razor b/src/JobsJobsJobs/Client/Pages/Profiles/View.razor
similarity index 100%
rename from src/JobsJobsJobs/Client/Pages/Profile/View.razor
rename to src/JobsJobsJobs/Client/Pages/Profiles/View.razor
diff --git a/src/JobsJobsJobs/Client/Pages/Profile/View.razor.cs b/src/JobsJobsJobs/Client/Pages/Profiles/View.razor.cs
similarity index 84%
rename from src/JobsJobsJobs/Client/Pages/Profile/View.razor.cs
rename to src/JobsJobsJobs/Client/Pages/Profiles/View.razor.cs
index 42e79dd..69aafc2 100644
--- a/src/JobsJobsJobs/Client/Pages/Profile/View.razor.cs
+++ b/src/JobsJobsJobs/Client/Pages/Profiles/View.razor.cs
@@ -1,21 +1,21 @@
-using Microsoft.AspNetCore.Components;
+using JobsJobsJobs.Shared;
+using Microsoft.AspNetCore.Components;
 using System.Collections.Generic;
 using System.Threading.Tasks;
-using Domain = JobsJobsJobs.Shared;
 
-namespace JobsJobsJobs.Client.Pages.Profile
+namespace JobsJobsJobs.Client.Pages.Profiles
 {
     public partial class View : ComponentBase
     {
         /// <summary>
         /// The citizen whose profile is being displayed
         /// </summary>
-        private Domain.Citizen Citizen { get; set; } = default!;
+        private Citizen Citizen { get; set; } = default!;
 
         /// <summary>
         /// The profile to display
         /// </summary>
-        private Domain.Profile Profile { get; set; } = default!;
+        private Profile Profile { get; set; } = default!;
 
         /// <summary>
         /// The work types for the top of the page
@@ -55,8 +55,8 @@ namespace JobsJobsJobs.Client.Pages.Profile
         public async Task RetrieveProfile(ICollection<string> errors)
         {
             ServerApi.SetJwt(http, state);
-            var citizenTask = ServerApi.RetrieveOne<Domain.Citizen>(http, $"citizen/get/{Id}");
-            var profileTask = ServerApi.RetrieveOne<Domain.Profile>(http, $"profile/get/{Id}");
+            var citizenTask = ServerApi.RetrieveOne<Citizen>(http, $"citizen/get/{Id}");
+            var profileTask = ServerApi.RetrieveOne<Profile>(http, $"profile/get/{Id}");
 
             await Task.WhenAll(citizenTask, profileTask);
 
diff --git a/src/JobsJobsJobs/Client/Pages/SuccessStory/ViewStory.razor.cs b/src/JobsJobsJobs/Client/Pages/SuccessStory/ViewStory.razor.cs
index 115abfd..6836222 100644
--- a/src/JobsJobsJobs/Client/Pages/SuccessStory/ViewStory.razor.cs
+++ b/src/JobsJobsJobs/Client/Pages/SuccessStory/ViewStory.razor.cs
@@ -1,7 +1,7 @@
-using Microsoft.AspNetCore.Components;
+using JobsJobsJobs.Shared;
+using Microsoft.AspNetCore.Components;
 using System.Collections.Generic;
 using System.Threading.Tasks;
-using Domain = JobsJobsJobs.Shared;
 
 namespace JobsJobsJobs.Client.Pages.SuccessStory
 {
@@ -16,12 +16,12 @@ namespace JobsJobsJobs.Client.Pages.SuccessStory
         /// <summary>
         /// The success story to be displayed
         /// </summary>
-        private Domain.Success Story { get; set; } = default!;
+        private Success Story { get; set; } = default!;
 
         /// <summary>
         /// The citizen who authorized this success story
         /// </summary>
-        private Domain.Citizen Citizen { get; set; } = default!;
+        private Citizen Citizen { get; set; } = default!;
 
         /// <summary>
         /// Retrieve the success story
@@ -30,7 +30,7 @@ namespace JobsJobsJobs.Client.Pages.SuccessStory
         public async Task RetrieveStory(ICollection<string> errors)
         {
             ServerApi.SetJwt(http, state);
-            var story = await ServerApi.RetrieveOne<Domain.Success>(http, $"success/{Id}");
+            var story = await ServerApi.RetrieveOne<Success>(http, $"success/{Id}");
 
             if (story.IsOk)
             {
@@ -41,7 +41,7 @@ namespace JobsJobsJobs.Client.Pages.SuccessStory
                 else
                 {
                     Story = story.Ok;
-                    var citizen = await ServerApi.RetrieveOne<Domain.Citizen>(http, $"citizen/get/{Story.CitizenId}");
+                    var citizen = await ServerApi.RetrieveOne<Citizen>(http, $"citizen/get/{Story.CitizenId}");
                     if (citizen.IsOk)
                     {
                         if (citizen.Ok == null)