libnm, core, cli, tui: fix the capitalization of various types

GLib/Gtk have mostly settled on the convention that two-letter
acronyms in type names remain all-caps (eg, "IO"), but longer acronyms
become initial-caps-only (eg, "Tcp").

NM was inconsistent, with most long acronyms using initial caps only
(Adsl, Cdma, Dcb, Gsm, Olpc, Vlan), but others using all caps (DHCP,
PPP, PPPOE, VPN). Fix libnm and src/ to use initial-caps only for all
three-or-more-letter-long acronyms (and update nmcli and nmtui for the
libnm changes).

8 files changed, 171 insertions, 171 deletions

diff --git a/src/dhcp-manager/nm-dhcp-client.c b/src/dhcp-manager/nm-dhcp-client.c
index 653cad3575..29584b0662 100644
--- a/src/dhcp-manager/nm-dhcp-client.c
+++ b/src/dhcp-manager/nm-dhcp-client.c
@@ -52,11 +52,11 @@ typedef struct {
 	guint        watch_id;
 	gboolean     info_only;
 
-} NMDHCPClientPrivate;
+} NMDhcpClientPrivate;
 
-#define NM_DHCP_CLIENT_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_DHCP_CLIENT, NMDHCPClientPrivate))
+#define NM_DHCP_CLIENT_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_DHCP_CLIENT, NMDhcpClientPrivate))
 
