diff --git a/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Dependent.cs b/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Dependent.cs
index 671f8fd3d..ade15ea57 100644
--- a/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Dependent.cs
+++ b/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Dependent.cs
@@ -1,4 +1,6 @@
-using Microsoft.EntityFrameworkCore;
+using System.Globalization;
+using EFCore.NamingConventions.Internal;
+using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
 
 namespace FilterLists.Directory.Infrastructure.Persistence.Queries.Entities;
@@ -15,7 +17,10 @@ internal class DependentTypeConfiguration : IEntityTypeConfiguration<Dependent>
 {
     public virtual void Configure(EntityTypeBuilder<Dependent> builder)
     {
-        builder.ToTable(nameof(Dependent) + "s");
+        // TODO: register and resolve INameRewriter
+        var nr = new SnakeCaseNameRewriter(CultureInfo.InvariantCulture);
+
+        builder.ToTable($"{nr.RewriteName(nameof(Dependent))}s");
         builder.HasKey(d => new { d.DependencyFilterListId, d.DependentFilterListId });
         builder.HasOne(d => d.DependencyFilterList)
             .WithMany(fl => fl.DependentFilterLists)
diff --git a/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterListLanguage.cs b/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterListLanguage.cs
index 69fca43fb..3beb75e04 100644
--- a/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterListLanguage.cs
+++ b/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterListLanguage.cs
@@ -1,4 +1,6 @@
-using Microsoft.EntityFrameworkCore;
+using System.Globalization;
+using EFCore.NamingConventions.Internal;
+using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
 
 namespace FilterLists.Directory.Infrastructure.Persistence.Queries.Entities;
@@ -15,7 +17,10 @@ internal class FilterListLanguageTypeConfiguration : IEntityTypeConfiguration<Fi
 {
     public virtual void Configure(EntityTypeBuilder<FilterListLanguage> builder)
     {
-        builder.ToTable(nameof(FilterListLanguage) + "s");
+        // TODO: register and resolve INameRewriter
+        var nr = new SnakeCaseNameRewriter(CultureInfo.InvariantCulture);
+
+        builder.ToTable($"{nr.RewriteName(nameof(FilterListLanguage))}s");
         builder.HasKey(fll => new { fll.FilterListId, fll.Iso6391 });
         builder.HasDataJsonFile<FilterListLanguage>();
     }
diff --git a/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterListMaintainer.cs b/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterListMaintainer.cs
index 7b64bc39c..0fcb85659 100644
--- a/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterListMaintainer.cs
+++ b/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterListMaintainer.cs
@@ -1,4 +1,6 @@
-using Microsoft.EntityFrameworkCore;
+using System.Globalization;
+using EFCore.NamingConventions.Internal;
+using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
 
 namespace FilterLists.Directory.Infrastructure.Persistence.Queries.Entities;
@@ -15,7 +17,10 @@ internal class FilterListMaintainerTypeConfiguration : IEntityTypeConfiguration<
 {
     public virtual void Configure(EntityTypeBuilder<FilterListMaintainer> builder)
     {
-        builder.ToTable(nameof(FilterListMaintainer) + "s");
+        // TODO: register and resolve INameRewriter
+        var nr = new SnakeCaseNameRewriter(CultureInfo.InvariantCulture);
+
+        builder.ToTable($"{nr.RewriteName(nameof(FilterListMaintainer))}s");
         builder.HasKey(flm => new { flm.FilterListId, flm.MaintainerId });
         builder.HasDataJsonFile<FilterListMaintainer>();
     }
diff --git a/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterListSyntax.cs b/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterListSyntax.cs
index 42dfd2645..ac27ec1bf 100644
--- a/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterListSyntax.cs
+++ b/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterListSyntax.cs
@@ -1,4 +1,6 @@
-using Microsoft.EntityFrameworkCore;
+using System.Globalization;
+using EFCore.NamingConventions.Internal;
+using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
 
 namespace FilterLists.Directory.Infrastructure.Persistence.Queries.Entities;
@@ -15,7 +17,10 @@ internal class FilterListSyntaxTypeConfiguration : IEntityTypeConfiguration<Filt
 {
     public virtual void Configure(EntityTypeBuilder<FilterListSyntax> builder)
     {
-        builder.ToTable(nameof(FilterListSyntax) + "es");
+        // TODO: register and resolve INameRewriter
+        var nr = new SnakeCaseNameRewriter(CultureInfo.InvariantCulture);
+
+        builder.ToTable($"{nr.RewriteName(nameof(FilterListSyntax))}es");
         builder.HasKey(fls => new { fls.FilterListId, fls.SyntaxId });
         builder.HasDataJsonFile<FilterListSyntax>();
     }
diff --git a/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterListTag.cs b/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterListTag.cs
index f2bacc965..65f14c61d 100644
--- a/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterListTag.cs
+++ b/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterListTag.cs
@@ -1,4 +1,6 @@
-using Microsoft.EntityFrameworkCore;
+using System.Globalization;
+using EFCore.NamingConventions.Internal;
+using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
 
 namespace FilterLists.Directory.Infrastructure.Persistence.Queries.Entities;
@@ -15,7 +17,10 @@ internal class FilterListTagTypeConfiguration : IEntityTypeConfiguration<FilterL
 {
     public virtual void Configure(EntityTypeBuilder<FilterListTag> builder)
     {
-        builder.ToTable(nameof(FilterListTag) + "s");
+        // TODO: register and resolve INameRewriter
+        var nr = new SnakeCaseNameRewriter(CultureInfo.InvariantCulture);
+
+        builder.ToTable($"{nr.RewriteName(nameof(FilterListTag))}s");
         builder.HasKey(flt => new { flt.FilterListId, flt.TagId });
         builder.HasDataJsonFile<FilterListTag>();
     }
diff --git a/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterListViewUrl.cs b/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterListViewUrl.cs
index 119159b99..5c0aba9fe 100644
--- a/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterListViewUrl.cs
+++ b/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterListViewUrl.cs
@@ -1,4 +1,6 @@
-using Microsoft.EntityFrameworkCore;
+using System.Globalization;
+using EFCore.NamingConventions.Internal;
+using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
 
 namespace FilterLists.Directory.Infrastructure.Persistence.Queries.Entities;
@@ -17,7 +19,10 @@ internal class FilterListViewUrlConfiguration : IEntityTypeConfiguration<FilterL
 {
     public virtual void Configure(EntityTypeBuilder<FilterListViewUrl> builder)
     {
-        builder.ToTable(nameof(FilterListViewUrl) + "s");
+        // TODO: register and resolve INameRewriter
+        var nr = new SnakeCaseNameRewriter(CultureInfo.InvariantCulture);
+
+        builder.ToTable($"{nr.RewriteName(nameof(FilterListViewUrl))}s");
         builder.Property(u => u.SegmentNumber)
             .HasDefaultValue(1);
         builder.Property(u => u.Primariness)
diff --git a/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Fork.cs b/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Fork.cs
index 19333e330..911146162 100644
--- a/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Fork.cs
+++ b/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Fork.cs
@@ -1,4 +1,6 @@
-using Microsoft.EntityFrameworkCore;
+using System.Globalization;
+using EFCore.NamingConventions.Internal;
+using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
 
 namespace FilterLists.Directory.Infrastructure.Persistence.Queries.Entities;
@@ -15,7 +17,10 @@ internal class ForkTypeConfiguration : IEntityTypeConfiguration<Fork>
 {
     public virtual void Configure(EntityTypeBuilder<Fork> builder)
     {
-        builder.ToTable(nameof(Fork) + "s");
+        // TODO: register and resolve INameRewriter
+        var nr = new SnakeCaseNameRewriter(CultureInfo.InvariantCulture);
+
+        builder.ToTable($"{nr.RewriteName(nameof(Fork))}s");
         builder.HasKey(f => new { f.UpstreamFilterListId, f.ForkFilterListId });
         builder.HasOne(f => f.UpstreamFilterList)
             .WithMany(fl => fl.ForkFilterLists)
diff --git a/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Merge.cs b/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Merge.cs
index 3b7f8f1f8..7bf1491cd 100644
--- a/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Merge.cs
+++ b/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Merge.cs
@@ -1,4 +1,6 @@
-using Microsoft.EntityFrameworkCore;
+using System.Globalization;
+using EFCore.NamingConventions.Internal;
+using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
 
 namespace FilterLists.Directory.Infrastructure.Persistence.Queries.Entities;
@@ -15,7 +17,10 @@ internal class MergeTypeConfiguration : IEntityTypeConfiguration<Merge>
 {
     public virtual void Configure(EntityTypeBuilder<Merge> builder)
     {
-        builder.ToTable(nameof(Merge) + "s");
+        // TODO: register and resolve INameRewriter
+        var nr = new SnakeCaseNameRewriter(CultureInfo.InvariantCulture);
+
+        builder.ToTable($"{nr.RewriteName(nameof(Merge))}s");
         builder.HasKey(m => new { m.IncludedInFilterListId, m.IncludesFilterListId });
         builder.HasOne(m => m.IncludedInFilterList)
             .WithMany(fl => fl.IncludesFilterLists)
diff --git a/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/SoftwareSyntax.cs b/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/SoftwareSyntax.cs
index 69f087dee..0e0df7d23 100644
--- a/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/SoftwareSyntax.cs
+++ b/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/SoftwareSyntax.cs
@@ -1,4 +1,6 @@
-using Microsoft.EntityFrameworkCore;
+using System.Globalization;
+using EFCore.NamingConventions.Internal;
+using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
 
 namespace FilterLists.Directory.Infrastructure.Persistence.Queries.Entities;
@@ -15,7 +17,10 @@ internal class SoftwareSyntaxTypeConfiguration : IEntityTypeConfiguration<Softwa
 {
     public virtual void Configure(EntityTypeBuilder<SoftwareSyntax> builder)
     {
-        builder.ToTable(nameof(SoftwareSyntax) + "es");
+        // TODO: register and resolve INameRewriter
+        var nr = new SnakeCaseNameRewriter(CultureInfo.InvariantCulture);
+
+        builder.ToTable($"{nr.RewriteName(nameof(SoftwareSyntax))}s");
         builder.HasKey(ss => new { ss.SoftwareId, ss.SyntaxId });
         builder.HasDataJsonFile<SoftwareSyntax>();
     }