diff --git a/headers/private/net/net_device.h b/headers/private/net/net_device.h
index 3a33b9dc07..5345210780 100644
--- a/headers/private/net/net_device.h
+++ b/headers/private/net/net_device.h
@@ -55,8 +55,10 @@ struct net_device_module_info {
 	status_t	(*set_promiscuous)(struct net_device *device, bool promiscuous);
 	status_t	(*set_media)(struct net_device *device, uint32 media);
 
-	status_t	(*add_multi)(struct net_device *device, const sockaddr *);
-	status_t	(*rem_multi)(struct net_device *device, const sockaddr *);
+	status_t	(*add_multicast)(struct net_device *device,
+					const sockaddr *address);
+	status_t	(*remove_multicast)(struct net_device *device,
+					const sockaddr *address);
 };
 
 #endif	// NET_DEVICE_H
diff --git a/src/add-ons/kernel/network/devices/ethernet/ethernet.cpp b/src/add-ons/kernel/network/devices/ethernet/ethernet.cpp
index f1d6b8d8c2..a7dc20d187 100644
--- a/src/add-ons/kernel/network/devices/ethernet/ethernet.cpp
+++ b/src/add-ons/kernel/network/devices/ethernet/ethernet.cpp
@@ -380,7 +380,7 @@ ethernet_set_media(net_device *device, uint32 media)
 
 
 status_t
-ethernet_add_multi(struct net_device *_device, const sockaddr *_address)
+ethernet_add_multicast(struct net_device *_device, const sockaddr *_address)
 {
 	ethernet_device *device = (ethernet_device *)_device;
 
@@ -396,7 +396,7 @@ ethernet_add_multi(struct net_device *_device, const sockaddr *_address)
 
 
 status_t
-ethernet_rem_multi(struct net_device *_device, const sockaddr *_address)
+ethernet_remove_multicast(struct net_device *_device, const sockaddr *_address)
 {
 	ethernet_device *device = (ethernet_device *)_device;
 
@@ -477,8 +477,8 @@ net_device_module_info sEthernetModule = {
 	ethernet_set_mtu,
 	ethernet_set_promiscuous,
 	ethernet_set_media,
-	ethernet_add_multi,
-	ethernet_rem_multi,
+	ethernet_add_multicast,
+	ethernet_remove_multicast,
 };
 
 module_info *modules[] = {
diff --git a/src/add-ons/kernel/network/devices/loopback/loopback.cpp b/src/add-ons/kernel/network/devices/loopback/loopback.cpp
index 2d8be72143..349483cbe3 100644
--- a/src/add-ons/kernel/network/devices/loopback/loopback.cpp
+++ b/src/add-ons/kernel/network/devices/loopback/loopback.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006, Haiku, Inc. All Rights Reserved.
+ * Copyright 2006-2007, Haiku, Inc. All Rights Reserved.
  * Distributed under the terms of the MIT License.
  *
  * Authors:
@@ -193,14 +193,14 @@ loopback_set_media(net_device *device, uint32 media)
 
 
 status_t
-loopback_add_multi(net_device *device, const sockaddr *address)
+loopback_add_multicast(net_device *device, const sockaddr *address)
 {
 	return B_OK;
 }
 
 
 status_t
-loopback_rem_multi(net_device *device, const sockaddr *address)
+loopback_remove_multicast(net_device *device, const sockaddr *address)
 {
 	return B_OK;
 }
@@ -236,8 +236,8 @@ net_device_module_info sLoopbackModule = {
 	loopback_set_mtu,
 	loopback_set_promiscuous,
 	loopback_set_media,
-	loopback_add_multi,
-	loopback_rem_multi,
+	loopback_add_multicast,
+	loopback_remove_multicast,
 };
 
 module_info *modules[] = {
diff --git a/src/add-ons/kernel/network/stack/datalink.cpp b/src/add-ons/kernel/network/stack/datalink.cpp
index 3592e1a91c..e9c1ff8e7a 100644
--- a/src/add-ons/kernel/network/stack/datalink.cpp
+++ b/src/add-ons/kernel/network/stack/datalink.cpp
@@ -4,6 +4,7 @@
  *
  * Authors:
  *		Axel Dörfler, axeld@pinc-software.de
+ *		Hugo Santos, hugosantos@gmail.com
  */
 
 
@@ -804,7 +805,8 @@ interface_protocol_join_multicast(net_datalink_protocol *_protocol,
 	const sockaddr *address)
 {
 	interface_protocol *protocol = (interface_protocol *)_protocol;
-	return protocol->device_module->add_multi(protocol->device, address);
+
+	return protocol->device_module->add_multicast(protocol->device, address);
 }
 
 
@@ -813,7 +815,9 @@ interface_protocol_leave_multicast(net_datalink_protocol *_protocol,
 	const sockaddr *address)
 {
 	interface_protocol *protocol = (interface_protocol *)_protocol;
-	return protocol->device_module->rem_multi(protocol->device, address);
+
+	return protocol->device_module->remove_multicast(protocol->device,
+		address);
 }