diff --git a/net/ipv6/Makefile b/net/ipv6/Makefile
index 81969479955f68e66d2a5408382d0f72c19c1de6..107051f7c2273d53d04f18c1a0fea95f7343f08f 100644
--- a/net/ipv6/Makefile
+++ b/net/ipv6/Makefile
@@ -6,7 +6,7 @@ obj-$(CONFIG_IPV6) += ipv6.o
 
 ipv6-objs :=	af_inet6.o anycast.o ip6_output.o ip6_input.o addrconf.o \
 		addrlabel.o \
-		route.o ip6_fib.o ipv6_sockglue.o ndisc.o udp.o \
+		route.o ip6_fib.o ipv6_sockglue.o ndisc.o udp_ipv6.o \
 		raw.o protocol.o icmp.o mcast.o reassembly.o tcp_ipv6.o \
 		exthdrs.o datagram.o ip6_flowlabel.o inet6_connection_sock.o
 
@@ -17,7 +17,7 @@ ipv6-$(CONFIG_NETFILTER) += netfilter.o
 ipv6-$(CONFIG_IPV6_MULTIPLE_TABLES) += fib6_rules.o
 ipv6-$(CONFIG_PROC_FS) += proc.o
 ipv6-$(CONFIG_SYN_COOKIES) += syncookies.o
-ipv6-$(CONFIG_IP_UDPLITE) += udplite.o
+ipv6-$(CONFIG_IP_UDPLITE) += udplite_ipv6.o
 
 ipv6-objs += $(ipv6-y)
 
diff --git a/net/ipv6/udp.c b/net/ipv6/udp_ipv6.c
similarity index 100%
rename from net/ipv6/udp.c
rename to net/ipv6/udp_ipv6.c
diff --git a/net/ipv6/udplite.c b/net/ipv6/udplite_ipv6.c
similarity index 100%
rename from net/ipv6/udplite.c
rename to net/ipv6/udplite_ipv6.c