diff --git a/services/directory/src/FilterLists.Directory.Infrastructure.Migrations/Migrations/20200827213520_InitialData.Designer.cs b/services/directory/src/FilterLists.Directory.Infrastructure.Migrations/Migrations/20200827115451_Initial.Designer.cs
similarity index 99%
rename from services/directory/src/FilterLists.Directory.Infrastructure.Migrations/Migrations/20200827213520_InitialData.Designer.cs
rename to services/directory/src/FilterLists.Directory.Infrastructure.Migrations/Migrations/20200827115451_Initial.Designer.cs
index 022a933be..5b47ec5b8 100644
--- a/services/directory/src/FilterLists.Directory.Infrastructure.Migrations/Migrations/20200827213520_InitialData.Designer.cs
+++ b/services/directory/src/FilterLists.Directory.Infrastructure.Migrations/Migrations/20200827115451_Initial.Designer.cs
@@ -10,8 +10,8 @@
 namespace FilterLists.Directory.Infrastructure.Migrations.Migrations
 {
     [DbContext(typeof(QueryDbContext))]
-    [Migration("20200827213520_InitialData")]
-    partial class InitialData
+    [Migration("20200827115451_Initial")]
+    partial class Initial
     {
         protected override void BuildTargetModel(ModelBuilder modelBuilder)
         {
diff --git a/services/directory/src/FilterLists.Directory.Infrastructure.Migrations/Migrations/20200827213520_InitialData.cs b/services/directory/src/FilterLists.Directory.Infrastructure.Migrations/Migrations/20200827115451_Initial.cs
similarity index 99%
rename from services/directory/src/FilterLists.Directory.Infrastructure.Migrations/Migrations/20200827213520_InitialData.cs
rename to services/directory/src/FilterLists.Directory.Infrastructure.Migrations/Migrations/20200827115451_Initial.cs
index 688b14be8..724b0eeae 100644
--- a/services/directory/src/FilterLists.Directory.Infrastructure.Migrations/Migrations/20200827213520_InitialData.cs
+++ b/services/directory/src/FilterLists.Directory.Infrastructure.Migrations/Migrations/20200827115451_Initial.cs
@@ -3,7 +3,7 @@
 
 namespace FilterLists.Directory.Infrastructure.Migrations.Migrations
 {
-    public partial class InitialData : Migration
+    public partial class Initial : Migration
     {
         protected override void Up(MigrationBuilder migrationBuilder)
         {
diff --git a/services/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterList.cs b/services/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterList.cs
index 8925f1162..1f6e6c67d 100644
--- a/services/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterList.cs
+++ b/services/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterList.cs
@@ -17,15 +17,15 @@ public class FilterList
         public IReadOnlyCollection<FilterListLanguage> FilterListLanguages { get; private set; } = new HashSet<FilterListLanguage>();
         public IReadOnlyCollection<FilterListTag> FilterListTags { get; private set; } = new HashSet<FilterListTag>();
         public IReadOnlyCollection<FilterListViewUrl> ViewUrls { get; private set; } = new HashSet<FilterListViewUrl>();
-        public string? HomeUrl { get; set; }
-        public string? OnionUrl { get; set; }
-        public string? PolicyUrl { get; set; }
-        public string? SubmissionUrl { get; set; }
-        public string? IssuesUrl { get; set; }
-        public string? ForumUrl { get; set; }
-        public string? ChatUrl { get; set; }
+        public Uri? HomeUrl { get; set; }
+        public Uri? OnionUrl { get; set; }
+        public Uri? PolicyUrl { get; set; }
+        public Uri? SubmissionUrl { get; set; }
+        public Uri? IssuesUrl { get; set; }
+        public Uri? ForumUrl { get; set; }
+        public Uri? ChatUrl { get; set; }
         public string? EmailAddress { get; set; }
-        public string? DonateUrl { get; set; }
+        public Uri? DonateUrl { get; set; }
         public IReadOnlyCollection<FilterListMaintainer> FilterListMaintainers { get; private set; } = new HashSet<FilterListMaintainer>();
         public IReadOnlyCollection<Fork> UpstreamFilterLists { get; private set; } = new HashSet<Fork>();
         public IReadOnlyCollection<Fork> ForkFilterLists { get; private set; } = new HashSet<Fork>();
diff --git a/services/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterListViewUrl.cs b/services/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterListViewUrl.cs
index 8628de80c..c25f3b937 100644
--- a/services/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterListViewUrl.cs
+++ b/services/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterListViewUrl.cs
@@ -6,6 +6,6 @@ public class FilterListViewUrl
     {
         public int SegmentNumber { get; set; }
         public int Primariness { get; set; }
-        public string Url { get; set; } = null!;
+        public Uri Url { get; set; } = null!;
     }
 }
\ No newline at end of file
diff --git a/services/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/License.cs b/services/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/License.cs
index 3262da859..54f8f0858 100644
--- a/services/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/License.cs
+++ b/services/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/License.cs
@@ -10,7 +10,7 @@ public class License
         public int Id { get; set; }
         public string Name { get; set; } = null!;
         public string? GitHubKey { get; set; }
-        public string? Url { get; set; }
+        public Uri? Url { get; set; }
         public IReadOnlyCollection<FilterList> FilterLists { get; private set; } = new HashSet<FilterList>();
     }
 
diff --git a/services/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Maintainer.cs b/services/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Maintainer.cs
index 7be6b2d24..36a24fad3 100644
--- a/services/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Maintainer.cs
+++ b/services/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Maintainer.cs
@@ -9,7 +9,7 @@ public class Maintainer
     {
         public int Id { get; set; }
         public string Name { get; set; } = null!;
-        public string? Url { get; set; }
+        public Uri? Url { get; set; }
         public string? EmailAddress { get; set; }
         public string? TwitterHandle { get; set; }
         public IReadOnlyCollection<FilterListMaintainer> FilterListMaintainers { get; private set; } = new HashSet<FilterListMaintainer>();
diff --git a/services/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Software.cs b/services/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Software.cs
index a41bd19a8..2f00aa40d 100644
--- a/services/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Software.cs
+++ b/services/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Software.cs
@@ -10,8 +10,8 @@ public class Software
         public int Id { get; set; }
         public string Name { get; set; } = null!;
         public string? Description { get; set; }
-        public string? HomeUrl { get; set; }
-        public string? DownloadUrl { get; set; }
+        public Uri? HomeUrl { get; set; }
+        public Uri? DownloadUrl { get; set; }
         public bool SupportsAbpUrlScheme { get; set; }
         public IReadOnlyCollection<SoftwareSyntax> SoftwareSyntaxes { get; private set; } = new HashSet<SoftwareSyntax>();
     }
diff --git a/services/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Syntax.cs b/services/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Syntax.cs
index 7ba3697f5..18179aba5 100644
--- a/services/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Syntax.cs
+++ b/services/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Syntax.cs
@@ -10,7 +10,7 @@ public class Syntax
         public int Id { get; set; }
         public string Name { get; set; } = null!;
         public string? Description { get; set; }
-        public string? Url { get; set; }
+        public Uri? Url { get; set; }
         public IReadOnlyCollection<FilterListSyntax> FilterListSyntaxes { get; private set; } = new HashSet<FilterListSyntax>();
         public IReadOnlyCollection<SoftwareSyntax> SoftwareSyntaxes { get; private set; } = new HashSet<SoftwareSyntax>();
     }