diff --git a/src/connection.c b/src/connection.c
index a6ec3c7ab5fa..78fb126194c8 100644
--- a/src/connection.c
+++ b/src/connection.c
@@ -189,7 +189,8 @@ static void gateway_data_debug(const char *function,
 	}
 }
 
-static struct gateway_config *find_gateway(int index, const char *gateway)
+static struct gateway_config *find_gateway_config(int index,
+				const char *gateway)
 {
 	GHashTableIter iter;
 	gpointer value, key;
@@ -216,7 +217,7 @@ static struct gateway_config *find_gateway(int index, const char *gateway)
 	return NULL;
 }
 
-static struct gateway_data *lookup_gateway_data(
+static struct gateway_data *find_gateway_data(
 				const struct gateway_config *config)
 {
 	GHashTableIter iter;
@@ -242,7 +243,7 @@ static struct gateway_data *lookup_gateway_data(
 	return NULL;
 }
 
-static struct gateway_data *find_active_gateway(void)
+static struct gateway_data *find_active_gateway_data(void)
 {
 	GHashTableIter iter;
 	gpointer value, key;
@@ -266,7 +267,7 @@ static struct gateway_data *find_active_gateway(void)
 	return NULL;
 }
 
-static struct gateway_data *find_default_gateway(void)
+static struct gateway_data *find_default_gateway_data(void)
 {
 	struct connman_service *service;
 
@@ -277,7 +278,8 @@ static struct gateway_data *find_default_gateway(void)
 	return g_hash_table_lookup(gateway_hash, service);
 }
 
-static struct gateway_data *find_vpn_gateway(int index, const char *gateway)
+static struct gateway_data *find_vpn_gateway_data(int index,
+				const char *gateway)
 {
 	GHashTableIter iter;
 	gpointer value, key;
@@ -322,7 +324,7 @@ static void get_gateway_cb(const char *gateway, int index, void *user_data)
 	DBG("phy index %d phy gw %s vpn index %d vpn gw %s", index, gateway,
 		params->vpn_index, params->vpn_gateway);
 
-	data = find_vpn_gateway(params->vpn_index, params->vpn_gateway);
+	data = find_vpn_gateway_data(params->vpn_index, params->vpn_gateway);
 	if (!data) {
 		DBG("Cannot find VPN link route, index %d addr %s",
 			params->vpn_index, params->vpn_gateway);
@@ -844,7 +846,7 @@ static void connection_newgateway(int index, const char *gateway)
 	 * gateway, or default router, route we added or
 	 * set. Consequently, ignore it and return.
 	 */
-	config = find_gateway(index, gateway);
+	config = find_gateway_config(index, gateway);
 	if (!config)
 		return;
 
@@ -863,7 +865,7 @@ static void connection_newgateway(int index, const char *gateway)
 	 * if there are two gateways waiting rtnl activation at the
 	 * same time.
 	 */
-	data = lookup_gateway_data(config);
+	data = find_gateway_data(config);
 	if (!data)
 		return;
 
@@ -966,7 +968,7 @@ static void connection_delgateway(int index, const char *gateway)
 	 * This ends the lifecycle of the gateway associated with the
 	 * newly-removed route; mark it as no longer active.
 	 */
-	config = find_gateway(index, gateway);
+	config = find_gateway_config(index, gateway);
 	if (config) {
 		GATEWAY_CONFIG_DBG("config", config);
 
@@ -979,7 +981,7 @@ static void connection_delgateway(int index, const char *gateway)
 	 * default service, if any. If so, ensure that service acquires
 	 * the high priority default route.
 	 */
-	data = find_default_gateway();
+	data = find_default_gateway_data();
 	if (data) {
 		GATEWAY_DATA_DBG("data", data);
 
@@ -1122,7 +1124,7 @@ int __connman_connection_gateway_add(struct connman_service *service,
 
 	GATEWAY_DATA_DBG("new_gateway", new_gateway);
 
-	active_gateway = find_active_gateway();
+	active_gateway = find_active_gateway_data();
 
 	DBG("active %p index %d new %p", active_gateway,
 		active_gateway ? active_gateway->index : -1, new_gateway);
@@ -1312,7 +1314,7 @@ void __connman_connection_gateway_remove(struct connman_service *service,
 	 * We hit the same issue if remove_gateway() fails.
 	 */
 	if (set_default4 || set_default6 || err < 0) {
-		data = find_default_gateway();
+		data = find_default_gateway_data();
 
 		GATEWAY_DATA_DBG("default_data", data);
 
@@ -1355,7 +1357,7 @@ bool __connman_connection_update_gateway(void)
 	if (!gateway_hash)
 		return updated;
 
-	default_gateway = find_default_gateway();
+	default_gateway = find_default_gateway_data();
 
 	DBG("default_gateway %p", default_gateway);
 
