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).

11 files changed, 267 insertions, 267 deletions

diff --git a/libnm-core/NetworkManagerVPN.h b/libnm-core/NetworkManagerVPN.h
index 0827bbfb90..f5fdaf264c 100644
--- a/libnm-core/NetworkManagerVPN.h
+++ b/libnm-core/NetworkManagerVPN.h
@@ -68,7 +68,7 @@
 #define NM_DBUS_VPN_SIGNAL_IP4_CONFIG     "IP4Config"
 
 /**
- * NMVPNServiceState:
+ * NMVpnServiceState:
  * @NM_VPN_SERVICE_STATE_UNKNOWN: The state of the VPN plugin is unknown.
  * @NM_VPN_SERVICE_STATE_INIT: The VPN plugin is initialized.
  * @NM_VPN_SERVICE_STATE_SHUTDOWN: Not used.
@@ -81,7 +81,7 @@
  *
  * (Corresponds to the NM_VPN_SERVICE_STATE type in nm-vpn-connection.xml.)
  */
-typedef enum NMVPNServiceState {
+typedef enum NMVpnServiceState {
 	NM_VPN_SERVICE_STATE_UNKNOWN = 0,
 	NM_VPN_SERVICE_STATE_INIT,
 	NM_VPN_SERVICE_STATE_SHUTDOWN,
@@ -89,11 +89,11 @@ typedef enum NMVPNServiceState {
 	NM_VPN_SERVICE_STATE_STARTED,
 	NM_VPN_SERVICE_STATE_STOPPING,
 	NM_VPN_SERVICE_STATE_STOPPED
-} NMVPNServiceState;
+} NMVpnServiceState;
 
 
 /**
- * NMVPNConnectionState:
+ * NMVpnConnectionState:
  * @NM_VPN_CONNECTION_STATE_UNKNOWN: The state of the VPN connection is
  *   unknown.
  * @NM_VPN_CONNECTION_STATE_PREPARE: The VPN connection is preparing to
@@ -111,7 +111,7 @@ typedef enum NMVPNServiceState {
  *
  * (Corresponds to the NM_VPN_CONNECTION_STATE type in nm-vpn-connection.xml.)
  */
-typedef enum NMVPNConnectionState {
+typedef enum NMVpnConnectionState {
 	NM_VPN_CONNECTION_STATE_UNKNOWN = 0,
 	NM_VPN_CONNECTION_STATE_PREPARE,
 	NM_VPN_CONNECTION_STATE_NEED_AUTH,
@@ -120,10 +120,10 @@ typedef enum NMVPNConnectionState {
 	NM_VPN_CONNECTION_STATE_ACTIVATED,
 	NM_VPN_CONNECTION_STATE_FAILED,
 	NM_VPN_CONNECTION_STATE_DISCONNECTED
-} NMVPNConnectionState;
+} NMVpnConnectionState;
 
 /**
- * NMVPNConnectionStateReason:
+ * NMVpnConnectionStateReason:
  * @NM_VPN_CONNECTION_STATE_REASON_UNKNOWN: The reason for the VPN connection
  *   state change is unknown.
  * @NM_VPN_CONNECTION_STATE_REASON_NONE: No reason was given for the VPN
@@ -153,7 +153,7 @@ typedef enum NMVPNConnectionState {
  *
  * (Corresponds to the NM_VPN_CONNECTION_STATE_REASON type in nm-vpn-connection.xml.)
  */
-typedef enum NMVPNConnectionStateReason {
+typedef enum NMVpnConnectionStateReason {
 	NM_VPN_CONNECTION_STATE_REASON_UNKNOWN = 0,
 	NM_VPN_CONNECTION_STATE_REASON_NONE,
 	NM_VPN_CONNECTION_STATE_REASON_USER_DISCONNECTED,
@@ -166,10 +166,10 @@ typedef enum NMVPNConnectionStateReason {
 	NM_VPN_CONNECTION_STATE_REASON_NO_SECRETS,
 	NM_VPN_CONNECTION_STATE_REASON_LOGIN_FAILED,
 	NM_VPN_CONNECTION_STATE_REASON_CONNECTION_REMOVED
-} NMVPNConnectionStateReason;
+} NMVpnConnectionStateReason;
 
 /**
- * NMVPNPluginFailure:
+ * NMVpnPluginFailure:
  * @NM_VPN_PLUGIN_FAILURE_LOGIN_FAILED: Login failed.
  * @NM_VPN_PLUGIN_FAILURE_CONNECT_FAILED: Connect failed.
  * @NM_VPN_PLUGIN_FAILURE_BAD_IP_CONFIG: Invalid IP configuration returned from
@@ -183,7 +183,7 @@ typedef enum {
 	NM_VPN_PLUGIN_FAILURE_LOGIN_FAILED,
 	NM_VPN_PLUGIN_FAILURE_CONNECT_FAILED,
 	NM_VPN_PLUGIN_FAILURE_BAD_IP_CONFIG
-} NMVPNPluginFailure;
+} NMVpnPluginFailure;
 
 
 /*** Generic config ***/
diff --git a/libnm-core/nm-connection.c b/libnm-core/nm-connection.c
index 542650fdc1..3aa2bc9b05 100644
--- a/libnm-core/nm-connection.c
+++ b/libnm-core/nm-connection.c
@@ -1843,32 +1843,32 @@ nm_connection_get_setting_olpc_mesh (NMConnection *connection)
  * nm_connection_get_setting_ppp:
  * @connection: the #NMConnection
  *
- * A shortcut to return any #NMSettingPPP the connection might contain.
+ * A shortcut to return any #NMSettingPpp the connection might contain.
  *
- * Returns: (transfer none): an #NMSettingPPP if the connection contains one, otherwise %NULL
+ * Returns: (transfer none): an #NMSettingPpp if the connection contains one, otherwise %NULL
  **/
-NMSettingPPP *
+NMSettingPpp *
 nm_connection_get_setting_ppp (NMConnection *connection)
 {
 	g_return_val_if_fail (NM_IS_CONNECTION (connection), NULL);
 
-	return (NMSettingPPP *) nm_connection_get_setting (connection, NM_TYPE_SETTING_PPP);
+	return (NMSettingPpp *) nm_connection_get_setting (connection, NM_TYPE_SETTING_PPP);
 }
 
 /**
  * nm_connection_get_setting_pppoe:
  * @connection: the #NMConnection
  *
- * A shortcut to return any #NMSettingPPPOE the connection might contain.
+ * A shortcut to return any #NMSettingPppoe the connection might contain.
  *
- * Returns: (transfer none): an #NMSettingPPPOE if the connection contains one, otherwise %NULL
+ * Returns: (transfer none): an #NMSettingPppoe if the connection contains one, otherwise %NULL
  **/
-NMSettingPPPOE *
+NMSettingPppoe *
 nm_connection_get_setting_pppoe (NMConnection *connection)
 {
 	g_return_val_if_fail (NM_IS_CONNECTION (connection), NULL);
 
-	return (NMSettingPPPOE *) nm_connection_get_setting (connection, NM_TYPE_SETTING_PPPOE);
+	return (NMSettingPppoe *) nm_connection_get_setting (connection, NM_TYPE_SETTING_PPPOE);
 }
 
 /**
@@ -1891,16 +1891,16 @@ nm_connection_get_setting_serial (NMConnection *connection)
  * nm_connection_get_setting_vpn:
  * @connection: the #NMConnection
  *
- * A shortcut to return any #NMSettingVPN the connection might contain.
+ * A shortcut to return any #NMSettingVpn the connection might contain.
  *
- * Returns: (transfer none): an #NMSettingVPN if the connection contains one, otherwise %NULL
+ * Returns: (transfer none): an #NMSettingVpn if the connection contains one, otherwise %NULL
  **/
-NMSettingVPN *
+NMSettingVpn *
 nm_connection_get_setting_vpn (NMConnection *connection)
 {
 	g_return_val_if_fail (NM_IS_CONNECTION (connection), NULL);
 
-	return (NMSettingVPN *) nm_connection_get_setting (connection, NM_TYPE_SETTING_VPN);
+	return (NMSettingVpn *) nm_connection_get_setting (connection, NM_TYPE_SETTING_VPN);
 }
 
 /**
diff --git a/libnm-core/nm-connection.h b/libnm-core/nm-connection.h
index bb757f6415..cc2ba30c1e 100644
--- a/libnm-core/nm-connection.h
+++ b/libnm-core/nm-connection.h
@@ -231,10 +231,10 @@ NMSettingInfiniband *      nm_connection_get_setting_infiniband        (NMConnec
 NMSettingIP4Config *       nm_connection_get_setting_ip4_config        (NMConnection *connection);
 NMSettingIP6Config *       nm_connection_get_setting_ip6_config        (NMConnection *connection);
 NMSettingOlpcMesh *        nm_connection_get_setting_olpc_mesh         (NMConnection *connection);
-NMSettingPPP *             nm_connection_get_setting_ppp               (NMConnection *connection);
-NMSettingPPPOE *           nm_connection_get_setting_pppoe             (NMConnection *connection);
+NMSettingPpp *             nm_connection_get_setting_ppp               (NMConnection *connection);
+NMSettingPppoe *           nm_connection_get_setting_pppoe             (NMConnection *connection);
 NMSettingSerial *          nm_connection_get_setting_serial            (NMConnection *connection);
-NMSettingVPN *             nm_connection_get_setting_vpn               (NMConnection *connection);
+NMSettingVpn *             nm_connection_get_setting_vpn               (NMConnection *connection);
 NMSettingWimax *           nm_connection_get_setting_wimax             (NMConnection *connection);
 NMSettingAdsl *            nm_connection_get_setting_adsl              (NMConnection *connection);
 NMSettingWired *           nm_connection_get_setting_wired             (NMConnection *connection);
diff --git a/libnm-core/nm-setting-ppp.c b/libnm-core/nm-setting-ppp.c
index 0e7c598b90..331bf72c7f 100644
--- a/libnm-core/nm-setting-ppp.c
+++ b/libnm-core/nm-setting-ppp.c
@@ -31,7 +31,7 @@
  * that require PPP to deliver IP capability
  * @include: nm-setting-ppp.h
  *
- * The #NMSettingPPP object is a #NMSetting subclass that describes properties
+ * The #NMSettingPpp object is a #NMSetting subclass that describes properties
  * necessary for connection to networks that require PPP transport, like PPPoE
  * cable and DSL modems and some mobile broadband devices.
  **/
@@ -39,9 +39,9 @@
 /**
  * nm_setting_ppp_error_quark:
  *
- * Registers an error quark for #NMSettingPPP if necessary.
+ * Registers an error quark for #NMSettingPpp if necessary.
  *
- * Returns: the error quark used for #NMSettingPPP errors.
+ * Returns: the error quark used for #NMSettingPpp errors.
  **/
 GQuark
 nm_setting_ppp_error_quark (void)
@@ -54,14 +54,14 @@ nm_setting_ppp_error_quark (void)
 }
 
 
-G_DEFINE_TYPE_WITH_CODE (NMSettingPPP, nm_setting_ppp, NM_TYPE_SETTING,
+G_DEFINE_TYPE_WITH_CODE (NMSettingPpp, nm_setting_ppp, NM_TYPE_SETTING,
                          _nm_register_setting (NM_SETTING_PPP_SETTING_NAME,
                                                g_define_type_id,
                                                3,
                                                NM_SETTING_PPP_ERROR))
 NM_SETTING_REGISTER_TYPE (NM_TYPE_SETTING_PPP)
 
-#define NM_SETTING_PPP_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_SETTING_PPP, NMSettingPPPPrivate))
+#define NM_SETTING_PPP_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_SETTING_PPP, NMSettingPppPrivate))
 
 typedef struct {
 	gboolean noauth;
@@ -82,7 +82,7 @@ typedef struct {
 	guint32 mtu;
 	guint32 lcp_echo_failure;
 	guint32 lcp_echo_interval;
-} NMSettingPPPPrivate;
+} NMSettingPppPrivate;
 
 enum {
 	PROP_0,
@@ -111,9 +111,9 @@ enum {
 /**
  * nm_setting_ppp_new:
  *
- * Creates a new #NMSettingPPP object with default values.
+ * Creates a new #NMSettingPpp object with default values.
  *
- * Returns: (transfer full): the new empty #NMSettingPPP object
+ * Returns: (transfer full): the new empty #NMSettingPpp object
  **/
 NMSetting *
 nm_setting_ppp_new (void)
@@ -123,12 +123,12 @@ nm_setting_ppp_new (void)
 
 /**
  * nm_setting_ppp_get_noauth:
- * @setting: the #NMSettingPPP
+ * @setting: the #NMSettingPpp
  *
- * Returns: the #NMSettingPPP:noauth property of the setting
+ * Returns: the #NMSettingPpp:noauth property of the setting
  **/
 gboolean
-nm_setting_ppp_get_noauth (NMSettingPPP *setting)
+nm_setting_ppp_get_noauth (NMSettingPpp *setting)
 {
 	g_return_val_if_fail (NM_IS_SETTING_PPP (setting), FALSE);
 
@@ -137,12 +137,12 @@ nm_setting_ppp_get_noauth (NMSettingPPP *setting)
 
 /**
  * nm_setting_ppp_get_refuse_eap:
- * @setting: the #NMSettingPPP
+ * @setting: the #NMSettingPpp
  *
- * Returns: the #NMSettingPPP:refuse-eap property of the setting
+ * Returns: the #NMSettingPpp:refuse-eap property of the setting
  **/
 gboolean
-nm_setting_ppp_get_refuse_eap (NMSettingPPP *setting)
+nm_setting_ppp_get_refuse_eap (NMSettingPpp *setting)
 {
 	g_return_val_if_fail (NM_IS_SETTING_PPP (setting), FALSE);
 
@@ -151,12 +151,12 @@ nm_setting_ppp_get_refuse_eap (NMSettingPPP *setting)
 
 /**
  * nm_setting_ppp_get_refuse_pap:
- * @setting: the #NMSettingPPP
+ * @setting: the #NMSettingPpp
  *
- * Returns: the #NMSettingPPP:refuse-pap property of the setting
+ * Returns: the #NMSettingPpp:refuse-pap property of the setting
  **/
 gboolean
-nm_setting_ppp_get_refuse_pap (NMSettingPPP *setting)
+nm_setting_ppp_get_refuse_pap (NMSettingPpp *setting)
 {
 	g_return_val_if_fail (NM_IS_SETTING_PPP (setting), FALSE);
 
@@ -165,12 +165,12 @@ nm_setting_ppp_get_refuse_pap (NMSettingPPP *setting)
 
 /**
  * nm_setting_ppp_get_refuse_chap:
- * @setting: the #NMSettingPPP
+ * @setting: the #NMSettingPpp
  *
- * Returns: the #NMSettingPPP:refuse-chap property of the setting
+ * Returns: the #NMSettingPpp:refuse-chap property of the setting
  **/
 gboolean
-nm_setting_ppp_get_refuse_chap (NMSettingPPP *setting)
+nm_setting_ppp_get_refuse_chap (NMSettingPpp *setting)
 {
 	g_return_val_if_fail (NM_IS_SETTING_PPP (setting), FALSE);
 
@@ -179,12 +179,12 @@ nm_setting_ppp_get_refuse_chap (NMSettingPPP *setting)
 
 /**
  * nm_setting_ppp_get_refuse_mschap:
- * @setting: the #NMSettingPPP
+ * @setting: the #NMSettingPpp
  *
- * Returns: the #NMSettingPPP:refuse-mschap property of the setting
+ * Returns: the #NMSettingPpp:refuse-mschap property of the setting
  **/
 gboolean
-nm_setting_ppp_get_refuse_mschap (NMSettingPPP *setting)
+nm_setting_ppp_get_refuse_mschap (NMSettingPpp *setting)
 {
 	g_return_val_if_fail (NM_IS_SETTING_PPP (setting), FALSE);
 
@@ -193,12 +193,12 @@ nm_setting_ppp_get_refuse_mschap (NMSettingPPP *setting)
 
 /**
  * nm_setting_ppp_get_refuse_mschapv2:
- * @setting: the #NMSettingPPP
+ * @setting: the #NMSettingPpp
  *
- * Returns: the #NMSettingPPP:refuse-mschapv2 property of the setting
+ * Returns: the #NMSettingPpp:refuse-mschapv2 property of the setting
  **/
 gboolean
-nm_setting_ppp_get_refuse_mschapv2 (NMSettingPPP *setting)
+nm_setting_ppp_get_refuse_mschapv2 (NMSettingPpp *setting)
 {
 	g_return_val_if_fail (NM_IS_SETTING_PPP (setting), FALSE);
 
@@ -207,12 +207,12 @@ nm_setting_ppp_get_refuse_mschapv2 (NMSettingPPP *setting)
 
 /**
  * nm_setting_ppp_get_nobsdcomp:
- * @setting: the #NMSettingPPP
+ * @setting: the #NMSettingPpp
  *
- * Returns: the #NMSettingPPP:nobsdcomp property of the setting
+ * Returns: the #NMSettingPpp:nobsdcomp property of the setting
  **/
 gboolean
-nm_setting_ppp_get_nobsdcomp (NMSettingPPP *setting)
+nm_setting_ppp_get_nobsdcomp (NMSettingPpp *setting)
 {
 	g_return_val_if_fail (NM_IS_SETTING_PPP (setting), FALSE);
 
@@ -221,12 +221,12 @@ nm_setting_ppp_get_nobsdcomp (NMSettingPPP *setting)
 
 /**
  * nm_setting_ppp_get_nodeflate:
- * @setting: the #NMSettingPPP
+ * @setting: the #NMSettingPpp
  *
- * Returns: the #NMSettingPPP:nodeflate property of the setting
+ * Returns: the #NMSettingPpp:nodeflate property of the setting
  **/
 gboolean
-nm_setting_ppp_get_nodeflate (NMSettingPPP *setting)
+nm_setting_ppp_get_nodeflate (NMSettingPpp *setting)
 {
 	g_return_val_if_fail (NM_IS_SETTING_PPP (setting), FALSE);
 
@@ -235,12 +235,12 @@ nm_setting_ppp_get_nodeflate (NMSettingPPP *setting)
 
 /**
  * nm_setting_ppp_get_no_vj_comp:
- * @setting: the #NMSettingPPP
+ * @setting: the #NMSettingPpp
  *
- * Returns: the #NMSettingPPP:no-vj-comp property of the setting
+ * Returns: the #NMSettingPpp:no-vj-comp property of the setting
  **/
 gboolean
-nm_setting_ppp_get_no_vj_comp (NMSettingPPP *setting)
+nm_setting_ppp_get_no_vj_comp (NMSettingPpp *setting)
 {
 	g_return_val_if_fail (NM_IS_SETTING_PPP (setting), FALSE);
 
@@ -249,12 +249,12 @@ nm_setting_ppp_get_no_vj_comp (NMSettingPPP *setting)
 
 /**
  * nm_setting_ppp_get_require_mppe:
- * @setting: the #NMSettingPPP
+ * @setting: the #NMSettingPpp
  *
- * Returns: the #NMSettingPPP:require-mppe property of the setting
+ * Returns: the #NMSettingPpp:require-mppe property of the setting
  **/
 gboolean
-nm_setting_ppp_get_require_mppe (NMSettingPPP *setting)
+nm_setting_ppp_get_require_mppe (NMSettingPpp *setting)
 {
 	g_return_val_if_fail (NM_IS_SETTING_PPP (setting), FALSE);
 
@@ -263,12 +263,12 @@ nm_setting_ppp_get_require_mppe (NMSettingPPP *setting)
 
 /**
  * nm_setting_ppp_get_require_mppe_128:
- * @setting: the #NMSettingPPP
+ * @setting: the #NMSettingPpp
  *
- * Returns: the #NMSettingPPP:require-mppe-128 property of the setting
+ * Returns: the #NMSettingPpp:require-mppe-128 property of the setting
  **/
 gboolean
-nm_setting_ppp_get_require_mppe_128 (NMSettingPPP *setting)
+nm_setting_ppp_get_require_mppe_128 (NMSettingPpp *setting)
 {
 	g_return_val_if_fail (NM_IS_SETTING_PPP (setting), FALSE);
 
@@ -277,12 +277,12 @@ nm_setting_ppp_get_require_mppe_128 (NMSettingPPP *setting)
 
 /**
  * nm_setting_ppp_get_mppe_stateful:
- * @setting: the #NMSettingPPP
+ * @setting: the #NMSettingPpp
  *
- * Returns: the #NMSettingPPP:mppe-stateful property of the setting
+ * Returns: the #NMSettingPpp:mppe-stateful property of the setting
  **/
 gboolean
-nm_setting_ppp_get_mppe_stateful (NMSettingPPP *setting)
+nm_setting_ppp_get_mppe_stateful (NMSettingPpp *setting)
 {
 	g_return_val_if_fail (NM_IS_SETTING_PPP (setting), FALSE);
 
@@ -291,12 +291,12 @@ nm_setting_ppp_get_mppe_stateful (NMSettingPPP *setting)
 
 /**
  * nm_setting_ppp_get_crtscts:
- * @setting: the #NMSettingPPP
+ * @setting: the #NMSettingPpp
  *
- * Returns: the #NMSettingPPP:crtscts property of the setting
+ * Returns: the #NMSettingPpp:crtscts property of the setting
  **/
 gboolean
-nm_setting_ppp_get_crtscts (NMSettingPPP *setting)
+nm_setting_ppp_get_crtscts (NMSettingPpp *setting)
 {
 	g_return_val_if_fail (NM_IS_SETTING_PPP (setting), FALSE);
 
@@ -305,12 +305,12 @@ nm_setting_ppp_get_crtscts (NMSettingPPP *setting)
 
 /**
  * nm_setting_ppp_get_baud:
- * @setting: the #NMSettingPPP
+ * @setting: the #NMSettingPpp
  *
- * Returns: the #NMSettingPPP:baud property of the setting
+ * Returns: the #NMSettingPpp:baud property of the setting
  **/
 guint32
-nm_setting_ppp_get_baud (NMSettingPPP *setting)
+nm_setting_ppp_get_baud (NMSettingPpp *setting)
 {
 	g_return_val_if_fail (NM_IS_SETTING_PPP (setting), 0);
 
@@ -319,12 +319,12 @@ nm_setting_ppp_get_baud (NMSettingPPP *setting)
 
 /**
  * nm_setting_ppp_get_mru:
- * @setting: the #NMSettingPPP
+ * @setting: the #NMSettingPpp
  *
- * Returns: the #NMSettingPPP:mru property of the setting
+ * Returns: the #NMSettingPpp:mru property of the setting
  **/
 guint32
-nm_setting_ppp_get_mru (NMSettingPPP *setting)
+nm_setting_ppp_get_mru (NMSettingPpp *setting)
 {
 	g_return_val_if_fail (NM_IS_SETTING_PPP (setting), 0);
 
@@ -333,12 +333,12 @@ nm_setting_ppp_get_mru (NMSettingPPP *setting)
 
 /**
  * nm_setting_ppp_get_mtu:
- * @setting: the #NMSettingPPP
+ * @setting: the #NMSettingPpp
  *
- * Returns: the #NMSettingPPP:mtu property of the setting
+ * Returns: the #NMSettingPpp:mtu property of the setting
  **/
 guint32
-nm_setting_ppp_get_mtu (NMSettingPPP *setting)
+nm_setting_ppp_get_mtu (NMSettingPpp *setting)
 {
 	g_return_val_if_fail (NM_IS_SETTING_PPP (setting), 0);
 
@@ -347,12 +347,12 @@ nm_setting_ppp_get_mtu (NMSettingPPP *setting)
 
 /**
  * nm_setting_ppp_get_lcp_echo_failure:
- * @setting: the #NMSettingPPP
+ * @setting: the #NMSettingPpp
  *
- * Returns: the #NMSettingPPP:lcp-echo-failure property of the setting
+ * Returns: the #NMSettingPpp:lcp-echo-failure property of the setting
  **/
 guint32
-nm_setting_ppp_get_lcp_echo_failure (NMSettingPPP *setting)
+nm_setting_ppp_get_lcp_echo_failure (NMSettingPpp *setting)
 {
 	g_return_val_if_fail (NM_IS_SETTING_PPP (setting), 0);
 
@@ -361,12 +361,12 @@ nm_setting_ppp_get_lcp_echo_failure (NMSettingPPP *setting)
 
 /**
  * nm_setting_ppp_get_lcp_echo_interval:
- * @setting: the #NMSettingPPP
+ * @setting: the #NMSettingPpp
  *
- * Returns: the #NMSettingPPP:lcp-echo-interval property of the setting
+ * Returns: the #NMSettingPpp:lcp-echo-interval property of the setting
  **/
 guint32
-nm_setting_ppp_get_lcp_echo_interval (NMSettingPPP *setting)
+nm_setting_ppp_get_lcp_echo_interval (NMSettingPpp *setting)
 {
 	g_return_val_if_fail (NM_IS_SETTING_PPP (setting), 0);
 
@@ -376,7 +376,7 @@ nm_setting_ppp_get_lcp_echo_interval (NMSettingPPP *setting)
 static gboolean
 verify (NMSetting *setting, GSList *all_settings, GError **error)
 {
-	NMSettingPPPPrivate *priv = NM_SETTING_PPP_GET_PRIVATE (setting);
+	NMSettingPppPrivate *priv = NM_SETTING_PPP_GET_PRIVATE (setting);
 
 	/* FIXME: Do we even want this or can we just let pppd evaluate the options? */
 	if (priv->mru > 0) {
@@ -408,7 +408,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
 }
 
 static void
-nm_setting_ppp_init (NMSettingPPP *setting)
+nm_setting_ppp_init (NMSettingPpp *setting)
 {
 }
 
@@ -416,7 +416,7 @@ static void
 set_property (GObject *object, guint prop_id,
               const GValue *value, GParamSpec *pspec)
 {
-	NMSettingPPPPrivate *priv = NM_SETTING_PPP_GET_PRIVATE (object);
+	NMSettingPppPrivate *priv = NM_SETTING_PPP_GET_PRIVATE (object);
 
 	switch (prop_id) {
 	case PROP_NOAUTH:
@@ -483,7 +483,7 @@ static void
 get_property (GObject *object, guint prop_id,
               GValue *value, GParamSpec *pspec)
 {
-	NMSettingPPP *setting = NM_SETTING_PPP (object);
+	NMSettingPpp *setting = NM_SETTING_PPP (object);
 
 	switch (prop_id) {
 	case PROP_NOAUTH:
@@ -547,12 +547,12 @@ get_property (GObject *object, guint prop_id,
 }
 
 static void
-nm_setting_ppp_class_init (NMSettingPPPClass *setting_class)
+nm_setting_ppp_class_init (NMSettingPppClass *setting_class)
 {
 	GObjectClass *object_class = G_OBJECT_CLASS (setting_class);
 	NMSettingClass *parent_class = NM_SETTING_CLASS (setting_class);
 
-	g_type_class_add_private (setting_class, sizeof (NMSettingPPPPrivate));
+	g_type_class_add_private (setting_class, sizeof (NMSettingPppPrivate));
 
 	/* virtual methods */
 	object_class->set_property = set_property;
@@ -561,7 +561,7 @@ nm_setting_ppp_class_init (NMSettingPPPClass *setting_class)
 
 	/* Properties */
 	/**
-	 * NMSettingPPP:noauth:
+	 * NMSettingPpp:noauth:
 	 *
 	 * If %TRUE, do not require the other side (usually the PPP server) to
 	 * authenticate itself to the client.  If %FALSE, require authentication
@@ -576,7 +576,7 @@ nm_setting_ppp_class_init (NMSettingPPPClass *setting_class)
 		                       G_PARAM_STATIC_STRINGS));
 
 	/**
-	 * NMSettingPPP:refuse-eap:
+	 * NMSettingPpp:refuse-eap:
 	 *
 	 * If %TRUE, the EAP authentication method will not be used.
 	 **/
@@ -589,7 +589,7 @@ nm_setting_ppp_class_init (NMSettingPPPClass *setting_class)
 		                       G_PARAM_STATIC_STRINGS));
 
 	/**
-	 * NMSettingPPP:refuse-pap:
+	 * NMSettingPpp:refuse-pap:
 	 *
 	 * If %TRUE, the PAP authentication method will not be used.
 	 **/
@@ -602,7 +602,7 @@ nm_setting_ppp_class_init (NMSettingPPPClass *setting_class)
 		                       G_PARAM_STATIC_STRINGS));
 
 	/**
-	 * NMSettingPPP:refuse-chap:
+	 * NMSettingPpp:refuse-chap:
 	 *
 	 * If %TRUE, the CHAP authentication method will not be used.
 	 **/
@@ -615,7 +615,7 @@ nm_setting_ppp_class_init (NMSettingPPPClass *setting_class)
 		                       G_PARAM_STATIC_STRINGS));
 
 	/**
-	 * NMSettingPPP:refuse-mschap:
+	 * NMSettingPpp:refuse-mschap:
 	 *
 	 * If %TRUE, the MSCHAP authentication method will not be used.
 	 **/
@@ -628,7 +628,7 @@ nm_setting_ppp_class_init (NMSettingPPPClass *setting_class)
 		                       G_PARAM_STATIC_STRINGS));
 
 	/**
-	 * NMSettingPPP:refuse-mschapv2:
+	 * NMSettingPpp:refuse-mschapv2:
 	 *
 	 * If %TRUE, the MSCHAPv2 authentication method will not be used.
 	 **/
@@ -641,7 +641,7 @@ nm_setting_ppp_class_init (NMSettingPPPClass *setting_class)
 		                       G_PARAM_STATIC_STRINGS));
 
 	/**
-	 * NMSettingPPP:nobsdcomp:
+	 * NMSettingPpp:nobsdcomp:
 	 *
 	 * If %TRUE, BSD compression will not be requested.
 	 **/
@@ -655,7 +655,7 @@ nm_setting_ppp_class_init (NMSettingPPPClass *setting_class)
 		                       G_PARAM_STATIC_STRINGS));
 
 	/**
-	 * NMSettingPPP:nodeflate:
+	 * NMSettingPpp:nodeflate:
 	 *
 	 * If %TRUE, "deflate" compression will not be requested.
 	 **/
@@ -669,7 +669,7 @@ nm_setting_ppp_class_init (NMSettingPPPClass *setting_class)
 		                       G_PARAM_STATIC_STRINGS));
 
 	/**
-	 * NMSettingPPP:no-vj-comp:
+	 * NMSettingPpp:no-vj-comp:
 	 *
 	 * If %TRUE, Van Jacobsen TCP header compression will not be requested.
 	 **/
@@ -683,7 +683,7 @@ nm_setting_ppp_class_init (NMSettingPPPClass *setting_class)
 		                       G_PARAM_STATIC_STRINGS));
 
 	/**
-	 * NMSettingPPP:require-mppe:
+	 * NMSettingPpp:require-mppe:
 	 *
 	 * If %TRUE, MPPE (Microsoft Point-to-Point Encrpytion) will be required for
 	 * the PPP session.  If either 64-bit or 128-bit MPPE is not available the
@@ -699,7 +699,7 @@ nm_setting_ppp_class_init (NMSettingPPPClass *setting_class)
 		                       G_PARAM_STATIC_STRINGS));
 
 	/**
-	 * NMSettingPPP:require-mppe-128:
+	 * NMSettingPpp:require-mppe-128:
 	 *
 	 * If %TRUE, 128-bit MPPE (Microsoft Point-to-Point Encrpytion) will be
 	 * required for the PPP session, and the "require-mppe" property must also
@@ -713,7 +713,7 @@ nm_setting_ppp_class_init (NMSettingPPPClass *setting_class)
 		                       G_PARAM_STATIC_STRINGS));
 
 	/**
-	 * NMSettingPPP:mppe-stateful:
+	 * NMSettingPpp:mppe-stateful:
 	 *
 	 * If %TRUE, stateful MPPE is used.  See pppd documentation for more
 	 * information on stateful MPPE.
@@ -727,7 +727,7 @@ nm_setting_ppp_class_init (NMSettingPPPClass *setting_class)
 		                       G_PARAM_STATIC_STRINGS));
 
 	/**
-	 * NMSettingPPP:crtscts:
+	 * NMSettingPpp:crtscts:
 	 *
 	 * If %TRUE, specify that pppd should set the serial port to use hardware
 	 * flow control with RTS and CTS signals.  This value should normally be set
@@ -742,7 +742,7 @@ nm_setting_ppp_class_init (NMSettingPPPClass *setting_class)
 		                       G_PARAM_STATIC_STRINGS));
 
 	/**
-	 * NMSettingPPP:baud:
+	 * NMSettingPpp:baud:
 	 *
 	 * If non-zero, instruct pppd to set the serial port to the specified
 	 * baudrate.  This value should normally be left as 0 to automatically
@@ -758,7 +758,7 @@ nm_setting_ppp_class_init (NMSettingPPPClass *setting_class)
 		                    G_PARAM_STATIC_STRINGS));
 
 	/**
-	 * NMSettingPPP:mru:
+	 * NMSettingPpp:mru:
 	 *
 	 * If non-zero, instruct pppd to request that the peer send packets no
 	 * larger than the specified size.  If non-zero, the MRU should be between
@@ -773,7 +773,7 @@ nm_setting_ppp_class_init (NMSettingPPPClass *setting_class)
 		                    G_PARAM_STATIC_STRINGS));
 
 	/**
-	 * NMSettingPPP:mtu:
+	 * NMSettingPpp:mtu:
 	 *
 	 * If non-zero, instruct pppd to send packets no larger than the specified
 	 * size.
@@ -788,7 +788,7 @@ nm_setting_ppp_class_init (NMSettingPPPClass *setting_class)
 		                    G_PARAM_STATIC_STRINGS));
 
 	/**
-	 * NMSettingPPP:lcp-echo-failure:
+	 * NMSettingPpp:lcp-echo-failure:
 	 *
 	 * If non-zero, instruct pppd to presume the connection to the peer has
 	 * failed if the specified number of LCP echo-requests go unanswered by the
@@ -805,7 +805,7 @@ nm_setting_ppp_class_init (NMSettingPPPClass *setting_class)
 		                    G_PARAM_STATIC_STRINGS));
 
 	/**
-	 * NMSettingPPP:lcp-echo-interval:
+	 * NMSettingPpp:lcp-echo-interval:
 	 *
 	 * If non-zero, instruct pppd to send an LCP echo-request frame to the peer
 	 * every n seconds (where n is the specified value).  Note that some PPP
diff --git a/libnm-core/nm-setting-ppp.h b/libnm-core/nm-setting-ppp.h
index 5733902b83..3b0956a892 100644
--- a/libnm-core/nm-setting-ppp.h
+++ b/libnm-core/nm-setting-ppp.h
@@ -28,16 +28,16 @@
 G_BEGIN_DECLS
 
 #define NM_TYPE_SETTING_PPP            (nm_setting_ppp_get_type ())
-#define NM_SETTING_PPP(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_SETTING_PPP, NMSettingPPP))
-#define NM_SETTING_PPP_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_SETTING_PPP, NMSettingPPPClass))
+#define NM_SETTING_PPP(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_SETTING_PPP, NMSettingPpp))
+#define NM_SETTING_PPP_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_SETTING_PPP, NMSettingPppClass))
 #define NM_IS_SETTING_PPP(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_SETTING_PPP))
 #define NM_IS_SETTING_PPP_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_SETTING_PPP))
-#define NM_SETTING_PPP_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_SETTING_PPP, NMSettingPPPClass))
+#define NM_SETTING_PPP_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_SETTING_PPP, NMSettingPppClass))
 
 #define NM_SETTING_PPP_SETTING_NAME "ppp"
 
 /**
- * NMSettingPPPError:
+ * NMSettingPppError:
  * @NM_SETTING_PPP_ERROR_UNKNOWN: unknown or unclassified error
  * @NM_SETTING_PPP_ERROR_INVALID_PROPERTY: the property was invalid
  * @NM_SETTING_PPP_ERROR_MISSING_PROPERTY: the property was missing and is
@@ -50,7 +50,7 @@ typedef enum {
 	NM_SETTING_PPP_ERROR_INVALID_PROPERTY,        /*< nick=InvalidProperty >*/
 	NM_SETTING_PPP_ERROR_MISSING_PROPERTY,        /*< nick=MissingProperty >*/
 	NM_SETTING_PPP_ERROR_REQUIRE_MPPE_NOT_ALLOWED /*< nick=RequireMPPENotAllowed >*/
-} NMSettingPPPError;
+} NMSettingPppError;
 
 #define NM_SETTING_PPP_ERROR nm_setting_ppp_error_quark ()
 GQuark nm_setting_ppp_error_quark (void);
@@ -76,7 +76,7 @@ GQuark nm_setting_ppp_error_quark (void);
 
 typedef struct {
 	NMSetting parent;
-} NMSettingPPP;
+} NMSettingPpp;
 
 typedef struct {
 	NMSettingClass parent;
@@ -86,29 +86,29 @@ typedef struct {
 	void (*_reserved2) (void);
 	void (*_reserved3) (void);
 	void (*_reserved4) (void);
-} NMSettingPPPClass;
+} NMSettingPppClass;
 
 GType nm_setting_ppp_get_type (void);
 
 NMSetting *nm_setting_ppp_new                   (void);
-gboolean   nm_setting_ppp_get_noauth            (NMSettingPPP *setting);
-gboolean   nm_setting_ppp_get_refuse_eap        (NMSettingPPP *setting);
-gboolean   nm_setting_ppp_get_refuse_pap        (NMSettingPPP *setting);
-gboolean   nm_setting_ppp_get_refuse_chap       (NMSettingPPP *setting);
-gboolean   nm_setting_ppp_get_refuse_mschap     (NMSettingPPP *setting);
-gboolean   nm_setting_ppp_get_refuse_mschapv2   (NMSettingPPP *setting);
-gboolean   nm_setting_ppp_get_nobsdcomp         (NMSettingPPP *setting);
-gboolean   nm_setting_ppp_get_nodeflate         (NMSettingPPP *setting);
-gboolean   nm_setting_ppp_get_no_vj_comp        (NMSettingPPP *setting);
-gboolean   nm_setting_ppp_get_require_mppe      (NMSettingPPP *setting);
-gboolean   nm_setting_ppp_get_require_mppe_128  (NMSettingPPP *setting);
-gboolean   nm_setting_ppp_get_mppe_stateful     (NMSettingPPP *setting);
-gboolean   nm_setting_ppp_get_crtscts           (NMSettingPPP *setting);
-guint32    nm_setting_ppp_get_baud              (NMSettingPPP *setting);
-guint32    nm_setting_ppp_get_mru               (NMSettingPPP *setting);
-guint32    nm_setting_ppp_get_mtu               (NMSettingPPP *setting);
-guint32    nm_setting_ppp_get_lcp_echo_failure  (NMSettingPPP *setting);
-guint32    nm_setting_ppp_get_lcp_echo_interval (NMSettingPPP *setting);
+gboolean   nm_setting_ppp_get_noauth            (NMSettingPpp *setting);
+gboolean   nm_setting_ppp_get_refuse_eap        (NMSettingPpp *setting);
+gboolean   nm_setting_ppp_get_refuse_pap        (NMSettingPpp *setting);
+gboolean   nm_setting_ppp_get_refuse_chap       (NMSettingPpp *setting);
+gboolean   nm_setting_ppp_get_refuse_mschap     (NMSettingPpp *setting);
+gboolean   nm_setting_ppp_get_refuse_mschapv2   (NMSettingPpp *setting);
+gboolean   nm_setting_ppp_get_nobsdcomp         (NMSettingPpp *setting);
+gboolean   nm_setting_ppp_get_nodeflate         (NMSettingPpp *setting);
+gboolean   nm_setting_ppp_get_no_vj_comp        (NMSettingPpp *setting);
+gboolean   nm_setting_ppp_get_require_mppe      (NMSettingPpp *setting);
+gboolean   nm_setting_ppp_get_require_mppe_128  (NMSettingPpp *setting);
+gboolean   nm_setting_ppp_get_mppe_stateful     (NMSettingPpp *setting);
+gboolean   nm_setting_ppp_get_crtscts           (NMSettingPpp *setting);
+guint32    nm_setting_ppp_get_baud              (NMSettingPpp *setting);
+guint32    nm_setting_ppp_get_mru               (NMSettingPpp *setting);
+guint32    nm_setting_ppp_get_mtu               (NMSettingPpp *setting);
+guint32    nm_setting_ppp_get_lcp_echo_failure  (NMSettingPpp *setting);
+guint32    nm_setting_ppp_get_lcp_echo_interval (NMSettingPpp *setting);
 
 G_END_DECLS
 
diff --git a/libnm-core/nm-setting-pppoe.c b/libnm-core/nm-setting-pppoe.c
index a3923336c1..d12e077da4 100644
--- a/libnm-core/nm-setting-pppoe.c
+++ b/libnm-core/nm-setting-pppoe.c
@@ -32,7 +32,7 @@
  * @short_description: Describes PPPoE connection properties
  * @include: nm-setting-pppoe.h
  *
- * The #NMSettingPPPOE object is a #NMSetting subclass that describes
+ * The #NMSettingPppoe object is a #NMSetting subclass that describes
  * properties necessary for connection to networks that require PPPoE connections
  * to provide IP transport, for example cable or DSL modems.
  **/
@@ -40,9 +40,9 @@
 /**
  * nm_setting_pppoe_error_quark:
  *
- * Registers an error quark for #NMSettingPPPOE if necessary.
+ * Registers an error quark for #NMSettingPppoe if necessary.
  *
- * Returns: the error quark used for #NMSettingPPPOE errors.
+ * Returns: the error quark used for #NMSettingPppoe errors.
  **/
 GQuark
 nm_setting_pppoe_error_quark (void)
@@ -55,21 +55,21 @@ nm_setting_pppoe_error_quark (void)
 }
 
 
-G_DEFINE_TYPE_WITH_CODE (NMSettingPPPOE, nm_setting_pppoe, NM_TYPE_SETTING,
+G_DEFINE_TYPE_WITH_CODE (NMSettingPppoe, nm_setting_pppoe, NM_TYPE_SETTING,
                          _nm_register_setting (NM_SETTING_PPPOE_SETTING_NAME,
                                                g_define_type_id,
                                                3,
                                                NM_SETTING_PPPOE_ERROR))
 NM_SETTING_REGISTER_TYPE (NM_TYPE_SETTING_PPPOE)
 
-#define NM_SETTING_PPPOE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_SETTING_PPPOE, NMSettingPPPOEPrivate))
+#define NM_SETTING_PPPOE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_SETTING_PPPOE, NMSettingPppoePrivate))
 
 typedef struct {
 	char *service;
 	char *username;
 	char *password;
 	NMSettingSecretFlags password_flags;
-} NMSettingPPPOEPrivate;
+} NMSettingPppoePrivate;
 
 enum {
 	PROP_0,
@@ -84,9 +84,9 @@ enum {
 /**
  * nm_setting_pppoe_new:
  *
- * Creates a new #NMSettingPPPOE object with default values.
+ * Creates a new #NMSettingPppoe object with default values.
  *
- * Returns: (transfer full): the new empty #NMSettingPPPOE object
+ * Returns: (transfer full): the new empty #NMSettingPppoe object
  **/
 NMSetting *
 nm_setting_pppoe_new (void)
@@ -96,12 +96,12 @@ nm_setting_pppoe_new (void)
 
 /**
  * nm_setting_pppoe_get_service:
- * @setting: the #NMSettingPPPOE
+ * @setting: the #NMSettingPppoe
  *
- * Returns: the #NMSettingPPPOE:service property of the setting
+ * Returns: the #NMSettingPppoe:service property of the setting
  **/
 const char *
-nm_setting_pppoe_get_service  (NMSettingPPPOE *setting)
+nm_setting_pppoe_get_service  (NMSettingPppoe *setting)
 {
 	g_return_val_if_fail (NM_IS_SETTING_PPPOE (setting), NULL);
 
@@ -110,12 +110,12 @@ nm_setting_pppoe_get_service  (NMSettingPPPOE *setting)
 
 /**
  * nm_setting_pppoe_get_username:
- * @setting: the #NMSettingPPPOE
+ * @setting: the #NMSettingPppoe
  *
- * Returns: the #NMSettingPPPOE:username property of the setting
+ * Returns: the #NMSettingPppoe:username property of the setting
  **/
 const char *
-nm_setting_pppoe_get_username (NMSettingPPPOE *setting)
+nm_setting_pppoe_get_username (NMSettingPppoe *setting)
 {
 	g_return_val_if_fail (NM_IS_SETTING_PPPOE (setting), NULL);
 
@@ -124,12 +124,12 @@ nm_setting_pppoe_get_username (NMSettingPPPOE *setting)
 
 /**
  * nm_setting_pppoe_get_password:
- * @setting: the #NMSettingPPPOE
+ * @setting: the #NMSettingPppoe
  *
- * Returns: the #NMSettingPPPOE:password property of the setting
+ * Returns: the #NMSettingPppoe:password property of the setting
  **/
 const char *
-nm_setting_pppoe_get_password (NMSettingPPPOE *setting)
+nm_setting_pppoe_get_password (NMSettingPppoe *setting)
 {
 	g_return_val_if_fail (NM_IS_SETTING_PPPOE (setting), NULL);
 
@@ -138,12 +138,12 @@ nm_setting_pppoe_get_password (NMSettingPPPOE *setting)
 
 /**
  * nm_setting_pppoe_get_password_flags:
- * @setting: the #NMSettingPPPOE
+ * @setting: the #NMSettingPppoe
  *
- * Returns: the #NMSettingSecretFlags pertaining to the #NMSettingPPPOE:password
+ * Returns: the #NMSettingSecretFlags pertaining to the #NMSettingPppoe:password
  **/
 NMSettingSecretFlags
-nm_setting_pppoe_get_password_flags (NMSettingPPPOE *setting)
+nm_setting_pppoe_get_password_flags (NMSettingPppoe *setting)
 {
 	g_return_val_if_fail (NM_IS_SETTING_PPPOE (setting), NM_SETTING_SECRET_FLAG_NONE);
 
@@ -153,7 +153,7 @@ nm_setting_pppoe_get_password_flags (NMSettingPPPOE *setting)
 static gboolean
 verify (NMSetting *setting, GSList *all_settings, GError **error)
 {
-	NMSettingPPPOEPrivate *priv = NM_SETTING_PPPOE_GET_PRIVATE (setting);
+	NMSettingPppoePrivate *priv = NM_SETTING_PPPOE_GET_PRIVATE (setting);
 
 	if (!priv->username) {
 		g_set_error_literal (error,
@@ -186,7 +186,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
 static GPtrArray *
 need_secrets (NMSetting *setting)
 {
-	NMSettingPPPOEPrivate *priv = NM_SETTING_PPPOE_GET_PRIVATE (setting);
+	NMSettingPppoePrivate *priv = NM_SETTING_PPPOE_GET_PRIVATE (setting);
 	GPtrArray *secrets = NULL;
 
 	if (priv->password)
@@ -201,7 +201,7 @@ need_secrets (NMSetting *setting)
 }
 
 static void
-nm_setting_pppoe_init (NMSettingPPPOE *setting)
+nm_setting_pppoe_init (NMSettingPppoe *setting)
 {
 }
 
@@ -209,7 +209,7 @@ static void
 set_property (GObject *object, guint prop_id,
               const GValue *value, GParamSpec *pspec)
 {
-	NMSettingPPPOEPrivate *priv = NM_SETTING_PPPOE_GET_PRIVATE (object);
+	NMSettingPppoePrivate *priv = NM_SETTING_PPPOE_GET_PRIVATE (object);
 
 	switch (prop_id) {
 	case PROP_SERVICE:
@@ -237,7 +237,7 @@ static void
 get_property (GObject *object, guint prop_id,
               GValue *value, GParamSpec *pspec)
 {
-	NMSettingPPPOE *setting = NM_SETTING_PPPOE (object);
+	NMSettingPppoe *setting = NM_SETTING_PPPOE (object);
 
 	switch (prop_id) {
 	case PROP_SERVICE:
@@ -261,7 +261,7 @@ get_property (GObject *object, guint prop_id,
 static void
 finalize (GObject *object)
 {
-	NMSettingPPPOEPrivate *priv = NM_SETTING_PPPOE_GET_PRIVATE (object);
+	NMSettingPppoePrivate *priv = NM_SETTING_PPPOE_GET_PRIVATE (object);
 
 	g_free (priv->username);
 	g_free (priv->password);
@@ -271,12 +271,12 @@ finalize (GObject *object)
 }
 
 static void
-nm_setting_pppoe_class_init (NMSettingPPPOEClass *setting_class)
+nm_setting_pppoe_class_init (NMSettingPppoeClass *setting_class)
 {
 	GObjectClass *object_class = G_OBJECT_CLASS (setting_class);
 	NMSettingClass *parent_class = NM_SETTING_CLASS (setting_class);
 
-	g_type_class_add_private (setting_class, sizeof (NMSettingPPPOEPrivate));
+	g_type_class_add_private (setting_class, sizeof (NMSettingPppoePrivate));
 
 	/* virtual methods */
 	object_class->set_property = set_property;
@@ -287,7 +287,7 @@ nm_setting_pppoe_class_init (NMSettingPPPOEClass *setting_class)
 
 	/* Properties */
 	/**
-	 * NMSettingPPPOE:service:
+	 * NMSettingPppoe:service:
 	 *
 	 * If specified, instruct PPPoE to only initiate sessions with access
 	 * concentrators that provide the specified service.  For most providers,
@@ -302,7 +302,7 @@ nm_setting_pppoe_class_init (NMSettingPPPOEClass *setting_class)
 		                      G_PARAM_STATIC_STRINGS));
 
 	/**
-	 * NMSettingPPPOE:username:
+	 * NMSettingPppoe:username:
 	 *
 	 * Username used to authenticate with the PPPoE service.
 	 **/
@@ -314,7 +314,7 @@ nm_setting_pppoe_class_init (NMSettingPPPOEClass *setting_class)
 		                      G_PARAM_STATIC_STRINGS));
 
 	/**
-	 * NMSettingPPPOE:password:
+	 * NMSettingPppoe:password:
 	 *
 	 * Password used to authenticate with the PPPoE service.
 	 **/
@@ -327,9 +327,9 @@ nm_setting_pppoe_class_init (NMSettingPPPOEClass *setting_class)
 		                      G_PARAM_STATIC_STRINGS));
 
 	/**
-	 * NMSettingPPPOE:password-flags:
+	 * NMSettingPppoe:password-flags:
 	 *
-	 * Flags indicating how to handle the #NMSettingPPPOE:password property.
+	 * Flags indicating how to handle the #NMSettingPppoe:password property.
 	 **/
 	g_object_class_install_property
 		(object_class, PROP_PASSWORD_FLAGS,
diff --git a/libnm-core/nm-setting-pppoe.h b/libnm-core/nm-setting-pppoe.h
index 9d04af9e24..92c2d3361d 100644
--- a/libnm-core/nm-setting-pppoe.h
+++ b/libnm-core/nm-setting-pppoe.h
@@ -28,16 +28,16 @@
 G_BEGIN_DECLS
 
 #define NM_TYPE_SETTING_PPPOE            (nm_setting_pppoe_get_type ())
-#define NM_SETTING_PPPOE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_SETTING_PPPOE, NMSettingPPPOE))
-#define NM_SETTING_PPPOE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_SETTING_PPPOE, NMSettingPPPOEClass))
+#define NM_SETTING_PPPOE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_SETTING_PPPOE, NMSettingPppoe))
+#define NM_SETTING_PPPOE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_SETTING_PPPOE, NMSettingPppoeClass))
 #define NM_IS_SETTING_PPPOE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_SETTING_PPPOE))
 #define NM_IS_SETTING_PPPOE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_SETTING_PPPOE))
-#define NM_SETTING_PPPOE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_SETTING_PPPOE, NMSettingPPPOEClass))
+#define NM_SETTING_PPPOE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_SETTING_PPPOE, NMSettingPppoeClass))
 
 #define NM_SETTING_PPPOE_SETTING_NAME "pppoe"
 
 /**
- * NMSettingPPPOEError:
+ * NMSettingPppoeError:
  * @NM_SETTING_PPPOE_ERROR_UNKNOWN: unknown or unclassified error
  * @NM_SETTING_PPPOE_ERROR_INVALID_PROPERTY: the property was invalid
  * @NM_SETTING_PPPOE_ERROR_MISSING_PROPERTY: the property was missing and is
@@ -50,7 +50,7 @@ typedef enum {
 	NM_SETTING_PPPOE_ERROR_INVALID_PROPERTY,   /*< nick=InvalidProperty >*/
 	NM_SETTING_PPPOE_ERROR_MISSING_PROPERTY,   /*< nick=MissingProperty >*/
 	NM_SETTING_PPPOE_ERROR_MISSING_PPP_SETTING /*< nick=MissingPPPSetting >*/
-} NMSettingPPPOEError;
+} NMSettingPppoeError;
 
 #define NM_SETTING_PPPOE_ERROR nm_setting_pppoe_error_quark ()
 GQuark nm_setting_pppoe_error_quark (void);
@@ -62,7 +62,7 @@ GQuark nm_setting_pppoe_error_quark (void);
 
 typedef struct {
 	NMSetting parent;
-} NMSettingPPPOE;
+} NMSettingPppoe;
 
 typedef struct {
 	NMSettingClass parent;
@@ -72,15 +72,15 @@ typedef struct {
 	void (*_reserved2) (void);
 	void (*_reserved3) (void);
 	void (*_reserved4) (void);
-} NMSettingPPPOEClass;
+} NMSettingPppoeClass;
 
 GType nm_setting_pppoe_get_type (void);
 
 NMSetting  *nm_setting_pppoe_new          (void);
-const char *nm_setting_pppoe_get_service  (NMSettingPPPOE *setting);
-const char *nm_setting_pppoe_get_username (NMSettingPPPOE *setting);
-const char *nm_setting_pppoe_get_password (NMSettingPPPOE *setting);
-NMSettingSecretFlags nm_setting_pppoe_get_password_flags (NMSettingPPPOE *setting);
+const char *nm_setting_pppoe_get_service  (NMSettingPppoe *setting);
+const char *nm_setting_pppoe_get_username (NMSettingPppoe *setting);
+const char *nm_setting_pppoe_get_password (NMSettingPppoe *setting);
+NMSettingSecretFlags nm_setting_pppoe_get_password_flags (NMSettingPppoe *setting);
 
 G_END_DECLS
 
diff --git a/libnm-core/nm-setting-serial.h b/libnm-core/nm-setting-serial.h
index 44d46cf37a..67ebe1abe6 100644
--- a/libnm-core/nm-setting-serial.h
+++ b/libnm-core/nm-setting-serial.h
@@ -43,7 +43,7 @@ G_BEGIN_DECLS
  * @NM_SETTING_SERIAL_ERROR_MISSING_PROPERTY: the property was missing and is
  * required
  * @NM_SETTING_SERIAL_ERROR_MISSING_PPP_SETTING: one of the properties of the
- * setting requires the connection to contain an #NMSettingPPP setting
+ * setting requires the connection to contain an #NMSettingPpp setting
  */
 typedef enum {
 	NM_SETTING_SERIAL_ERROR_UNKNOWN = 0,        /*< nick=UnknownError >*/
diff --git a/libnm-core/nm-setting-vpn.c b/libnm-core/nm-setting-vpn.c
index 3afc4dd93c..2366f17ee8 100644
--- a/libnm-core/nm-setting-vpn.c
+++ b/libnm-core/nm-setting-vpn.c
@@ -36,7 +36,7 @@
  * @short_description: Describes connection properties for Virtual Private Networks
  * @include: nm-setting-vpn.h
  *
- * The #NMSettingVPN object is a #NMSetting subclass that describes properties
+ * The #NMSettingVpn object is a #NMSetting subclass that describes properties
  * necessary for connection to Virtual Private Networks.  NetworkManager uses
  * a plugin architecture to allow easier use of new VPN types, and this
  * setting abstracts the configuration for those plugins.  Since the configuration
@@ -48,9 +48,9 @@
 /**
  * nm_setting_vpn_error_quark:
  *
- * Registers an error quark for #NMSettingVPN if necessary.
+ * Registers an error quark for #NMSettingVpn if necessary.
  *
- * Returns: the error quark used for #NMSettingVPN errors.
+ * Returns: the error quark used for #NMSettingVpn errors.
  **/
 GQuark
 nm_setting_vpn_error_quark (void)
@@ -63,14 +63,14 @@ nm_setting_vpn_error_quark (void)
 }
 
 
-G_DEFINE_TYPE_WITH_CODE (NMSettingVPN, nm_setting_vpn, NM_TYPE_SETTING,
+G_DEFINE_TYPE_WITH_CODE (NMSettingVpn, nm_setting_vpn, NM_TYPE_SETTING,
                          _nm_register_setting (NM_SETTING_VPN_SETTING_NAME,
                                                g_define_type_id,
                                                1,
                                                NM_SETTING_VPN_ERROR))
 NM_SETTING_REGISTER_TYPE (NM_TYPE_SETTING_VPN)
 
-#define NM_SETTING_VPN_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_SETTING_VPN, NMSettingVPNPrivate))
+#define NM_SETTING_VPN_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_SETTING_VPN, NMSettingVpnPrivate))
 
 typedef struct {
 	char *service_type;
@@ -98,7 +98,7 @@ typedef struct {
 	 * freed with g_free().  Should contain secrets only.
 	 */
 	GHashTable *secrets;
-} NMSettingVPNPrivate;
+} NMSettingVpnPrivate;
 
 enum {
 	PROP_0,
@@ -113,9 +113,9 @@ enum {
 /**
  * nm_setting_vpn_new:
  *
- * Creates a new #NMSettingVPN object with default values.
+ * Creates a new #NMSettingVpn object with default values.
  *
- * Returns: (transfer full): the new empty #NMSettingVPN object
+ * Returns: (transfer full): the new empty #NMSettingVpn object
  **/
 NMSetting *
 nm_setting_vpn_new (void)
@@ -125,7 +125,7 @@ nm_setting_vpn_new (void)
 
 /**
  * nm_setting_vpn_get_service_type:
- * @setting: the #NMSettingVPN
+ * @setting: the #NMSettingVpn
  *
  * Returns the service name of the VPN, which identifies the specific VPN
  * plugin that should be used to connect to this VPN.
@@ -133,7 +133,7 @@ nm_setting_vpn_new (void)
  * Returns: the VPN plugin's service name
  **/
 const char *
-nm_setting_vpn_get_service_type (NMSettingVPN *setting)
+nm_setting_vpn_get_service_type (NMSettingVpn *setting)
 {
 	g_return_val_if_fail (NM_IS_SETTING_VPN (setting), NULL);
 
@@ -142,12 +142,12 @@ nm_setting_vpn_get_service_type (NMSettingVPN *setting)
 
 /**
  * nm_setting_vpn_get_user_name:
- * @setting: the #NMSettingVPN
+ * @setting: the #NMSettingVpn
  *
- * Returns: the #NMSettingVPN:user-name property of the setting
+ * Returns: the #NMSettingVpn:user-name property of the setting
  **/
 const char *
-nm_setting_vpn_get_user_name (NMSettingVPN *setting)
+nm_setting_vpn_get_user_name (NMSettingVpn *setting)
 {
 	g_return_val_if_fail (NM_IS_SETTING_VPN (setting), NULL);
 
@@ -156,14 +156,14 @@ nm_setting_vpn_get_user_name (NMSettingVPN *setting)
 
 /**
  * nm_setting_vpn_get_num_data_items:
- * @setting: the #NMSettingVPN
+ * @setting: the #NMSettingVpn
  *
  * Gets number of key/value pairs of VPN configuration data.
  *
  * Returns: the number of VPN plugin specific configuration data items
  **/
 guint32
-nm_setting_vpn_get_num_data_items (NMSettingVPN *setting)
+nm_setting_vpn_get_num_data_items (NMSettingVpn *setting)
 {
 	g_return_val_if_fail (NM_IS_SETTING_VPN (setting), 0);
 
@@ -172,7 +172,7 @@ nm_setting_vpn_get_num_data_items (NMSettingVPN *setting)
 
 /**
  * nm_setting_vpn_add_data_item:
- * @setting: the #NMSettingVPN
+ * @setting: the #NMSettingVpn
  * @key: a name that uniquely identifies the given value @item
  * @item: the value to be referenced by @key
  *
@@ -181,7 +181,7 @@ nm_setting_vpn_get_num_data_items (NMSettingVPN *setting)
  * or other secrets, which is what nm_setting_vpn_add_secret() is for.
  **/
 void
-nm_setting_vpn_add_data_item (NMSettingVPN *setting,
+nm_setting_vpn_add_data_item (NMSettingVpn *setting,
                               const char *key,
                               const char *item)
 {
@@ -198,7 +198,7 @@ nm_setting_vpn_add_data_item (NMSettingVPN *setting,
 
 /**
  * nm_setting_vpn_get_data_item:
- * @setting: the #NMSettingVPN
+ * @setting: the #NMSettingVpn
  * @key: the name of the data item to retrieve
  *
  * Retrieves the data item of a key/value relationship previously established
@@ -207,7 +207,7 @@ nm_setting_vpn_add_data_item (NMSettingVPN *setting,
  * Returns: the data item, if any
  **/
 const char *
-nm_setting_vpn_get_data_item (NMSettingVPN *setting, const char *key)
+nm_setting_vpn_get_data_item (NMSettingVpn *setting, const char *key)
 {
 	g_return_val_if_fail (NM_IS_SETTING_VPN (setting), NULL);
 
@@ -216,7 +216,7 @@ nm_setting_vpn_get_data_item (NMSettingVPN *setting, const char *key)
 
 /**
  * nm_setting_vpn_remove_data_item:
- * @setting: the #NMSettingVPN
+ * @setting: the #NMSettingVpn
  * @key: the name of the data item to remove
  *
  * Deletes a key/value relationship previously established by
@@ -226,7 +226,7 @@ nm_setting_vpn_get_data_item (NMSettingVPN *setting, const char *key)
  * %FALSE if it was not.
  **/
 gboolean
-nm_setting_vpn_remove_data_item (NMSettingVPN *setting, const char *key)
+nm_setting_vpn_remove_data_item (NMSettingVpn *setting, const char *key)
 {
 	gboolean found;
 
@@ -240,7 +240,7 @@ nm_setting_vpn_remove_data_item (NMSettingVPN *setting, const char *key)
 
 static void
 foreach_item_helper (GHashTable *hash,
-                     NMVPNIterFunc func,
+                     NMVpnIterFunc func,
                      gpointer user_data)
 {
 	GList *keys, *liter;
@@ -269,7 +269,7 @@ foreach_item_helper (GHashTable *hash,
 
 /**
  * nm_setting_vpn_foreach_data_item:
- * @setting: a #NMSettingVPN
+ * @setting: a #NMSettingVpn
  * @func: (scope call): an user provided function
  * @user_data: data to be passed to @func
  *
@@ -278,8 +278,8 @@ foreach_item_helper (GHashTable *hash,
  * during iteration will not be part of the iteration.
  */
 void
-nm_setting_vpn_foreach_data_item (NMSettingVPN *setting,
-                                  NMVPNIterFunc func,
+nm_setting_vpn_foreach_data_item (NMSettingVpn *setting,
+                                  NMVpnIterFunc func,
                                   gpointer user_data)
 {
 	g_return_if_fail (NM_IS_SETTING_VPN (setting));
@@ -289,14 +289,14 @@ nm_setting_vpn_foreach_data_item (NMSettingVPN *setting,
 
 /**
  * nm_setting_vpn_get_num_secrets:
- * @setting: the #NMSettingVPN
+ * @setting: the #NMSettingVpn
  *
  * Gets number of VPN plugin specific secrets in the setting.
  *
  * Returns: the number of VPN plugin specific secrets
  **/
 guint32
-nm_setting_vpn_get_num_secrets (NMSettingVPN *setting)
+nm_setting_vpn_get_num_secrets (NMSettingVpn *setting)
 {
 	g_return_val_if_fail (NM_IS_SETTING_VPN (setting), 0);
 
@@ -305,7 +305,7 @@ nm_setting_vpn_get_num_secrets (NMSettingVPN *setting)
 
 /**
  * nm_setting_vpn_add_secret:
- * @setting: the #NMSettingVPN
+ * @setting: the #NMSettingVpn
  * @key: a name that uniquely identifies the given secret @secret
  * @secret: the secret to be referenced by @key
  *
@@ -313,7 +313,7 @@ nm_setting_vpn_get_num_secrets (NMSettingVPN *setting)
  * setting which may be retrieved later.
  **/
 void
-nm_setting_vpn_add_secret (NMSettingVPN *setting,
+nm_setting_vpn_add_secret (NMSettingVpn *setting,
                            const char *key,
                            const char *secret)
 {
@@ -330,7 +330,7 @@ nm_setting_vpn_add_secret (NMSettingVPN *setting,
 
 /**
  * nm_setting_vpn_get_secret:
- * @setting: the #NMSettingVPN
+ * @setting: the #NMSettingVpn
  * @key: the name of the secret to retrieve
  *
  * Retrieves the secret of a key/value relationship previously established
@@ -339,7 +339,7 @@ nm_setting_vpn_add_secret (NMSettingVPN *setting,
  * Returns: the secret, if any
  **/
 const char *
-nm_setting_vpn_get_secret (NMSettingVPN *setting, const char *key)
+nm_setting_vpn_get_secret (NMSettingVpn *setting, const char *key)
 {
 	g_return_val_if_fail (NM_IS_SETTING_VPN (setting), NULL);
 
@@ -348,7 +348,7 @@ nm_setting_vpn_get_secret (NMSettingVPN *setting, const char *key)
 
 /**
  * nm_setting_vpn_remove_secret:
- * @setting: the #NMSettingVPN
+ * @setting: the #NMSettingVpn
  * @key: the name of the secret to remove
  *
  * Deletes a key/value relationship previously established by
@@ -358,7 +358,7 @@ nm_setting_vpn_get_secret (NMSettingVPN *setting, const char *key)
  * %FALSE if it was not.
  **/
 gboolean
-nm_setting_vpn_remove_secret (NMSettingVPN *setting, const char *key)
+nm_setting_vpn_remove_secret (NMSettingVpn *setting, const char *key)
 {
 	gboolean found;
 
@@ -372,7 +372,7 @@ nm_setting_vpn_remove_secret (NMSettingVPN *setting, const char *key)
 
 /**
  * nm_setting_vpn_foreach_secret:
- * @setting: a #NMSettingVPN
+ * @setting: a #NMSettingVpn
  * @func: (scope call): an user provided function
  * @user_data: data to be passed to @func
  *
@@ -381,8 +381,8 @@ nm_setting_vpn_remove_secret (NMSettingVPN *setting, const char *key)
  * iteration will not be part of the iteration.
  */
 void
-nm_setting_vpn_foreach_secret (NMSettingVPN *setting,
-                               NMVPNIterFunc func,
+nm_setting_vpn_foreach_secret (NMSettingVpn *setting,
+                               NMVpnIterFunc func,
                                gpointer user_data)
 {
 	g_return_if_fail (NM_IS_SETTING_VPN (setting));
@@ -393,7 +393,7 @@ nm_setting_vpn_foreach_secret (NMSettingVPN *setting,
 static gboolean
 verify (NMSetting *setting, GSList *all_settings, GError **error)
 {
-	NMSettingVPNPrivate *priv = NM_SETTING_VPN_GET_PRIVATE (setting);
+	NMSettingVpnPrivate *priv = NM_SETTING_VPN_GET_PRIVATE (setting);
 
 	if (!priv->service_type) {
 		g_set_error_literal (error,
@@ -432,7 +432,7 @@ update_secret_string (NMSetting *setting,
                       const char *value,
                       GError **error)
 {
-	NMSettingVPNPrivate *priv = NM_SETTING_VPN_GET_PRIVATE (setting);
+	NMSettingVpnPrivate *priv = NM_SETTING_VPN_GET_PRIVATE (setting);
 
 	g_return_val_if_fail (key != NULL, NM_SETTING_UPDATE_SECRET_ERROR);
 	g_return_val_if_fail (value != NULL, NM_SETTING_UPDATE_SECRET_ERROR);
@@ -456,7 +456,7 @@ update_secret_hash (NMSetting *setting,
                     GHashTable *secrets,
                     GError **error)
 {
-	NMSettingVPNPrivate *priv = NM_SETTING_VPN_GET_PRIVATE (setting);
+	NMSettingVpnPrivate *priv = NM_SETTING_VPN_GET_PRIVATE (setting);
 	GHashTableIter iter;
 	const char *name, *value;
 	NMSettingUpdateSecretResult result = NM_SETTING_UPDATE_SECRET_SUCCESS_UNCHANGED;
@@ -540,7 +540,7 @@ get_secret_flags (NMSetting *setting,
                   NMSettingSecretFlags *out_flags,
                   GError **error)
 {
-	NMSettingVPNPrivate *priv = NM_SETTING_VPN_GET_PRIVATE (setting);
+	NMSettingVpnPrivate *priv = NM_SETTING_VPN_GET_PRIVATE (setting);
 	gboolean success = FALSE;
 	char *flags_key;
 	gpointer val;
@@ -593,8 +593,8 @@ need_secrets (NMSetting *setting)
 }
 
 static gboolean
-compare_one_secret (NMSettingVPN *a,
-                    NMSettingVPN *b,
+compare_one_secret (NMSettingVpn *a,
+                    NMSettingVpn *b,
                     NMSettingCompareFlags flags)
 {
 	GHashTable *a_secrets, *b_secrets;
@@ -660,7 +660,7 @@ clear_secrets_with_flags (NMSetting *setting,
                           NMSettingClearSecretsWithFlagsFn func,
                           gpointer user_data)
 {
-	NMSettingVPNPrivate *priv = NM_SETTING_VPN_GET_PRIVATE (setting);
+	NMSettingVpnPrivate *priv = NM_SETTING_VPN_GET_PRIVATE (setting);
 	GHashTableIter iter;
 	const char *secret;
 	gboolean changed = TRUE;
@@ -697,9 +697,9 @@ destroy_one_secret (gpointer data)
 }
 
 static void
-nm_setting_vpn_init (NMSettingVPN *setting)
+nm_setting_vpn_init (NMSettingVpn *setting)
 {
-	NMSettingVPNPrivate *priv = NM_SETTING_VPN_GET_PRIVATE (setting);
+	NMSettingVpnPrivate *priv = NM_SETTING_VPN_GET_PRIVATE (setting);
 
 	priv->data = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free);
 	priv->secrets = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, destroy_one_secret);
@@ -708,7 +708,7 @@ nm_setting_vpn_init (NMSettingVPN *setting)
 static void
 finalize (GObject *object)
 {
-	NMSettingVPNPrivate *priv = NM_SETTING_VPN_GET_PRIVATE (object);
+	NMSettingVpnPrivate *priv = NM_SETTING_VPN_GET_PRIVATE (object);
 
 	g_free (priv->service_type);
 	g_free (priv->user_name);
@@ -730,7 +730,7 @@ static void
 set_property (GObject *object, guint prop_id,
               const GValue *value, GParamSpec *pspec)
 {
-	NMSettingVPNPrivate *priv = NM_SETTING_VPN_GET_PRIVATE (object);
+	NMSettingVpnPrivate *priv = NM_SETTING_VPN_GET_PRIVATE (object);
 	GHashTable *new_hash;
 
 	switch (prop_id) {
@@ -766,8 +766,8 @@ static void
 get_property (GObject *object, guint prop_id,
               GValue *value, GParamSpec *pspec)
 {
-	NMSettingVPN *setting = NM_SETTING_VPN (object);
-	NMSettingVPNPrivate *priv = NM_SETTING_VPN_GET_PRIVATE (setting);
+	NMSettingVpn *setting = NM_SETTING_VPN (object);
+	NMSettingVpnPrivate *priv = NM_SETTING_VPN_GET_PRIVATE (setting);
 
 	switch (prop_id) {
 	case PROP_SERVICE_TYPE:
@@ -789,12 +789,12 @@ get_property (GObject *object, guint prop_id,
 }
 
 static void
-nm_setting_vpn_class_init (NMSettingVPNClass *setting_class)
+nm_setting_vpn_class_init (NMSettingVpnClass *setting_class)
 {
 	GObjectClass *object_class = G_OBJECT_CLASS (setting_class);
 	NMSettingClass *parent_class = NM_SETTING_CLASS (setting_class);
 
-	g_type_class_add_private (setting_class, sizeof (NMSettingVPNPrivate));
+	g_type_class_add_private (setting_class, sizeof (NMSettingVpnPrivate));
 
 	/* virtual methods */
 	object_class->set_property = set_property;
@@ -811,7 +811,7 @@ nm_setting_vpn_class_init (NMSettingVPNClass *setting_class)
 
 	/* Properties */
 	/**
-	 * NMSettingVPN:service-type:
+	 * NMSettingVpn:service-type:
 	 *
 	 * D-Bus service name of the VPN plugin that this setting uses to connect to
 	 * its network.  i.e. org.freedesktop.NetworkManager.vpnc for the vpnc
@@ -825,7 +825,7 @@ nm_setting_vpn_class_init (NMSettingVPNClass *setting_class)
 		                      G_PARAM_STATIC_STRINGS));
 
 	/**
-	 * NMSettingVPN:user-name:
+	 * NMSettingVpn:user-name:
 	 *
 	 * If the VPN connection requires a user name for authentication, that name
 	 * should be provided here.  If the connection is available to more than one
@@ -842,7 +842,7 @@ nm_setting_vpn_class_init (NMSettingVPNClass *setting_class)
 		                      G_PARAM_STATIC_STRINGS));
 
 	/**
-	 * NMSettingVPN:data:
+	 * NMSettingVpn:data:
 	 *
 	 * Dictionary of key/value pairs of VPN plugin specific data.  Both keys and
 	 * values must be strings.
@@ -855,7 +855,7 @@ nm_setting_vpn_class_init (NMSettingVPNClass *setting_class)
 		                             G_PARAM_STATIC_STRINGS));
 
 	/**
-	 * NMSettingVPN:secrets:
+	 * NMSettingVpn:secrets:
 	 *
 	 * Dictionary of key/value pairs of VPN plugin specific secrets like
 	 * passwords or private keys.  Both keys and values must be strings.
diff --git a/libnm-core/nm-setting-vpn.h b/libnm-core/nm-setting-vpn.h
index 3eb51ee9d6..b5a44c0d29 100644
--- a/libnm-core/nm-setting-vpn.h
+++ b/libnm-core/nm-setting-vpn.h
@@ -28,11 +28,11 @@
 G_BEGIN_DECLS
 
 #define NM_TYPE_SETTING_VPN            (nm_setting_vpn_get_type ())
-#define NM_SETTING_VPN(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_SETTING_VPN, NMSettingVPN))
-#define NM_SETTING_VPN_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_SETTING_VPN, NMSettingVPNClass))
+#define NM_SETTING_VPN(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_SETTING_VPN, NMSettingVpn))
+#define NM_SETTING_VPN_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_SETTING_VPN, NMSettingVpnClass))
 #define NM_IS_SETTING_VPN(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_SETTING_VPN))
 #define NM_IS_SETTING_VPN_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_SETTING_VPN))
-#define NM_SETTING_VPN_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_SETTING_VPN, NMSettingVPNClass))
+#define NM_SETTING_VPN_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_SETTING_VPN, NMSettingVpnClass))
 
 #define NM_SETTING_VPN_SETTING_NAME "vpn"
 
@@ -59,7 +59,7 @@ GQuark nm_setting_vpn_error_quark (void);
 
 typedef struct {
 	NMSetting parent;
-} NMSettingVPN;
+} NMSettingVpn;
 
 typedef struct {
 	NMSettingClass parent;
@@ -69,45 +69,45 @@ typedef struct {
 	void (*_reserved2) (void);
 	void (*_reserved3) (void);
 	void (*_reserved4) (void);
-} NMSettingVPNClass;
+} NMSettingVpnClass;
 
 /**
- * NMVPNIterFunc:
+ * NMVpnIterFunc:
  * @key: the name of the data or secret item
  * @value: the value of the data or secret item
  * @user_data: User data passed to nm_setting_vpn_foreach_data_item() or
  * nm_setting_vpn_foreach_secret()
  **/
-typedef void (*NMVPNIterFunc) (const char *key, const char *value, gpointer user_data);
+typedef void (*NMVpnIterFunc) (const char *key, const char *value, gpointer user_data);
 
 GType nm_setting_vpn_get_type (void);
 
 NMSetting        *nm_setting_vpn_new               (void);
-const char       *nm_setting_vpn_get_service_type  (NMSettingVPN *setting);
-const char       *nm_setting_vpn_get_user_name     (NMSettingVPN *setting);
+const char       *nm_setting_vpn_get_service_type  (NMSettingVpn *setting);
+const char       *nm_setting_vpn_get_user_name     (NMSettingVpn *setting);
 
-guint32           nm_setting_vpn_get_num_data_items (NMSettingVPN *setting);
-void              nm_setting_vpn_add_data_item     (NMSettingVPN *setting,
+guint32           nm_setting_vpn_get_num_data_items (NMSettingVpn *setting);
+void              nm_setting_vpn_add_data_item     (NMSettingVpn *setting,
                                                     const char *key,
                                                     const char *item);
-const char *      nm_setting_vpn_get_data_item     (NMSettingVPN *setting,
+const char *      nm_setting_vpn_get_data_item     (NMSettingVpn *setting,
                                                     const char *key);
-gboolean          nm_setting_vpn_remove_data_item  (NMSettingVPN *setting,
+gboolean          nm_setting_vpn_remove_data_item  (NMSettingVpn *setting,
                                                     const char *key);
-void              nm_setting_vpn_foreach_data_item (NMSettingVPN *setting,
-                                                    NMVPNIterFunc func,
+void              nm_setting_vpn_foreach_data_item (NMSettingVpn *setting,
+                                                    NMVpnIterFunc func,
                                                     gpointer user_data);
 
-guint32           nm_setting_vpn_get_num_secrets   (NMSettingVPN *setting);
-void              nm_setting_vpn_add_secret        (NMSettingVPN *setting,
+guint32           nm_setting_vpn_get_num_secrets   (NMSettingVpn *setting);
+void              nm_setting_vpn_add_secret        (NMSettingVpn *setting,
                                                     const char *key,
                                                     const char *secret);
-const char *      nm_setting_vpn_get_secret        (NMSettingVPN *setting,
+const char *      nm_setting_vpn_get_secret        (NMSettingVpn *setting,
                                                     const char *key);
-gboolean          nm_setting_vpn_remove_secret     (NMSettingVPN *setting,
+gboolean          nm_setting_vpn_remove_secret     (NMSettingVpn *setting,
                                                     const char *key);
-void              nm_setting_vpn_foreach_secret    (NMSettingVPN *setting,
-                                                    NMVPNIterFunc func,
+void              nm_setting_vpn_foreach_secret    (NMSettingVpn *setting,
+                                                    NMVpnIterFunc func,
                                                     gpointer user_data);
 
 G_END_DECLS
diff --git a/libnm-core/tests/test-general.c b/libnm-core/tests/test-general.c
index ba965451d2..0ec1488cfa 100644
--- a/libnm-core/tests/test-general.c
+++ b/libnm-core/tests/test-general.c
@@ -90,9 +90,9 @@ vpn_check_empty_func (const char *key, const char *value, gpointer user_data)
 static void
 test_setting_vpn_items (void)
 {
-	NMSettingVPN *s_vpn;
+	NMSettingVpn *s_vpn;
 
-	s_vpn = (NMSettingVPN *) nm_setting_vpn_new ();
+	s_vpn = (NMSettingVpn *) nm_setting_vpn_new ();
 	ASSERT (s_vpn != NULL,
 	        "vpn-items",
 	        "error creating vpn setting");
@@ -182,7 +182,7 @@ static void
 test_setting_vpn_update_secrets (void)
 {
 	NMConnection *connection;
-	NMSettingVPN *s_vpn;
+	NMSettingVpn *s_vpn;
 	GHashTable *settings, *vpn, *secrets;
 	GValue val = G_VALUE_INIT;
 	gboolean success;
@@ -198,7 +198,7 @@ test_setting_vpn_update_secrets (void)
 	        "vpn-update-secrets",
 	        "error creating connection");
 
-	s_vpn = (NMSettingVPN *) nm_setting_vpn_new ();
+	s_vpn = (NMSettingVpn *) nm_setting_vpn_new ();
 	ASSERT (s_vpn != NULL,
 	        "vpn-update-secrets",
 	        "error creating vpn setting");
@@ -240,7 +240,7 @@ test_setting_vpn_update_secrets (void)
 
 #define TO_DEL_NUM 50
 typedef struct {
-	NMSettingVPN *s_vpn;
+	NMSettingVpn *s_vpn;
 	char *to_del[TO_DEL_NUM];
 	guint called;
 } IterInfo;
@@ -267,12 +267,12 @@ del_iter_func (const char *key, const char *value, gpointer user_data)
 static void
 test_setting_vpn_modify_during_foreach (void)
 {
-	NMSettingVPN *s_vpn;
+	NMSettingVpn *s_vpn;
 	IterInfo info;
 	char *key, *val;
 	int i, u = 0;
 
-	s_vpn = (NMSettingVPN *) nm_setting_vpn_new ();
+	s_vpn = (NMSettingVpn *) nm_setting_vpn_new ();
 	g_assert (s_vpn);
 
 	for (i = 0; i < TO_DEL_NUM * 2; i++) {
@@ -2291,7 +2291,7 @@ test_setting_vpn_changed_signal (void)
 {
 	NMConnection *connection;
 	gboolean changed = FALSE;
-	NMSettingVPN *s_vpn;
+	NMSettingVpn *s_vpn;
 
 	connection = nm_connection_new ();
 	g_signal_connect (connection,
@@ -2299,7 +2299,7 @@ test_setting_vpn_changed_signal (void)
 	                  (GCallback) test_connection_changed_cb,
 	                  &changed);
 
-	s_vpn = (NMSettingVPN *) nm_setting_vpn_new ();
+	s_vpn = (NMSettingVpn *) nm_setting_vpn_new ();
 	nm_connection_add_setting (connection, NM_SETTING (s_vpn));
 
 	ASSERT_CHANGED (nm_setting_vpn_add_data_item (s_vpn, "foobar", "baz"));