diff --git a/src/core/gcal-event.c b/src/core/gcal-event.c
index aa8ba1eb..098442c0 100644
--- a/src/core/gcal-event.c
+++ b/src/core/gcal-event.c
@@ -991,7 +991,7 @@ gcal_event_set_date_end (GcalEvent *self,
 {
   g_return_if_fail (GCAL_IS_EVENT (self));
 
-  if (gcal_set_date_time (&self->dt_end, dt))
+  if (g_set_date_time (&self->dt_end, dt))
     {
       ECalComponentDateTime *component_dt;
 
@@ -1037,7 +1037,7 @@ gcal_event_set_date_start (GcalEvent *self,
 {
   g_return_if_fail (GCAL_IS_EVENT (self));
 
-  if (gcal_set_date_time (&self->dt_start, dt))
+  if (g_set_date_time (&self->dt_start, dt))
     {
       ECalComponentDateTime *component_dt;
 
diff --git a/src/core/gcal-range-tree.c b/src/core/gcal-range-tree.c
index 5fc996fe..ef18668f 100644
--- a/src/core/gcal-range-tree.c
+++ b/src/core/gcal-range-tree.c
@@ -220,7 +220,7 @@ insert (Node           *n,
 
   /* Update the current node's maximum subrange value */
   if (!n->max || g_date_time_compare (range_end, n->max) > 0)
-    gcal_set_date_time (&n->max, range_end);
+    g_set_date_time (&n->max, range_end);
 
   return rebalance (n);
 }
diff --git a/src/core/gcal-shell-search-provider.c b/src/core/gcal-shell-search-provider.c
index 27c9a08e..e42853e8 100644
--- a/src/core/gcal-shell-search-provider.c
+++ b/src/core/gcal-shell-search-provider.c
@@ -119,13 +119,13 @@ maybe_update_range (GcalShellSearchProvider *self)
 
   if (self->range_start && gcal_date_time_compare_date (self->range_start, start) != 0)
     {
-      gcal_set_date_time (&self->range_start, start);
+      g_set_date_time (&self->range_start, start);
       range_changed = TRUE;
     }
 
   if (self->range_end && gcal_date_time_compare_date (self->range_end, end) != 0)
     {
-      gcal_set_date_time (&self->range_end, end);
+      g_set_date_time (&self->range_end, end);
       range_changed = TRUE;
     }
 
diff --git a/src/gui/common/gcal-date-chooser.c b/src/gui/common/gcal-date-chooser.c
index c7be39cc..f11559f3 100644
--- a/src/gui/common/gcal-date-chooser.c
+++ b/src/gui/common/gcal-date-chooser.c
@@ -600,7 +600,7 @@ gcal_date_chooser_set_date (GcalView  *view,
   g_date_time_get_ymd (self->date, &y1, &m1, &d1);
   g_date_time_get_ymd (date, &y2, &m2, &d2);
 
-  gcal_set_date_time (&self->date, date);
+  g_set_date_time (&self->date, date);
 
   if (y1 != y2 || m1 != m2 || d1 != d2)
     gcal_multi_choice_set_value (GCAL_MULTI_CHOICE (self->combined_choice),
diff --git a/src/gui/event-editor/gcal-date-time-chooser.c b/src/gui/event-editor/gcal-date-time-chooser.c
index 8856c68d..444a4b2a 100644
--- a/src/gui/event-editor/gcal-date-time-chooser.c
+++ b/src/gui/event-editor/gcal-date-time-chooser.c
@@ -724,7 +724,7 @@ gcal_date_time_chooser_set_date_time (GcalDateTimeChooser *self,
 {
   GCAL_ENTRY;
 
-  gcal_set_date_time (&self->date_time, date_time);
+  g_set_date_time (&self->date_time, date_time);
 
   g_signal_handlers_block_by_func (self->date_row, on_date_changed_cb, self);
   gcal_date_chooser_row_set_date (self->date_row, date_time);
diff --git a/src/gui/event-editor/gcal-event-schedule.c b/src/gui/event-editor/gcal-event-schedule.c
index 7eee34b4..cf507826 100644
--- a/src/gui/event-editor/gcal-event-schedule.c
+++ b/src/gui/event-editor/gcal-event-schedule.c
@@ -117,8 +117,8 @@ gcal_event_schedule_set_all_day (const GcalEventSchedule *values, gboolean all_d
                                                    0.0);
       g_autoptr (GDateTime) new_end = g_date_time_add_days (tmp, 1);
 
-      gcal_set_date_time (&copy->curr.date_start, new_start);
-      gcal_set_date_time (&copy->curr.date_end, new_end);
+      g_set_date_time (&copy->curr.date_start, new_start);
+      g_set_date_time (&copy->curr.date_end, new_end);
     }
   else
     {
@@ -176,8 +176,8 @@ gcal_event_schedule_set_all_day (const GcalEventSchedule *values, gboolean all_d
                                      g_date_time_get_seconds (values->orig.date_end));
         }
 
-      gcal_set_date_time (&copy->curr.date_start, new_start);
-      gcal_set_date_time (&copy->curr.date_end, new_end);
+      g_set_date_time (&copy->curr.date_start, new_start);
+      g_set_date_time (&copy->curr.date_end, new_end);
     }
 
   copy->curr.all_day = all_day;
@@ -201,11 +201,11 @@ gcal_event_schedule_set_start_date (const GcalEventSchedule *values, GDateTime *
 {
   GcalEventSchedule *copy = gcal_event_schedule_copy (values);
 
-  gcal_set_date_time (&copy->curr.date_start, start);
+  g_set_date_time (&copy->curr.date_start, start);
 
   if (g_date_time_compare (start, copy->curr.date_end) == 1)
     {
-      gcal_set_date_time (&copy->curr.date_end, start);
+      g_set_date_time (&copy->curr.date_end, start);
     }
 
   return copy;
@@ -226,16 +226,16 @@ gcal_event_schedule_set_end_date (const GcalEventSchedule *values, GDateTime *en
        * iCalendar.
        */
       g_autoptr (GDateTime) fake_end_date = g_date_time_add_days (end, 1);
-      gcal_set_date_time (&copy->curr.date_end, fake_end_date);
+      g_set_date_time (&copy->curr.date_end, fake_end_date);
     }
   else
     {
-      gcal_set_date_time (&copy->curr.date_end, end);
+      g_set_date_time (&copy->curr.date_end, end);
     }
 
   if (g_date_time_compare (copy->curr.date_start, end) == 1)
     {
-      gcal_set_date_time (&copy->curr.date_start, end);
+      g_set_date_time (&copy->curr.date_start, end);
     }
 
   return copy;
@@ -246,7 +246,7 @@ gcal_event_schedule_set_start_date_time (const GcalEventSchedule *values, GDateT
 {
   GcalEventSchedule *copy = gcal_event_schedule_copy (values);
 
-  gcal_set_date_time (&copy->curr.date_start, start);
+  g_set_date_time (&copy->curr.date_start, start);
 
   if (g_date_time_compare (start, copy->curr.date_end) == 1)
     {
@@ -254,7 +254,7 @@ gcal_event_schedule_set_start_date_time (const GcalEventSchedule *values, GDateT
       g_autoptr (GDateTime) new_end = g_date_time_add_hours (start, 1);
       g_autoptr (GDateTime) new_end_in_end_tz = g_date_time_to_timezone (new_end, end_tz);
 
-      gcal_set_date_time (&copy->curr.date_end, new_end_in_end_tz);
+      g_set_date_time (&copy->curr.date_end, new_end_in_end_tz);
     }
 
   return copy;
@@ -265,7 +265,7 @@ gcal_event_schedule_set_end_date_time (const GcalEventSchedule *values, GDateTim
 {
   GcalEventSchedule *copy = gcal_event_schedule_copy (values);
 
-  gcal_set_date_time (&copy->curr.date_end, end);
+  g_set_date_time (&copy->curr.date_end, end);
 
   if (g_date_time_compare (copy->curr.date_start, end) == 1)
     {
@@ -273,7 +273,7 @@ gcal_event_schedule_set_end_date_time (const GcalEventSchedule *values, GDateTim
       g_autoptr (GDateTime) new_start = g_date_time_add_hours (end, -1);
       g_autoptr (GDateTime) new_start_in_start_tz = g_date_time_to_timezone (new_start, start_tz);
 
-      gcal_set_date_time (&copy->curr.date_start, new_start_in_start_tz);
+      g_set_date_time (&copy->curr.date_start, new_start_in_start_tz);
     }
 
   return copy;
@@ -398,7 +398,7 @@ gcal_event_schedule_set_recurrence_until (const GcalEventSchedule *values,
   g_assert (copy->curr.recur->frequency != GCAL_RECURRENCE_NO_REPEAT);
   g_assert (copy->curr.recur->limit_type == GCAL_RECURRENCE_UNTIL);
 
-  gcal_set_date_time (&copy->curr.recur->limit.until, until);
+  g_set_date_time (&copy->curr.recur->limit.until, until);
 
   return copy;
 }
diff --git a/src/gui/gcal-application.c b/src/gui/gcal-application.c
index b0917cc4..9a5ea58b 100644
--- a/src/gui/gcal-application.c
+++ b/src/gui/gcal-application.c
@@ -469,7 +469,7 @@ gcal_application_command_line (GApplication            *app,
                                           result.tm_min,
                                           0);
 
-          gcal_set_date_time (&self->initial_date, initial_date);
+          g_set_date_time (&self->initial_date, initial_date);
         }
       else
         {
@@ -676,5 +676,5 @@ gcal_application_set_initial_date (GcalApplication *self,
 {
   g_return_if_fail (GCAL_IS_APPLICATION (self));
 
-  gcal_set_date_time (&self->initial_date, initial_date);
+  g_set_date_time (&self->initial_date, initial_date);
 }
diff --git a/src/gui/gcal-window.c b/src/gui/gcal-window.c
index c115c59e..9894cc49 100644
--- a/src/gui/gcal-window.c
+++ b/src/gui/gcal-window.c
@@ -332,7 +332,7 @@ update_active_date (GcalWindow *window,
   new_date_string = g_date_time_format (new_date, "%x %X %z");
   g_debug ("Updating active date to %s", new_date_string);
 
-  gcal_set_date_time (&window->active_date, new_date);
+  g_set_date_time (&window->active_date, new_date);
 
   for (i = 0; i < GCAL_WINDOW_VIEW_N_VIEWS; i++)
     gcal_view_set_date (GCAL_VIEW (window->views[i]), new_date);
diff --git a/src/gui/views/gcal-agenda-view-day.c b/src/gui/views/gcal-agenda-view-day.c
index 4d55d280..85b1154d 100644
--- a/src/gui/views/gcal-agenda-view-day.c
+++ b/src/gui/views/gcal-agenda-view-day.c
@@ -266,7 +266,7 @@ gcal_agenda_view_day_set_date (GcalAgendaViewDay *self,
 {
   g_assert (GCAL_IS_AGENDA_VIEW_DAY (self));
 
-  if (gcal_set_date_time (&self->date, date))
+  if (g_set_date_time (&self->date, date))
     {
       GtkFilter *filter = NULL;
 
diff --git a/src/gui/views/gcal-agenda-view.c b/src/gui/views/gcal-agenda-view.c
index a574200f..7fa65e9b 100644
--- a/src/gui/views/gcal-agenda-view.c
+++ b/src/gui/views/gcal-agenda-view.c
@@ -232,7 +232,7 @@ gcal_agenda_view_set_date (GcalView  *view,
 
   GCAL_ENTRY;
 
-  gcal_set_date_time (&self->date, date);
+  g_set_date_time (&self->date, date);
 
   for (unsigned int i = 0; i < g_list_model_get_n_items (G_LIST_MODEL (self->days_model)); i++)
     {
diff --git a/src/gui/views/gcal-month-view.c b/src/gui/views/gcal-month-view.c
index 6351c032..4c87c47e 100644
--- a/src/gui/views/gcal-month-view.c
+++ b/src/gui/views/gcal-month-view.c
@@ -397,7 +397,7 @@ update_week_ranges (GcalMonthView *self,
   if (current_date)
     current_range = gcal_timeline_subscriber_get_range (GCAL_TIMELINE_SUBSCRIBER (self));
 
-  gcal_set_date_time (&self->date, new_date);
+  g_set_date_time (&self->date, new_date);
 
   if (current_range && gcal_range_contains_datetime (current_range, new_date))
     {
diff --git a/src/gui/views/gcal-week-grid.c b/src/gui/views/gcal-week-grid.c
index d00baf68..07e9e518 100644
--- a/src/gui/views/gcal-week-grid.c
+++ b/src/gui/views/gcal-week-grid.c
@@ -1299,7 +1299,7 @@ void
 gcal_week_grid_set_date (GcalWeekGrid *self,
                          GDateTime    *date)
 {
-  gcal_set_date_time (&self->active_date, date);
+  g_set_date_time (&self->active_date, date);
 
   invalidate_layout_blocks (self);
 }
diff --git a/src/gui/views/gcal-week-header.c b/src/gui/views/gcal-week-header.c
index 6839bc1a..e2cee616 100644
--- a/src/gui/views/gcal-week-header.c
+++ b/src/gui/views/gcal-week-header.c
@@ -1868,7 +1868,7 @@ gcal_week_header_set_date (GcalWeekHeader *self,
 
   had_date = self->active_date != NULL;
 
-  gcal_set_date_time (&self->active_date, date);
+  g_set_date_time (&self->active_date, date);
 
   update_title (self);
   gtk_widget_queue_draw (GTK_WIDGET (self));
diff --git a/src/gui/views/gcal-week-view.c b/src/gui/views/gcal-week-view.c
index ea32d2b2..07b243c6 100644
--- a/src/gui/views/gcal-week-view.c
+++ b/src/gui/views/gcal-week-view.c
@@ -432,7 +432,7 @@ gcal_week_view_set_date (GcalView  *view,
 
   GCAL_ENTRY;
 
-  gcal_set_date_time (&self->date, date);
+  g_set_date_time (&self->date, date);
 
   /* Propagate the new date */
   gcal_week_grid_set_date (GCAL_WEEK_GRID (self->week_grid), date);