diff --git a/src/MusicStore.Spa/Models/MusicStoreContext.cs b/src/MusicStore.Spa/Models/MusicStoreContext.cs
index 70fe47e9ce..87e2000c02 100644
--- a/src/MusicStore.Spa/Models/MusicStoreContext.cs
+++ b/src/MusicStore.Spa/Models/MusicStoreContext.cs
@@ -34,7 +34,7 @@ namespace MusicStore.Models
 
             builder.Entity<Album>().Key(a => a.AlbumId);
             builder.Entity<Artist>().Key(a => a.ArtistId);
-            builder.Entity<Order>().Key(o => o.OrderId).StorageName("[Order]");
+            builder.Entity<Order>().Key(o => o.OrderId).Properties(p => p.Property(o => o.OrderId).ColumnName("[Order]"));
             builder.Entity<Genre>().Key(g => g.GenreId);
             builder.Entity<CartItem>().Key(ci => ci.CartItemId);
             builder.Entity<OrderDetail>().Key(od => od.OrderDetailId);
diff --git a/src/MusicStore/Models/MusicStoreContext.cs b/src/MusicStore/Models/MusicStoreContext.cs
index 1f4915e6de..94ab76bb82 100644
--- a/src/MusicStore/Models/MusicStoreContext.cs
+++ b/src/MusicStore/Models/MusicStoreContext.cs
@@ -25,7 +25,7 @@ namespace MusicStore.Models
         {
             builder.Entity<Album>().Key(a => a.AlbumId);
             builder.Entity<Artist>().Key(a => a.ArtistId);
-            builder.Entity<Order>().Key(o => o.OrderId).StorageName("Order");
+            builder.Entity<Order>().Key(o => o.OrderId).Properties(p => p.Property(o => o.OrderId).ColumnName("Order"));
             builder.Entity<Genre>().Key(g => g.GenreId);
             builder.Entity<CartItem>().Key(c => c.CartItemId);
             builder.Entity<OrderDetail>().Key(o => o.OrderDetailId);