4 files changed, 16 insertions, 16 deletions

diff --git a/include/datetime/clock-mock.h b/include/datetime/clock-mock.h
index 27926ff..fb9b52f 100644
--- a/include/datetime/clock-mock.h
+++ b/include/datetime/clock-mock.h
@@ -45,9 +45,9 @@ public:
         const auto old = m_localtime;
         m_localtime = dt;
         if (!DateTime::is_same_minute(old, m_localtime))
-            minuteChanged();
+            minute_changed();
         if (!DateTime::is_same_day(old, m_localtime))
-            dateChanged();
+            date_changed();
     }
 
 private:
diff --git a/include/datetime/clock.h b/include/datetime/clock.h
index 4a9db8f..1d488d1 100644
--- a/include/datetime/clock.h
+++ b/include/datetime/clock.h
@@ -43,20 +43,20 @@ public:
     virtual DateTime localtime() const =0;
 
     /** \brief A signal which fires when the clock's minute changes */
-    core::Signal<> minuteChanged;
+    core::Signal<> minute_changed;
 
     /** \brief A signal which fires when the clock's date changes */
-    core::Signal<> dateChanged;
+    core::Signal<> date_changed;
 
 protected:
     Clock();
 
-    /** \brief Compares old and new times, emits minuteChanged() or dateChanged() signals if appropriate */
+    /** \brief Compares old and new times, emits minute_changed() or date_changed() signals if appropriate */
     void maybe_emit (const DateTime& a, const DateTime& b);
 
 private:
-    static void onSystemBusReady(GObject*, GAsyncResult*, gpointer);
-    static void onPrepareForSleep(GDBusConnection*, const gchar*, const gchar*, const gchar*, const gchar*, GVariant*, gpointer);
+    static void on_system_bus_ready(GObject*, GAsyncResult*, gpointer);
+    static void on_prepare_for_sleep(GDBusConnection*, const gchar*, const gchar*, const gchar*, const gchar*, GVariant*, gpointer);
 
     GCancellable * m_cancellable = nullptr;
     GDBusConnection * m_system_bus = nullptr;
diff --git a/include/datetime/formatter.h b/include/datetime/formatter.h
index f323858..0d695e2 100644
--- a/include/datetime/formatter.h
+++ b/include/datetime/formatter.h
@@ -69,27 +69,27 @@ class Formatter
 public:
 
     /** \brief The time format string for the menu header */
-    core::Property<std::string> headerFormat;
+    core::Property<std::string> header_format;
 
-    /** \brief The time string for the menu header. (eg, the headerFormat + the clock's time */
+    /** \brief The time string for the menu header. (eg, the header_format + the clock's time */
     core::Property<std::string> header;
 
     /** \brief Signal to denote when the relativeFormat has changed.
                When this is emitted, clients will want to rebuild their
                menuitems that contain relative time strings
                (ie, the Appointments and Locations menuitems) */
-    core::Signal<> relativeFormatChanged;
+    core::Signal<> relative_format_changed;
 
     /** \brief Generate a relative time format for some time (or time range)
                from the current clock's value. For example, a full-day interval
                starting at the end of the current clock's day yields "Tomorrow" */
-    std::string getRelativeFormat(GDateTime* then, GDateTime* then_end=nullptr) const;
+    std::string relative_format(GDateTime* then, GDateTime* then_end=nullptr) const;
 
 protected:
     Formatter(const std::shared_ptr<const Clock>&);
     virtual ~Formatter();
 
-    static const char* getDefaultHeaderTimeFormat(bool twelvehour, bool show_seconds);
+    static const char* default_header_time_format(bool twelvehour, bool show_seconds);
 
 private:
 
@@ -127,7 +127,7 @@ class PhoneFormatter: public Formatter
 {
 public:
     PhoneFormatter(const std::shared_ptr<const Clock>& clock): Formatter(clock) {
-        headerFormat.set(getDefaultHeaderTimeFormat(is_locale_12h(), false));
+        header_format.set(default_header_time_format(is_locale_12h(), false));
     }
 };
 
diff --git a/include/datetime/planner.h b/include/datetime/planner.h
index a8f9941..376a31f 100644
--- a/include/datetime/planner.h
+++ b/include/datetime/planner.h
@@ -43,9 +43,9 @@ public:
     virtual ~Planner() =default;
 
     /**
-     * \brief Timestamp used to determine the appointments in the `upcoming' and `thisMonth' properties.
+     * \brief Timestamp used to determine the appointments in the `upcoming' and `this_month' properties.
      * Setting this value will cause the planner to re-query its backend and
-     * update the `upcoming' and `thisMonth' properties.
+     * update the `upcoming' and `this_month' properties.
      */
     core::Property<DateTime> time;
 
@@ -57,7 +57,7 @@ public:
     /**
      * \brief The appointments that occur in the same month as the time property
      */
-    core::Property<std::vector<Appointment>> thisMonth;
+    core::Property<std::vector<Appointment>> this_month;
 
 protected:
     Planner() =default;