-G_DEFINE_TYPE_EXTENDED (NMDHCPClient, nm_dhcp_client, G_TYPE_OBJECT, G_TYPE_FLAG_ABSTRACT, {})
+G_DEFINE_TYPE_EXTENDED (NMDhcpClient, nm_dhcp_client, G_TYPE_OBJECT, G_TYPE_FLAG_ABSTRACT, {})
 
 enum {
 	SIGNAL_STATE_CHANGED,
@@ -80,7 +80,7 @@ enum {
 /********************************************/
 
 pid_t
-nm_dhcp_client_get_pid (NMDHCPClient *self)
+nm_dhcp_client_get_pid (NMDhcpClient *self)
 {
 	g_return_val_if_fail (NM_IS_DHCP_CLIENT (self), -1);
 
@@ -88,7 +88,7 @@ nm_dhcp_client_get_pid (NMDHCPClient *self)
 }
 
 const char *
-nm_dhcp_client_get_iface (NMDHCPClient *self)
+nm_dhcp_client_get_iface (NMDhcpClient *self)
 {
 	g_return_val_if_fail (NM_IS_DHCP_CLIENT (self), NULL);
 
@@ -96,7 +96,7 @@ nm_dhcp_client_get_iface (NMDHCPClient *self)
 }
 
 int
-nm_dhcp_client_get_ifindex (NMDHCPClient *self)
+nm_dhcp_client_get_ifindex (NMDhcpClient *self)
 {
 	g_return_val_if_fail (NM_IS_DHCP_CLIENT (self), -1);
 
@@ -104,7 +104,7 @@ nm_dhcp_client_get_ifindex (NMDHCPClient *self)
 }
 
 gboolean
-nm_dhcp_client_get_ipv6 (NMDHCPClient *self)
+nm_dhcp_client_get_ipv6 (NMDhcpClient *self)
 {
 	g_return_val_if_fail (NM_IS_DHCP_CLIENT (self), FALSE);
 
@@ -112,7 +112,7 @@ nm_dhcp_client_get_ipv6 (NMDHCPClient *self)
 }
 
 const char *
-nm_dhcp_client_get_uuid (NMDHCPClient *self)
+nm_dhcp_client_get_uuid (NMDhcpClient *self)
 {
 	g_return_val_if_fail (NM_IS_DHCP_CLIENT (self), NULL);
 
@@ -120,7 +120,7 @@ nm_dhcp_client_get_uuid (NMDHCPClient *self)
 }
 
 const GByteArray *
-nm_dhcp_client_get_duid (NMDHCPClient *self)
+nm_dhcp_client_get_duid (NMDhcpClient *self)
 {
 	g_return_val_if_fail (NM_IS_DHCP_CLIENT (self), NULL);
 
@@ -128,7 +128,7 @@ nm_dhcp_client_get_duid (NMDHCPClient *self)
 }
 
 const GByteArray *
-nm_dhcp_client_get_hw_addr (NMDHCPClient *self)
+nm_dhcp_client_get_hw_addr (NMDhcpClient *self)
 {
 	g_return_val_if_fail (NM_IS_DHCP_CLIENT (self), NULL);
 
@@ -136,7 +136,7 @@ nm_dhcp_client_get_hw_addr (NMDHCPClient *self)
 }
 
 guint32
-nm_dhcp_client_get_priority (NMDHCPClient *self)
+nm_dhcp_client_get_priority (NMDhcpClient *self)
 {
 	g_return_val_if_fail (NM_IS_DHCP_CLIENT (self), G_MAXUINT32);
 
@@ -188,9 +188,9 @@ reason_to_state (const char *iface, const char *reason)
 /********************************************/
 
 static void
-timeout_cleanup (NMDHCPClient *self)
+timeout_cleanup (NMDhcpClient *self)
 {
-	NMDHCPClientPrivate *priv = NM_DHCP_CLIENT_GET_PRIVATE (self);
+	NMDhcpClientPrivate *priv = NM_DHCP_CLIENT_GET_PRIVATE (self);
 
 	if (priv->timeout_id) {
 		g_source_remove (priv->timeout_id);
@@ -199,9 +199,9 @@ timeout_cleanup (NMDHCPClient *self)
 }
 
 static void
-watch_cleanup (NMDHCPClient *self)
+watch_cleanup (NMDhcpClient *self)
 {
-	NMDHCPClientPrivate *priv = NM_DHCP_CLIENT_GET_PRIVATE (self);
+	NMDhcpClientPrivate *priv = NM_DHCP_CLIENT_GET_PRIVATE (self);
 
 	if (priv->watch_id) {
 		g_source_remove (priv->watch_id);
@@ -220,9 +220,9 @@ nm_dhcp_client_stop_pid (pid_t pid, const char *iface)
 }
 
 static void
-stop (NMDHCPClient *self, gboolean release, const GByteArray *duid)
+stop (NMDhcpClient *self, gboolean release, const GByteArray *duid)
 {
-	NMDHCPClientPrivate *priv;
+	NMDhcpClientPrivate *priv;
 
 	g_return_if_fail (NM_IS_DHCP_CLIENT (self));
 
@@ -239,12 +239,12 @@ stop (NMDHCPClient *self, gboolean release, const GByteArray *duid)
 }
 
 void
-nm_dhcp_client_set_state (NMDHCPClient *self,
+nm_dhcp_client_set_state (NMDhcpClient *self,
                           NMDhcpState new_state,
                           GObject *ip_config,
                           GHashTable *options)
 {
-	NMDHCPClientPrivate *priv = NM_DHCP_CLIENT_GET_PRIVATE (self);
+	NMDhcpClientPrivate *priv = NM_DHCP_CLIENT_GET_PRIVATE (self);
 
 	if (new_state >= NM_DHCP_STATE_BOUND)
 		timeout_cleanup (self);
@@ -287,8 +287,8 @@ nm_dhcp_client_set_state (NMDHCPClient *self,
 static gboolean
 daemon_timeout (gpointer user_data)
 {
-	NMDHCPClient *self = NM_DHCP_CLIENT (user_data);
-	NMDHCPClientPrivate *priv = NM_DHCP_CLIENT_GET_PRIVATE (self);
+	NMDhcpClient *self = NM_DHCP_CLIENT (user_data);
+	NMDhcpClientPrivate *priv = NM_DHCP_CLIENT_GET_PRIVATE (self);
 
 	priv->timeout_id = 0;
 	nm_log_warn (priv->ipv6 ? LOGD_DHCP6 : LOGD_DHCP4,
@@ -302,8 +302,8 @@ daemon_timeout (gpointer user_data)
 static void
 daemon_watch_cb (GPid pid, gint status, gpointer user_data)
 {
-	NMDHCPClient *self = NM_DHCP_CLIENT (user_data);
-	NMDHCPClientPrivate *priv = NM_DHCP_CLIENT_GET_PRIVATE (self);
+	NMDhcpClient *self = NM_DHCP_CLIENT (user_data);
+	NMDhcpClientPrivate *priv = NM_DHCP_CLIENT_GET_PRIVATE (self);
 	NMDhcpState new_state;
 
 	if (priv->ipv6) {
@@ -328,9 +328,9 @@ daemon_watch_cb (GPid pid, gint status, gpointer user_data)
 }
 
 void
-nm_dhcp_client_watch_child (NMDHCPClient *self, pid_t pid)
+nm_dhcp_client_watch_child (NMDhcpClient *self, pid_t pid)
 {
-	NMDHCPClientPrivate *priv = NM_DHCP_CLIENT_GET_PRIVATE (self);
+	NMDhcpClientPrivate *priv = NM_DHCP_CLIENT_GET_PRIVATE (self);
 
 	g_return_if_fail (priv->pid == -1);
 	priv->pid = pid;
@@ -345,12 +345,12 @@ nm_dhcp_client_watch_child (NMDHCPClient *self, pid_t pid)
 }
 
 gboolean
-nm_dhcp_client_start_ip4 (NMDHCPClient *self,
+nm_dhcp_client_start_ip4 (NMDhcpClient *self,
                           const char *dhcp_client_id,
                           GByteArray *dhcp_anycast_addr,
                           const char *hostname)
 {
-	NMDHCPClientPrivate *priv;
+	NMDhcpClientPrivate *priv;
 
 	g_return_val_if_fail (NM_IS_DHCP_CLIENT (self), FALSE);
 
@@ -452,7 +452,7 @@ generate_duid_from_machine_id (void)
 }
 
 static GByteArray *
-get_duid (NMDHCPClient *self)
+get_duid (NMDhcpClient *self)
 {
 	static GByteArray *duid = NULL;
 	GByteArray *copy = NULL;
@@ -478,13 +478,13 @@ get_duid (NMDHCPClient *self)
 }
 
 gboolean
-nm_dhcp_client_start_ip6 (NMDHCPClient *self,
+nm_dhcp_client_start_ip6 (NMDhcpClient *self,
                           GByteArray *dhcp_anycast_addr,
                           const char *hostname,
                           gboolean info_only,
                           NMSettingIP6ConfigPrivacy privacy)
 {
-	NMDHCPClientPrivate *priv;
+	NMDhcpClientPrivate *priv;
 	char *str;
 
 	g_return_val_if_fail (NM_IS_DHCP_CLIENT (self), FALSE);
@@ -557,9 +557,9 @@ nm_dhcp_client_stop_existing (const char *pid_file, const char *binary_name)
 }
 
 void
-nm_dhcp_client_stop (NMDHCPClient *self, gboolean release)
+nm_dhcp_client_stop (NMDhcpClient *self, gboolean release)
 {
-	NMDHCPClientPrivate *priv;
+	NMDhcpClientPrivate *priv;
 	pid_t old_pid = 0;
 
 	g_return_if_fail (NM_IS_DHCP_CLIENT (self));
@@ -658,11 +658,11 @@ copy_option (const char * key,
 }
 
 void
-nm_dhcp_client_new_options (NMDHCPClient *self,
+nm_dhcp_client_new_options (NMDhcpClient *self,
                             GHashTable *options,
                             const char *reason)
 {
-	NMDHCPClientPrivate *priv;
+	NMDhcpClientPrivate *priv;
 	guint32 old_state;
 	guint32 new_state;
 	GHashTable *str_options = NULL;
@@ -708,7 +708,7 @@ nm_dhcp_client_new_options (NMDHCPClient *self,
 /********************************************/
 
 static void
-nm_dhcp_client_init (NMDHCPClient *self)
+nm_dhcp_client_init (NMDhcpClient *self)
 {
 	NM_DHCP_CLIENT_GET_PRIVATE (self)->pid = -1;
 }
@@ -717,7 +717,7 @@ static void
 get_property (GObject *object, guint prop_id,
 			  GValue *value, GParamSpec *pspec)
 {
-	NMDHCPClientPrivate *priv = NM_DHCP_CLIENT_GET_PRIVATE (object);
+	NMDhcpClientPrivate *priv = NM_DHCP_CLIENT_GET_PRIVATE (object);
 
 	switch (prop_id) {
 	case PROP_IFACE:
@@ -751,7 +751,7 @@ static void
 set_property (GObject *object, guint prop_id,
 			  const GValue *value, GParamSpec *pspec)
 {
-	NMDHCPClientPrivate *priv = NM_DHCP_CLIENT_GET_PRIVATE (object);
+	NMDhcpClientPrivate *priv = NM_DHCP_CLIENT_GET_PRIVATE (object);
  
 	switch (prop_id) {
 	case PROP_IFACE:
@@ -791,8 +791,8 @@ set_property (GObject *object, guint prop_id,
 static void
 dispose (GObject *object)
 {
-	NMDHCPClient *self = NM_DHCP_CLIENT (object);
-	NMDHCPClientPrivate *priv = NM_DHCP_CLIENT_GET_PRIVATE (self);
+	NMDhcpClient *self = NM_DHCP_CLIENT (object);
+	NMDhcpClientPrivate *priv = NM_DHCP_CLIENT_GET_PRIVATE (self);
 
 	/* Stopping the client is left up to the controlling device
 	 * explicitly since we may want to quit NetworkManager but not terminate
@@ -818,11 +818,11 @@ dispose (GObject *object)
 }
 
 static void
-nm_dhcp_client_class_init (NMDHCPClientClass *client_class)
+nm_dhcp_client_class_init (NMDhcpClientClass *client_class)
 {
 	GObjectClass *object_class = G_OBJECT_CLASS (client_class);
 
-	g_type_class_add_private (client_class, sizeof (NMDHCPClientPrivate));
+	g_type_class_add_private (client_class, sizeof (NMDhcpClientPrivate));
 
 	/* virtual methods */
 	object_class->dispose = dispose;
@@ -885,7 +885,7 @@ nm_dhcp_client_class_init (NMDHCPClientClass *client_class)
 		g_signal_new (NM_DHCP_CLIENT_SIGNAL_STATE_CHANGED,
 					  G_OBJECT_CLASS_TYPE (object_class),
 					  G_SIGNAL_RUN_FIRST,
-					  G_STRUCT_OFFSET (NMDHCPClientClass, state_changed),
+					  G_STRUCT_OFFSET (NMDhcpClientClass, state_changed),
 					  NULL, NULL, NULL,
 					  G_TYPE_NONE, 3, G_TYPE_UINT, G_TYPE_OBJECT, G_TYPE_HASH_TABLE);
 }
diff --git a/src/dhcp-manager/nm-dhcp-client.h b/src/dhcp-manager/nm-dhcp-client.h
index d01d938a2d..a36ba67b69 100644
--- a/src/dhcp-manager/nm-dhcp-client.h
+++ b/src/dhcp-manager/nm-dhcp-client.h
@@ -28,11 +28,11 @@
 #include <nm-ip6-config.h>
 
 #define NM_TYPE_DHCP_CLIENT            (nm_dhcp_client_get_type ())
-#define NM_DHCP_CLIENT(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_DHCP_CLIENT, NMDHCPClient))
-#define NM_DHCP_CLIENT_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_DHCP_CLIENT, NMDHCPClientClass))
+#define NM_DHCP_CLIENT(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_DHCP_CLIENT, NMDhcpClient))
+#define NM_DHCP_CLIENT_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_DHCP_CLIENT, NMDhcpClientClass))
 #define NM_IS_DHCP_CLIENT(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_DHCP_CLIENT))
 #define NM_IS_DHCP_CLIENT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_DHCP_CLIENT))
-#define NM_DHCP_CLIENT_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_DHCP_CLIENT, NMDHCPClientClass))
+#define NM_DHCP_CLIENT_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_DHCP_CLIENT, NMDhcpClientClass))
 
 #define NM_DHCP_CLIENT_INTERFACE "iface"
 #define NM_DHCP_CLIENT_IFINDEX   "ifindex"
@@ -56,79 +56,79 @@ typedef enum {
 
 typedef struct {
 	GObject parent;
-} NMDHCPClient;
+} NMDhcpClient;
 
 typedef struct {
 	GObjectClass parent;
 
 	/* Methods */
 
-	gboolean (*ip4_start)     (NMDHCPClient *self,
+	gboolean (*ip4_start)     (NMDhcpClient *self,
 	                           const char *dhcp_client_id,
 	                           GByteArray *anycast_addr,
 	                           const char *hostname);
 
-	gboolean (*ip6_start)     (NMDHCPClient *self,
+	gboolean (*ip6_start)     (NMDhcpClient *self,
 	                           GByteArray *anycast_addr,
 	                           const char *hostname,
 	                           gboolean info_only,
 	                           NMSettingIP6ConfigPrivacy privacy,
 	                           const GByteArray *duid);
 
-	void (*stop)              (NMDHCPClient *self,
+	void (*stop)              (NMDhcpClient *self,
 	                           gboolean release,
 	                           const GByteArray *duid);
 
 	/**
 	 * get_duid:
-	 * @self: the #NMDHCPClient
+	 * @self: the #NMDhcpClient
 	 *
 	 * Attempts to find an existing DHCPv6 DUID for this client in the DHCP
 	 * client's persistent configuration.  Returned DUID should be the binary
 	 * representation of the DUID.  If no DUID is found, %NULL should be
 	 * returned.
 	 */
-	GByteArray * (*get_duid) (NMDHCPClient *self);
+	GByteArray * (*get_duid) (NMDhcpClient *self);
 
 	/* Signals */
-	void (*state_changed) (NMDHCPClient *self,
+	void (*state_changed) (NMDhcpClient *self,
 	                       NMDhcpState state,
 	                       GObject *ip_config,
 	                       GHashTable *options);
-} NMDHCPClientClass;
+} NMDhcpClientClass;
 
 GType nm_dhcp_client_get_type (void);
 
-pid_t nm_dhcp_client_get_pid (NMDHCPClient *self);
+pid_t nm_dhcp_client_get_pid (NMDhcpClient *self);
 
-const char *nm_dhcp_client_get_iface (NMDHCPClient *self);
+const char *nm_dhcp_client_get_iface (NMDhcpClient *self);
 
-int         nm_dhcp_client_get_ifindex (NMDHCPClient *self);
+int         nm_dhcp_client_get_ifindex (NMDhcpClient *self);
 
-gboolean nm_dhcp_client_get_ipv6 (NMDHCPClient *self);
+gboolean nm_dhcp_client_get_ipv6 (NMDhcpClient *self);
 
-const char *nm_dhcp_client_get_uuid (NMDHCPClient *self);
+const char *nm_dhcp_client_get_uuid (NMDhcpClient *self);
 
-const GByteArray *nm_dhcp_client_get_duid (NMDHCPClient *self);
+const GByteArray *nm_dhcp_client_get_duid (NMDhcpClient *self);
 
-const GByteArray *nm_dhcp_client_get_hw_addr (NMDHCPClient *self);
+const GByteArray *nm_dhcp_client_get_hw_addr (NMDhcpClient *self);
 
-guint32 nm_dhcp_client_get_priority (NMDHCPClient *self);
+guint32 nm_dhcp_client_get_priority (NMDhcpClient *self);
 
-gboolean nm_dhcp_client_start_ip4 (NMDHCPClient *self,
+gboolean nm_dhcp_client_start_ip4 (NMDhcpClient *self,
                                    const char *dhcp_client_id,
                                    GByteArray *dhcp_anycast_addr,
                                    const char *hostname);
 
-gboolean nm_dhcp_client_start_ip6 (NMDHCPClient *self,
+gboolean nm_dhcp_client_start_ip6 (NMDhcpClient *self,
                                    GByteArray *dhcp_anycast_addr,
                                    const char *hostname,
                                    gboolean info_only,
                                    NMSettingIP6ConfigPrivacy privacy);
 
-void nm_dhcp_client_stop (NMDHCPClient *self, gboolean release);
+void nm_dhcp_client_stop (NMDhcpClient *self, gboolean release);
 
-void nm_dhcp_client_new_options (NMDHCPClient *self,
+void nm_dhcp_client_new_options (NMDhcpClient *self,
                                  GHashTable *options,
                                  const char *reason);
 
@@ -137,9 +137,9 @@ void nm_dhcp_client_stop_existing (const char *pid_file, const char *binary_name
 
 void nm_dhcp_client_stop_pid (pid_t pid, const char *iface);
 
-void nm_dhcp_client_watch_child (NMDHCPClient *self, pid_t pid);
+void nm_dhcp_client_watch_child (NMDhcpClient *self, pid_t pid);
 
-void nm_dhcp_client_set_state (NMDHCPClient *self,
+void nm_dhcp_client_set_state (NMDhcpClient *self,
                                NMDhcpState new_state,
                                GObject *ip_config,   /* NMIP4Config or NMIP6Config */
                                GHashTable *options); /* str:str hash */
diff --git a/src/dhcp-manager/nm-dhcp-dhclient.c b/src/dhcp-manager/nm-dhcp-dhclient.c
index 2f1e11deba..41f597f668 100644
--- a/src/dhcp-manager/nm-dhcp-dhclient.c
+++ b/src/dhcp-manager/nm-dhcp-dhclient.c
@@ -43,9 +43,9 @@
 #include "nm-dhcp-manager.h"
 #include "nm-posix-signals.h"
 
-G_DEFINE_TYPE (NMDHCPDhclient, nm_dhcp_dhclient, NM_TYPE_DHCP_CLIENT)
+G_DEFINE_TYPE (NMDhcpDhclient, nm_dhcp_dhclient, NM_TYPE_DHCP_CLIENT)
 
-#define NM_DHCP_DHCLIENT_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_DHCP_DHCLIENT, NMDHCPDhclientPrivate))
+#define NM_DHCP_DHCLIENT_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_DHCP_DHCLIENT, NMDhcpDhclientPrivate))
 
 typedef struct {
 	const char *path;
@@ -53,7 +53,7 @@ typedef struct {
 	const char *def_leasefile;
 	char *lease_file;
 	char *pid_file;
-} NMDHCPDhclientPrivate;
+} NMDhcpDhclientPrivate;
 
 const char *
 nm_dhcp_dhclient_get_path (const char *try_first)
@@ -325,12 +325,12 @@ dhclient_child_setup (gpointer user_data G_GNUC_UNUSED)
 }
 
 static gboolean
-dhclient_start (NMDHCPClient *client,
+dhclient_start (NMDhcpClient *client,
                 const char *mode_opt,
                 const GByteArray *duid,
                 gboolean release)
 {
-	NMDHCPDhclientPrivate *priv = NM_DHCP_DHCLIENT_GET_PRIVATE (client);
+	NMDhcpDhclientPrivate *priv = NM_DHCP_DHCLIENT_GET_PRIVATE (client);
 	GPtrArray *argv = NULL;
 	pid_t pid;
 	GError *error = NULL;
@@ -475,12 +475,12 @@ dhclient_start (NMDHCPClient *client,
 }
 
 static gboolean
-ip4_start (NMDHCPClient *client,
+ip4_start (NMDhcpClient *client,
            const char *dhcp_client_id,
            GByteArray *dhcp_anycast_addr,
            const char *hostname)
 {
-	NMDHCPDhclientPrivate *priv = NM_DHCP_DHCLIENT_GET_PRIVATE (client);
+	NMDhcpDhclientPrivate *priv = NM_DHCP_DHCLIENT_GET_PRIVATE (client);
 	const char *iface, *uuid;
 
 	iface = nm_dhcp_client_get_iface (client);
@@ -496,14 +496,14 @@ ip4_start (NMDHCPClient *client,
 }
 
 static gboolean
-ip6_start (NMDHCPClient *client,
+ip6_start (NMDhcpClient *client,
            GByteArray *dhcp_anycast_addr,
            const char *hostname,
            gboolean info_only,
            NMSettingIP6ConfigPrivacy privacy,
            const GByteArray *duid)
 {
-	NMDHCPDhclientPrivate *priv = NM_DHCP_DHCLIENT_GET_PRIVATE (client);
+	NMDhcpDhclientPrivate *priv = NM_DHCP_DHCLIENT_GET_PRIVATE (client);
 	const char *iface, *uuid;
 
 	iface = nm_dhcp_client_get_iface (client);
@@ -519,9 +519,9 @@ ip6_start (NMDHCPClient *client,
 }
 
 static void
-stop (NMDHCPClient *client, gboolean release, const GByteArray *duid)
+stop (NMDhcpClient *client, gboolean release, const GByteArray *duid)
 {
-	NMDHCPDhclientPrivate *priv = NM_DHCP_DHCLIENT_GET_PRIVATE (client);
+	NMDhcpDhclientPrivate *priv = NM_DHCP_DHCLIENT_GET_PRIVATE (client);
 
 	/* Chain up to parent */
 	NM_DHCP_CLIENT_CLASS (nm_dhcp_dhclient_parent_class)->stop (client, release, duid);
@@ -548,9 +548,9 @@ stop (NMDHCPClient *client, gboolean release, const GByteArray *duid)
 }
 
 static GByteArray *
-get_duid (NMDHCPClient *client)
+get_duid (NMDhcpClient *client)
 {
-	NMDHCPDhclientPrivate *priv = NM_DHCP_DHCLIENT_GET_PRIVATE (client);
+	NMDhcpDhclientPrivate *priv = NM_DHCP_DHCLIENT_GET_PRIVATE (client);
 	GByteArray *duid = NULL;
 	char *leasefile;
 	GError *error = NULL;
@@ -599,9 +599,9 @@ static const char *def_leasefiles[] = {
 };
 
 static void
-nm_dhcp_dhclient_init (NMDHCPDhclient *self)
+nm_dhcp_dhclient_init (NMDhcpDhclient *self)
 {
-	NMDHCPDhclientPrivate *priv = NM_DHCP_DHCLIENT_GET_PRIVATE (self);
+	NMDhcpDhclientPrivate *priv = NM_DHCP_DHCLIENT_GET_PRIVATE (self);
 	const char **iter = &def_leasefiles[0];
 
 	priv->path = nm_dhcp_dhclient_get_path (DHCLIENT_PATH);
@@ -622,7 +622,7 @@ nm_dhcp_dhclient_init (NMDHCPDhclient *self)
 static void
 dispose (GObject *object)
 {
-	NMDHCPDhclientPrivate *priv = NM_DHCP_DHCLIENT_GET_PRIVATE (object);
+	NMDhcpDhclientPrivate *priv = NM_DHCP_DHCLIENT_GET_PRIVATE (object);
 
 	g_free (priv->pid_file);
 	g_free (priv->conf_file);
@@ -632,12 +632,12 @@ dispose (GObject *object)
 }
 
 static void
-nm_dhcp_dhclient_class_init (NMDHCPDhclientClass *dhclient_class)
+nm_dhcp_dhclient_class_init (NMDhcpDhclientClass *dhclient_class)
 {
-	NMDHCPClientClass *client_class = NM_DHCP_CLIENT_CLASS (dhclient_class);
+	NMDhcpClientClass *client_class = NM_DHCP_CLIENT_CLASS (dhclient_class);
 	GObjectClass *object_class = G_OBJECT_CLASS (dhclient_class);
 
-	g_type_class_add_private (dhclient_class, sizeof (NMDHCPDhclientPrivate));
+	g_type_class_add_private (dhclient_class, sizeof (NMDhcpDhclientPrivate));
 
 	/* virtual methods */
 	object_class->dispose = dispose;
diff --git a/src/dhcp-manager/nm-dhcp-dhclient.h b/src/dhcp-manager/nm-dhcp-dhclient.h
index 20219a63e1..592109c660 100644
--- a/src/dhcp-manager/nm-dhcp-dhclient.h
+++ b/src/dhcp-manager/nm-dhcp-dhclient.h
@@ -25,19 +25,19 @@
 #include "nm-dhcp-client.h"
 
 #define NM_TYPE_DHCP_DHCLIENT            (nm_dhcp_dhclient_get_type ())
-#define NM_DHCP_DHCLIENT(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_DHCP_DHCLIENT, NMDHCPDhclient))
-#define NM_DHCP_DHCLIENT_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_DHCP_DHCLIENT, NMDHCPDhclientClass))
+#define NM_DHCP_DHCLIENT(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_DHCP_DHCLIENT, NMDhcpDhclient))
+#define NM_DHCP_DHCLIENT_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_DHCP_DHCLIENT, NMDhcpDhclientClass))
 #define NM_IS_DHCP_DHCLIENT(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_DHCP_DHCLIENT))
 #define NM_IS_DHCP_DHCLIENT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_DHCP_DHCLIENT))
-#define NM_DHCP_DHCLIENT_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_DHCP_DHCLIENT, NMDHCPDhclientClass))
+#define NM_DHCP_DHCLIENT_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_DHCP_DHCLIENT, NMDhcpDhclientClass))
 
 typedef struct {
-	NMDHCPClient parent;
-} NMDHCPDhclient;
+	NMDhcpClient parent;
+} NMDhcpDhclient;
 
 typedef struct {
-	NMDHCPClientClass parent;
-} NMDHCPDhclientClass;
+	NMDhcpClientClass parent;
+} NMDhcpDhclientClass;
 
 GType nm_dhcp_dhclient_get_type (void);
 
diff --git a/src/dhcp-manager/nm-dhcp-dhcpcd.c b/src/dhcp-manager/nm-dhcp-dhcpcd.c
index 26d85d56c0..fa2bcaff16 100644
--- a/src/dhcp-manager/nm-dhcp-dhcpcd.c
+++ b/src/dhcp-manager/nm-dhcp-dhcpcd.c
@@ -39,14 +39,14 @@
 #include "nm-logging.h"
 #include "nm-posix-signals.h"
 
-G_DEFINE_TYPE (NMDHCPDhcpcd, nm_dhcp_dhcpcd, NM_TYPE_DHCP_CLIENT)
+G_DEFINE_TYPE (NMDhcpDhcpcd, nm_dhcp_dhcpcd, NM_TYPE_DHCP_CLIENT)
 
-#define NM_DHCP_DHCPCD_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_DHCP_DHCPCD, NMDHCPDhcpcdPrivate))
+#define NM_DHCP_DHCPCD_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_DHCP_DHCPCD, NMDhcpDhcpcdPrivate))
 
 typedef struct {
 	const char *path;
 	char *pid_file;
-} NMDHCPDhcpcdPrivate;
+} NMDhcpDhcpcdPrivate;
 
 const char *
 nm_dhcp_dhcpcd_get_path (const char *try_first)
@@ -87,12 +87,12 @@ dhcpcd_child_setup (gpointer user_data G_GNUC_UNUSED)
 }
 
 static gboolean
-ip4_start (NMDHCPClient *client,
+ip4_start (NMDhcpClient *client,
            const char *dhcp_client_id,
            GByteArray *dhcp_anycast_addr,
            const char *hostname)
 {
-	NMDHCPDhcpcdPrivate *priv = NM_DHCP_DHCPCD_GET_PRIVATE (client);
+	NMDhcpDhcpcdPrivate *priv = NM_DHCP_DHCPCD_GET_PRIVATE (client);
 	GPtrArray *argv = NULL;
 	pid_t pid = -1;
 	GError *error = NULL;
@@ -171,7 +171,7 @@ ip4_start (NMDHCPClient *client,
 }
 
 static gboolean
-ip6_start (NMDHCPClient *client,
+ip6_start (NMDhcpClient *client,
            GByteArray *dhcp_anycast_addr,
            const char *hostname,
            gboolean info_only,
@@ -183,9 +183,9 @@ ip6_start (NMDHCPClient *client,
 }
 
 static void
-stop (NMDHCPClient *client, gboolean release, const GByteArray *duid)
+stop (NMDhcpClient *client, gboolean release, const GByteArray *duid)
 {
-	NMDHCPDhcpcdPrivate *priv = NM_DHCP_DHCPCD_GET_PRIVATE (client);
+	NMDhcpDhcpcdPrivate *priv = NM_DHCP_DHCPCD_GET_PRIVATE (client);
 
 	/* Chain up to parent */
 	NM_DHCP_CLIENT_CLASS (nm_dhcp_dhcpcd_parent_class)->stop (client, release, duid);
@@ -201,9 +201,9 @@ stop (NMDHCPClient *client, gboolean release, const GByteArray *duid)
 /***************************************************/
 
 static void
-nm_dhcp_dhcpcd_init (NMDHCPDhcpcd *self)
+nm_dhcp_dhcpcd_init (NMDhcpDhcpcd *self)
 {
-	NMDHCPDhcpcdPrivate *priv = NM_DHCP_DHCPCD_GET_PRIVATE (self);
+	NMDhcpDhcpcdPrivate *priv = NM_DHCP_DHCPCD_GET_PRIVATE (self);
 
 	priv->path = nm_dhcp_dhcpcd_get_path (DHCPCD_PATH);
 }
@@ -211,7 +211,7 @@ nm_dhcp_dhcpcd_init (NMDHCPDhcpcd *self)
 static void
 dispose (GObject *object)
 {
-	NMDHCPDhcpcdPrivate *priv = NM_DHCP_DHCPCD_GET_PRIVATE (object);
+	NMDhcpDhcpcdPrivate *priv = NM_DHCP_DHCPCD_GET_PRIVATE (object);
 
 	g_free (priv->pid_file);
 
@@ -219,12 +219,12 @@ dispose (GObject *object)
 }
 
 static void
-nm_dhcp_dhcpcd_class_init (NMDHCPDhcpcdClass *dhcpcd_class)
+nm_dhcp_dhcpcd_class_init (NMDhcpDhcpcdClass *dhcpcd_class)
 {
-	NMDHCPClientClass *client_class = NM_DHCP_CLIENT_CLASS (dhcpcd_class);
+	NMDhcpClientClass *client_class = NM_DHCP_CLIENT_CLASS (dhcpcd_class);
 	GObjectClass *object_class = G_OBJECT_CLASS (dhcpcd_class);
 
-	g_type_class_add_private (dhcpcd_class, sizeof (NMDHCPDhcpcdPrivate));
+	g_type_class_add_private (dhcpcd_class, sizeof (NMDhcpDhcpcdPrivate));
 
 	/* virtual methods */
 	object_class->dispose = dispose;
diff --git a/src/dhcp-manager/nm-dhcp-dhcpcd.h b/src/dhcp-manager/nm-dhcp-dhcpcd.h
index fb6b0628f4..51380eb662 100644
--- a/src/dhcp-manager/nm-dhcp-dhcpcd.h
+++ b/src/dhcp-manager/nm-dhcp-dhcpcd.h
@@ -25,19 +25,19 @@
 #include "nm-dhcp-client.h"
 
 #define NM_TYPE_DHCP_DHCPCD            (nm_dhcp_dhcpcd_get_type ())
-#define NM_DHCP_DHCPCD(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_DHCP_DHCPCD, NMDHCPDhcpcd))
-#define NM_DHCP_DHCPCD_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_DHCP_DHCPCD, NMDHCPDhcpcdClass))
+#define NM_DHCP_DHCPCD(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_DHCP_DHCPCD, NMDhcpDhcpcd))
+#define NM_DHCP_DHCPCD_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_DHCP_DHCPCD, NMDhcpDhcpcdClass))
 #define NM_IS_DHCP_DHCPCD(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_DHCP_DHCPCD))
 #define NM_IS_DHCP_DHCPCD_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_DHCP_DHCPCD))
-#define NM_DHCP_DHCPCD_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_DHCP_DHCPCD, NMDHCPDhcpcdClass))
+#define NM_DHCP_DHCPCD_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_DHCP_DHCPCD, NMDhcpDhcpcdClass))
 
 typedef struct {
-	NMDHCPClient parent;
-} NMDHCPDhcpcd;
+	NMDhcpClient parent;
+} NMDhcpDhcpcd;
 
 typedef struct {
-	NMDHCPClientClass parent;
-} NMDHCPDhcpcdClass;
+	NMDhcpClientClass parent;
+} NMDhcpDhcpcdClass;
 
 GType nm_dhcp_dhcpcd_get_type (void);
 
diff --git a/src/dhcp-manager/nm-dhcp-manager.c b/src/dhcp-manager/nm-dhcp-manager.c
index c4de434976..332be3b012 100644
--- a/src/dhcp-manager/nm-dhcp-manager.c
+++ b/src/dhcp-manager/nm-dhcp-manager.c
@@ -79,12 +79,12 @@ typedef struct {
 	GHashTable *        clients;
 	DBusGProxy *        proxy;
 	char *              default_hostname;
-} NMDHCPManagerPrivate;
+} NMDhcpManagerPrivate;
 
 
-#define NM_DHCP_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_DHCP_MANAGER, NMDHCPManagerPrivate))
+#define NM_DHCP_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_DHCP_MANAGER, NMDhcpManagerPrivate))
 
-G_DEFINE_TYPE (NMDHCPManager, nm_dhcp_manager, G_TYPE_OBJECT)
+G_DEFINE_TYPE (NMDhcpManager, nm_dhcp_manager, G_TYPE_OBJECT)
 
 static char *
 garray_to_string (GArray *array, const char *key)
@@ -119,10 +119,10 @@ garray_to_string (GArray *array, const char *key)
 	return converted;
 }
 
-static NMDHCPClient *
-get_client_for_pid (NMDHCPManager *manager, GPid pid)
+static NMDhcpClient *
+get_client_for_pid (NMDhcpManager *manager, GPid pid)
 {
-	NMDHCPManagerPrivate *priv;
+	NMDhcpManagerPrivate *priv;
 	GHashTableIter iter;
 	gpointer value;
 
@@ -132,7 +132,7 @@ get_client_for_pid (NMDHCPManager *manager, GPid pid)
 
 	g_hash_table_iter_init (&iter, priv->clients);
 	while (g_hash_table_iter_next (&iter, NULL, &value)) {
-		NMDHCPClient *candidate = NM_DHCP_CLIENT (value);
+		NMDhcpClient *candidate = NM_DHCP_CLIENT (value);
 
 		if (nm_dhcp_client_get_pid (candidate) == pid)
 			return candidate;
@@ -141,10 +141,10 @@ get_client_for_pid (NMDHCPManager *manager, GPid pid)
 	return NULL;
 }
 
-static NMDHCPClient *
-get_client_for_ifindex (NMDHCPManager *manager, int ifindex, gboolean ip6)
+static NMDhcpClient *
+get_client_for_ifindex (NMDhcpManager *manager, int ifindex, gboolean ip6)
 {
-	NMDHCPManagerPrivate *priv;
+	NMDhcpManagerPrivate *priv;
 	GHashTableIter iter;
 	gpointer value;
 
@@ -155,7 +155,7 @@ get_client_for_ifindex (NMDHCPManager *manager, int ifindex, gboolean ip6)
 
 	g_hash_table_iter_init (&iter, priv->clients);
 	while (g_hash_table_iter_next (&iter, NULL, &value)) {
-		NMDHCPClient *candidate = NM_DHCP_CLIENT (value);
+		NMDhcpClient *candidate = NM_DHCP_CLIENT (value);
 
 		if (   nm_dhcp_client_get_ifindex (candidate) == ifindex
 		    && nm_dhcp_client_get_ipv6 (candidate) == ip6)
@@ -189,8 +189,8 @@ nm_dhcp_manager_handle_event (DBusGProxy *proxy,
                               GHashTable *options,
                               gpointer user_data)
 {
-	NMDHCPManager *manager = NM_DHCP_MANAGER (user_data);
-	NMDHCPClient *client;
+	NMDhcpManager *manager = NM_DHCP_MANAGER (user_data);
+	NMDhcpClient *client;
 	char *iface = NULL;
 	char *pid_str = NULL;
 	char *reason = NULL;
@@ -244,9 +244,9 @@ out:
 static void
 new_connection_cb (NMDBusManager *mgr,
                    DBusGConnection *connection,
-                   NMDHCPManager *self)
+                   NMDhcpManager *self)
 {
-	NMDHCPManagerPrivate *priv = NM_DHCP_MANAGER_GET_PRIVATE (self);
+	NMDhcpManagerPrivate *priv = NM_DHCP_MANAGER_GET_PRIVATE (self);
 	DBusGProxy *proxy;
 
 	/* Create a new proxy for the client */
@@ -266,9 +266,9 @@ new_connection_cb (NMDBusManager *mgr,
 static void
 dis_connection_cb (NMDBusManager *mgr,
                    DBusGConnection *connection,
-                   NMDHCPManager *self)
+                   NMDhcpManager *self)
 {
-	NMDHCPManagerPrivate *priv = NM_DHCP_MANAGER_GET_PRIVATE (self);
+	NMDhcpManagerPrivate *priv = NM_DHCP_MANAGER_GET_PRIVATE (self);
 	DBusGProxy *proxy;
 
 	proxy = g_hash_table_lookup (priv->proxies, connection);
@@ -337,14 +337,14 @@ get_client_type (const char *client, GError **error)
 	return G_TYPE_INVALID;
 }
 
-static void client_state_changed (NMDHCPClient *client,
+static void client_state_changed (NMDhcpClient *client,
                                   NMDhcpState state,
                                   GObject *ip_config,
                                   GHashTable *options,
-                                  NMDHCPManager *self);
+                                  NMDhcpManager *self);
 
 static void
-remove_client (NMDHCPManager *self, NMDHCPClient *client)
+remove_client (NMDhcpManager *self, NMDhcpClient *client)
 {
 	g_signal_handlers_disconnect_by_func (client, client_state_changed, self);
 
@@ -357,18 +357,18 @@ remove_client (NMDHCPManager *self, NMDHCPClient *client)
 }
 
 static void
-client_state_changed (NMDHCPClient *client,
+client_state_changed (NMDhcpClient *client,
                       NMDhcpState state,
                       GObject *ip_config,
                       GHashTable *options,
-                      NMDHCPManager *self)
+                      NMDhcpManager *self)
 {
 	if (state >= NM_DHCP_STATE_TIMEOUT)
 		remove_client (self, client);
 }
 
-static NMDHCPClient *
-client_start (NMDHCPManager *self,
+static NMDhcpClient *
+client_start (NMDhcpManager *self,
               const char *iface,
               int ifindex,
               const GByteArray *hwaddr,
@@ -382,8 +382,8 @@ client_start (NMDHCPManager *self,
               gboolean info_only,
               NMSettingIP6ConfigPrivacy privacy)
 {
-	NMDHCPManagerPrivate *priv;
-	NMDHCPClient *client;
+	NMDhcpManagerPrivate *priv;
+	NMDhcpClient *client;
 	gboolean success = FALSE;
 
 	g_return_val_if_fail (self, NULL);
@@ -432,17 +432,17 @@ client_start (NMDHCPManager *self,
 }
 
 static const char *
-get_send_hostname (NMDHCPManager *self, const char *setting_hostname)
+get_send_hostname (NMDhcpManager *self, const char *setting_hostname)
 {
-	NMDHCPManagerPrivate *priv = NM_DHCP_MANAGER_GET_PRIVATE (self);
+	NMDhcpManagerPrivate *priv = NM_DHCP_MANAGER_GET_PRIVATE (self);
 
 	/* Always prefer the explicit dhcp-send-hostname if given */
 	return setting_hostname ? setting_hostname : priv->default_hostname;
 }
 
-/* Caller owns a reference to the NMDHCPClient on return */
-NMDHCPClient *
-nm_dhcp_manager_start_ip4 (NMDHCPManager *self,
+/* Caller owns a reference to the NMDhcpClient on return */
+NMDhcpClient *
+nm_dhcp_manager_start_ip4 (NMDhcpManager *self,
                            const char *iface,
                            int ifindex,
                            const GByteArray *hwaddr,
@@ -465,9 +465,9 @@ nm_dhcp_manager_start_ip4 (NMDHCPManager *self,
 	                     FALSE, 0);
 }
 
-/* Caller owns a reference to the NMDHCPClient on return */
-NMDHCPClient *
-nm_dhcp_manager_start_ip6 (NMDHCPManager *self,
+/* Caller owns a reference to the NMDhcpClient on return */
+NMDhcpClient *
+nm_dhcp_manager_start_ip6 (NMDhcpManager *self,
                            const char *iface,
                            int ifindex,
                            const GByteArray *hwaddr,
@@ -491,9 +491,9 @@ nm_dhcp_manager_start_ip6 (NMDHCPManager *self,
 }
 
 void
-nm_dhcp_manager_set_default_hostname (NMDHCPManager *manager, const char *hostname)
+nm_dhcp_manager_set_default_hostname (NMDhcpManager *manager, const char *hostname)
 {
-	NMDHCPManagerPrivate *priv = NM_DHCP_MANAGER_GET_PRIVATE (manager);
+	NMDhcpManagerPrivate *priv = NM_DHCP_MANAGER_GET_PRIVATE (manager);
 
 	g_clear_pointer (&priv->default_hostname, g_free);
 
@@ -505,12 +505,12 @@ nm_dhcp_manager_set_default_hostname (NMDHCPManager *manager, const char *hostna
 }
 
 GSList *
-nm_dhcp_manager_get_lease_ip_configs (NMDHCPManager *self,
+nm_dhcp_manager_get_lease_ip_configs (NMDhcpManager *self,
                                       const char *iface,
                                       const char *uuid,
                                       gboolean ipv6)
 {
-	NMDHCPManagerPrivate *priv;
+	NMDhcpManagerPrivate *priv;
 
 	g_return_val_if_fail (NM_IS_DHCP_MANAGER (self), NULL);
 	g_return_val_if_fail (iface != NULL, NULL);
@@ -525,10 +525,10 @@ nm_dhcp_manager_get_lease_ip_configs (NMDHCPManager *self,
 
 /***************************************************/
 
-NMDHCPManager *
+NMDhcpManager *
 nm_dhcp_manager_get (void)
 {
-	static NMDHCPManager *singleton = NULL;
+	static NMDhcpManager *singleton = NULL;
 
 	if (G_UNLIKELY (singleton == NULL))
 		singleton = g_object_new (NM_TYPE_DHCP_MANAGER, NULL);
@@ -537,9 +537,9 @@ nm_dhcp_manager_get (void)
 }
 
 static void
-nm_dhcp_manager_init (NMDHCPManager *self)
+nm_dhcp_manager_init (NMDhcpManager *self)
 {
-	NMDHCPManagerPrivate *priv = NM_DHCP_MANAGER_GET_PRIVATE (self);
+	NMDhcpManagerPrivate *priv = NM_DHCP_MANAGER_GET_PRIVATE (self);
 	const char *client;
 	GError *error = NULL;
 #if !HAVE_DBUS_GLIB_100
@@ -597,7 +597,7 @@ nm_dhcp_manager_init (NMDHCPManager *self)
 static void
 dispose (GObject *object)
 {
-	NMDHCPManagerPrivate *priv = NM_DHCP_MANAGER_GET_PRIVATE (object);
+	NMDhcpManagerPrivate *priv = NM_DHCP_MANAGER_GET_PRIVATE (object);
 	GList *values, *iter;
 
 	if (priv->clients) {
@@ -630,7 +630,7 @@ dispose (GObject *object)
 static void
 finalize (GObject *object)
 {
-	NMDHCPManagerPrivate *priv = NM_DHCP_MANAGER_GET_PRIVATE (object);
+	NMDhcpManagerPrivate *priv = NM_DHCP_MANAGER_GET_PRIVATE (object);
 
 	g_free (priv->default_hostname);
 
@@ -641,11 +641,11 @@ finalize (GObject *object)
 }
 
 static void
-nm_dhcp_manager_class_init (NMDHCPManagerClass *manager_class)
+nm_dhcp_manager_class_init (NMDhcpManagerClass *manager_class)
 {
 	GObjectClass *object_class = G_OBJECT_CLASS (manager_class);
 
-	g_type_class_add_private (manager_class, sizeof (NMDHCPManagerPrivate));
+	g_type_class_add_private (manager_class, sizeof (NMDhcpManagerPrivate));
 
 	/* virtual methods */
 	object_class->finalize = finalize;
diff --git a/src/dhcp-manager/nm-dhcp-manager.h b/src/dhcp-manager/nm-dhcp-manager.h
index de162abab3..9c197b5432 100644
--- a/src/dhcp-manager/nm-dhcp-manager.h
+++ b/src/dhcp-manager/nm-dhcp-manager.h
@@ -32,7 +32,7 @@
 typedef enum {
 	NM_DHCP_MANAGER_ERROR_BAD_CLIENT = 0, /*< nick=BadClient >*/
 	NM_DHCP_MANAGER_ERROR_INTERNAL = 1,   /*< nick=InternalError >*/
-} NMDHCPManagerError;
+} NMDhcpManagerError;
 
 #define NM_DHCP_MANAGER_ERROR (nm_dhcp_manager_error_quark ())
 
@@ -40,28 +40,28 @@ GQuark nm_dhcp_manager_error_quark    (void);
 
 
 #define NM_TYPE_DHCP_MANAGER            (nm_dhcp_manager_get_type ())
-#define NM_DHCP_MANAGER(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_DHCP_MANAGER, NMDHCPManager))
-#define NM_DHCP_MANAGER_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_DHCP_MANAGER, NMDHCPManagerClass))
+#define NM_DHCP_MANAGER(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_DHCP_MANAGER, NMDhcpManager))
+#define NM_DHCP_MANAGER_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_DHCP_MANAGER, NMDhcpManagerClass))
 #define NM_IS_DHCP_MANAGER(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_DHCP_MANAGER))
 #define NM_IS_DHCP_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_DHCP_MANAGER))
-#define NM_DHCP_MANAGER_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_DHCP_MANAGER, NMDHCPManagerClass))
+#define NM_DHCP_MANAGER_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_DHCP_MANAGER, NMDhcpManagerClass))
 
 typedef struct {
 	GObject parent;
-} NMDHCPManager;
+} NMDhcpManager;
 
 typedef struct {
 	GObjectClass parent;
-} NMDHCPManagerClass;
+} NMDhcpManagerClass;
 
 GType nm_dhcp_manager_get_type (void);
 
-NMDHCPManager *nm_dhcp_manager_get (void);
+NMDhcpManager *nm_dhcp_manager_get (void);
 
-void           nm_dhcp_manager_set_default_hostname (NMDHCPManager *manager,
+void           nm_dhcp_manager_set_default_hostname (NMDhcpManager *manager,
                                                      const char *hostname);
 
-NMDHCPClient * nm_dhcp_manager_start_ip4     (NMDHCPManager *manager,
+NMDhcpClient * nm_dhcp_manager_start_ip4     (NMDhcpManager *manager,
                                               const char *iface,
                                               int ifindex,
                                               const GByteArray *hwaddr,
@@ -73,7 +73,7 @@ NMDHCPClient * nm_dhcp_manager_start_ip4     (NMDHCPManager *manager,
                                               guint32 timeout,
                                               GByteArray *dhcp_anycast_addr);
 
-NMDHCPClient * nm_dhcp_manager_start_ip6     (NMDHCPManager *manager,
+NMDhcpClient * nm_dhcp_manager_start_ip6     (NMDhcpManager *manager,
                                               const char *iface,
                                               int ifindex,
                                               const GByteArray *hwaddr,
@@ -85,7 +85,7 @@ NMDHCPClient * nm_dhcp_manager_start_ip6     (NMDHCPManager *manager,
                                               gboolean info_only,
                                               NMSettingIP6ConfigPrivacy privacy);
 
-GSList *       nm_dhcp_manager_get_lease_ip_configs (NMDHCPManager *self,
+GSList *       nm_dhcp_manager_get_lease_ip_configs (NMDhcpManager *self,
                                                      const char *iface,
                                                      const char *uuid,
                                                      gboolean ipv6);