diff --git a/dashed/models.py b/dashed/models.py
index c90b8add4e..025806ad04 100644
--- a/dashed/models.py
+++ b/dashed/models.py
@@ -285,9 +285,9 @@ class Database(Model, AuditMixinNullable):
                 Grain('Time Column', '{col}'),
                 Grain('week', "date_trunc('week', CAST({col} AS DATE))"),
                 Grain('month', "date_trunc('month', CAST({col} AS DATE))"),
-                Grain("week_ending", "date_add('day', 5, "
+                Grain("week_ending_saturday", "date_add('day', 5, "
                       "date_trunc('week', date_add('day', 1, CAST({col} AS DATE))))"),
-                Grain("week_start", "date_add('day', -1, "
+                Grain("week_start_sunday", "date_add('day', -1, "
                       "date_trunc('week', date_add('day', 1, CAST({col} AS DATE))))")
             ),
             'mysql': (