diff --git a/Jellyfin.Server.Implementations/Migrations/20200531020729_AddUsers.Designer.cs b/Jellyfin.Server.Implementations/Migrations/20200613155524_AddUsers.Designer.cs
similarity index 97%
rename from Jellyfin.Server.Implementations/Migrations/20200531020729_AddUsers.Designer.cs
rename to Jellyfin.Server.Implementations/Migrations/20200613155524_AddUsers.Designer.cs
index 04fb9132da..6b81b87115 100644
--- a/Jellyfin.Server.Implementations/Migrations/20200531020729_AddUsers.Designer.cs
+++ b/Jellyfin.Server.Implementations/Migrations/20200613155524_AddUsers.Designer.cs
@@ -1,7 +1,4 @@
-#pragma warning disable CS1591
-#pragma warning disable SA1601
-
-// <auto-generated />
+// <auto-generated />
 using System;
 using Jellyfin.Server.Implementations;
 using Microsoft.EntityFrameworkCore;
@@ -12,7 +9,7 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 namespace Jellyfin.Server.Implementations.Migrations
 {
     [DbContext(typeof(JellyfinDb))]
-    [Migration("20200531020729_AddUsers")]
+    [Migration("20200613155524_AddUsers")]
     partial class AddUsers
     {
         protected override void BuildTargetModel(ModelBuilder modelBuilder)
@@ -44,7 +41,7 @@ namespace Jellyfin.Server.Implementations.Migrations
 
                     b.HasIndex("UserId");
 
-                    b.ToTable("AccessSchedule");
+                    b.ToTable("AccessSchedules");
                 });
 
             modelBuilder.Entity("Jellyfin.Data.Entities.ActivityLog", b =>
@@ -109,7 +106,7 @@ namespace Jellyfin.Server.Implementations.Migrations
 
                     b.HasKey("Id");
 
-                    b.ToTable("ImageInfo");
+                    b.ToTable("ImageInfos");
                 });
 
             modelBuilder.Entity("Jellyfin.Data.Entities.Permission", b =>
diff --git a/Jellyfin.Server.Implementations/Migrations/20200531020729_AddUsers.cs b/Jellyfin.Server.Implementations/Migrations/20200613155524_AddUsers.cs
similarity index 92%
rename from Jellyfin.Server.Implementations/Migrations/20200531020729_AddUsers.cs
rename to Jellyfin.Server.Implementations/Migrations/20200613155524_AddUsers.cs
index ec6b374ec1..68be8fcefe 100644
--- a/Jellyfin.Server.Implementations/Migrations/20200531020729_AddUsers.cs
+++ b/Jellyfin.Server.Implementations/Migrations/20200613155524_AddUsers.cs
@@ -1,7 +1,4 @@
-#pragma warning disable CS1591
-#pragma warning disable SA1601
-
-using System;
+using System;
 using Microsoft.EntityFrameworkCore.Migrations;
 
 namespace Jellyfin.Server.Implementations.Migrations
@@ -11,7 +8,7 @@ namespace Jellyfin.Server.Implementations.Migrations
         protected override void Up(MigrationBuilder migrationBuilder)
         {
             migrationBuilder.CreateTable(
-                name: "ImageInfo",
+                name: "ImageInfos",
                 schema: "jellyfin",
                 columns: table => new
                 {
@@ -22,7 +19,7 @@ namespace Jellyfin.Server.Implementations.Migrations
                 },
                 constraints: table =>
                 {
-                    table.PrimaryKey("PK_ImageInfo", x => x.Id);
+                    table.PrimaryKey("PK_ImageInfos", x => x.Id);
                 });
 
             migrationBuilder.CreateTable(
@@ -65,16 +62,16 @@ namespace Jellyfin.Server.Implementations.Migrations
                 {
                     table.PrimaryKey("PK_Users", x => x.Id);
                     table.ForeignKey(
-                        name: "FK_Users_ImageInfo_ProfileImageId",
+                        name: "FK_Users_ImageInfos_ProfileImageId",
                         column: x => x.ProfileImageId,
                         principalSchema: "jellyfin",
-                        principalTable: "ImageInfo",
+                        principalTable: "ImageInfos",
                         principalColumn: "Id",
                         onDelete: ReferentialAction.Restrict);
                 });
 
             migrationBuilder.CreateTable(
-                name: "AccessSchedule",
+                name: "AccessSchedules",
                 schema: "jellyfin",
                 columns: table => new
                 {
@@ -87,9 +84,9 @@ namespace Jellyfin.Server.Implementations.Migrations
                 },
                 constraints: table =>
                 {
-                    table.PrimaryKey("PK_AccessSchedule", x => x.Id);
+                    table.PrimaryKey("PK_AccessSchedules", x => x.Id);
                     table.ForeignKey(
-                        name: "FK_AccessSchedule_Users_UserId",
+                        name: "FK_AccessSchedules_Users_UserId",
                         column: x => x.UserId,
                         principalSchema: "jellyfin",
                         principalTable: "Users",
@@ -146,9 +143,9 @@ namespace Jellyfin.Server.Implementations.Migrations
                 });
 
             migrationBuilder.CreateIndex(
-                name: "IX_AccessSchedule_UserId",
+                name: "IX_AccessSchedules_UserId",
                 schema: "jellyfin",
-                table: "AccessSchedule",
+                table: "AccessSchedules",
                 column: "UserId");
 
             migrationBuilder.CreateIndex(
@@ -173,7 +170,7 @@ namespace Jellyfin.Server.Implementations.Migrations
         protected override void Down(MigrationBuilder migrationBuilder)
         {
             migrationBuilder.DropTable(
-                name: "AccessSchedule",
+                name: "AccessSchedules",
                 schema: "jellyfin");
 
             migrationBuilder.DropTable(
@@ -189,7 +186,7 @@ namespace Jellyfin.Server.Implementations.Migrations
                 schema: "jellyfin");
 
             migrationBuilder.DropTable(
-                name: "ImageInfo",
+                name: "ImageInfos",
                 schema: "jellyfin");
         }
     }
diff --git a/Jellyfin.Server.Implementations/Migrations/JellyfinDbModelSnapshot.cs b/Jellyfin.Server.Implementations/Migrations/JellyfinDbModelSnapshot.cs
index 115c98aa3d..9548c38a39 100644
--- a/Jellyfin.Server.Implementations/Migrations/JellyfinDbModelSnapshot.cs
+++ b/Jellyfin.Server.Implementations/Migrations/JellyfinDbModelSnapshot.cs
@@ -39,7 +39,7 @@ namespace Jellyfin.Server.Implementations.Migrations
 
                     b.HasIndex("UserId");
 
-                    b.ToTable("AccessSchedule");
+                    b.ToTable("AccessSchedules");
                 });
 
             modelBuilder.Entity("Jellyfin.Data.Entities.ActivityLog", b =>
@@ -104,7 +104,7 @@ namespace Jellyfin.Server.Implementations.Migrations
 
                     b.HasKey("Id");
 
-                    b.ToTable("ImageInfo");
+                    b.ToTable("ImageInfos");
                 });
 
             modelBuilder.Entity("Jellyfin.Data.Entities.Permission", b =>