diff --git a/Controllers/Managers/CoverArtManager.cs b/Controllers/Managers/CoverArtManager.cs
index 8988305..2b06f45 100644
--- a/Controllers/Managers/CoverArtManager.cs
+++ b/Controllers/Managers/CoverArtManager.cs
@@ -33,7 +33,7 @@ public class CoverArtManager : BaseManager
         _coverArtContext.Add(coverArt);
         _coverArtContext.SaveChanges();
 
-        song.CoverArtID = coverArt.CoverArtID;
+        song.CoverArtId = coverArt.Id;
     }
     public void DeleteCoverArtFromDatabase(CoverArt coverArt)
     {
diff --git a/Controllers/v1/CoverArtController.cs b/Controllers/v1/CoverArtController.cs
index 338ecb2..9172d7d 100644
--- a/Controllers/v1/CoverArtController.cs
+++ b/Controllers/v1/CoverArtController.cs
@@ -51,7 +51,7 @@ public class CoverArtController : BaseController
     [HttpGet("{id}")]
     public IActionResult GetCoverArt(int id)
     {
-        var coverArt = new CoverArt { CoverArtID = id };
+        var coverArt = new CoverArt { Id = id };
 
         var coverArtContext = new CoverArtContext(_connectionString);
 
diff --git a/Database/Contexts/CoverArtContext.cs b/Database/Contexts/CoverArtContext.cs
index f6cd149..2f3dfe3 100644
--- a/Database/Contexts/CoverArtContext.cs
+++ b/Database/Contexts/CoverArtContext.cs
@@ -22,11 +22,11 @@ public class CoverArtContext : DbContext
 
     public CoverArt RetrieveRecord(CoverArt cover)
     {
-        return CoverArtImages.FirstOrDefault(cov => cov.CoverArtID == cover.CoverArtID);
+        return CoverArtImages.FirstOrDefault(cov => cov.Id == cover.Id);
     }
 
     public bool DoesRecordExist(CoverArt cover)
     {
-        return CoverArtImages.FirstOrDefault(cov => cov.CoverArtID == cover.CoverArtID) != null ? true : false;
+        return CoverArtImages.FirstOrDefault(cov => cov.Id == cover.Id) != null ? true : false;
     }
 }
diff --git a/Database/Contexts/SongContext.cs b/Database/Contexts/SongContext.cs
index 897fd8b..f487430 100644
--- a/Database/Contexts/SongContext.cs
+++ b/Database/Contexts/SongContext.cs
@@ -34,7 +34,7 @@ public class SongContext : DbContext
             .Property(s => s.AlbumID)
             .IsRequired(false);
         modelBuilder.Entity<Song>()
-            .Property(s => s.CoverArtID)
+            .Property(s => s.CoverArtId)
             .IsRequired(false);
     }
 
diff --git a/Models/CoverArt.cs b/Models/CoverArt.cs
index 370c252..7ce9fac 100644
--- a/Models/CoverArt.cs
+++ b/Models/CoverArt.cs
@@ -6,7 +6,7 @@ public class CoverArt
 {
     #region Properties
     [JsonProperty("cover_art_id")]
-    public int CoverArtID { get; set; }
+    public int Id { get; set; }
     [JsonProperty("title")]
     public string SongTitle { get; set; }
     [JsonIgnore]
diff --git a/Models/Song.cs b/Models/Song.cs
index ed6b4dc..5764b2f 100644
--- a/Models/Song.cs
+++ b/Models/Song.cs
@@ -43,7 +43,7 @@ public class Song
     [JsonIgnore]
     public int? GenreID { get; set; }
     [JsonIgnore]
-    public int? CoverArtID { get; set; }
+    public int? CoverArtId { get; set; }
     [JsonProperty("date_created")]
     public DateTime DateCreated { get; set; }
     [JsonProperty("user_id")]
diff --git a/Scripts/MySQL/create_database.sql b/Scripts/MySQL/create_database.sql
index de609e8..1da64ef 100644
--- a/Scripts/MySQL/create_database.sql
+++ b/Scripts/MySQL/create_database.sql
@@ -3,11 +3,11 @@ CREATE DATABASE Icarus;
 USE Icarus;
 
 CREATE TABLE CoverArt (
-    CoverArtID INT NOT NULL AUTO_INCREMENT,
+    Id INT NOT NULL AUTO_INCREMENT,
     SongTitle TEXT NOT NULL,
     ImagePath TEXT NOT NULL,
 
-    PRIMARY KEY (CoverArtID)
+    PRIMARY KEY (Id)
 );
 
 CREATE TABLE Album (
@@ -49,14 +49,14 @@ CREATE TABLE Song (
     DiscCount INT NOT NULL,
     SongDirectory TEXT NOT NULL,
     Filename TEXT NOT NULL,
-    CoverArtID INT NOT NULL,
+    CoverArtId INT NOT NULL,
     ArtistID INT NOT NULL,
     AlbumID INT NOT NULL,
     GenreID INT NOT NULL,
     DateCreated DATETIME DEFAULT CURRENT_TIMESTAMP,
 
     PRIMARY KEY (SongID),
-    CONSTRAINT FK_Song_CoverArtID FOREIGN KEY (CoverArtID) REFERENCES CoverArt (CoverArtID),
+    CONSTRAINT FK_Song_CoverArtId FOREIGN KEY (CoverArtId) REFERENCES CoverArt (Id),
     CONSTRAINT FK_Song_ArtistID FOREIGN KEY (ArtistID) REFERENCES Artist (ArtistID),
     CONSTRAINT FK_Song_AlbumID FOREIGN KEY (AlbumID) REFERENCES Album (AlbumID),
     CONSTRAINT FK_Song_GenreID FOREIGN KEY (GenreID) REFERENCES Genre (GenreID)