diff --git a/Makefile b/Makefile
index 53136be21..681fe3954 100644
--- a/Makefile
+++ b/Makefile
@@ -816,7 +816,7 @@ OBJS = src/mux_fcgi.o src/mux_h1.o src/mux_h2.o src/backend.o                 \
        src/buffer.o src/uri_auth.o src/protocol.o src/auth.o                  \
        src/ebsttree.o src/pipe.o src/hpack-enc.o src/fcgi.o                   \
        src/eb64tree.o src/dict.o src/shctx.o src/ebimtree.o                   \
-       src/eb32tree.o src/ebtree.o src/proto_udp.o                            \
+       src/eb32tree.o src/ebtree.o src/dgram.o                                \
        src/hpack-huff.o src/base64.o src/version.o
 
 ifneq ($(TRACE),)
diff --git a/include/haproxy/proto_udp-t.h b/include/haproxy/dgram-t.h
similarity index 88%
rename from include/haproxy/proto_udp-t.h
rename to include/haproxy/dgram-t.h
index 04f8708b5..1a6f4c83a 100644
--- a/include/haproxy/proto_udp-t.h
+++ b/include/haproxy/dgram-t.h
@@ -1,6 +1,6 @@
 /*
- * include/haproxy/proto_udp-t.h
- * This file provides structures and types for UDP protocol.
+ * include/haproxy/dgram-t.h
+ * This file provides structures and types for datagram processing
  *
  * Copyright (C) 2014 Baptiste Assmann <bedis9@gmail.com>
  *
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef _HAPROXY_HAPROXY_UDP_T_H
-#define _HAPROXY_HAPROXY_UDP_T_H
+#ifndef _HAPROXY_HAPROXY_DGRAM_T_H
+#define _HAPROXY_HAPROXY_DGRAM_T_H
 
 #include <arpa/inet.h>
 
@@ -49,4 +49,4 @@ struct dgram_data_cb {
 	void (*send)(struct dgram_conn *dgram); /* send callback */
 };
 
-#endif /* _HAPROXY_HAPROXY_UDP_T_H */
+#endif /* _HAPROXY_HAPROXY_DGRAM_T_H */
diff --git a/include/haproxy/proto_udp.h b/include/haproxy/dgram.h
similarity index 78%
rename from include/haproxy/proto_udp.h
rename to include/haproxy/dgram.h
index 9f7178c19..92d00ab11 100644
--- a/include/haproxy/proto_udp.h
+++ b/include/haproxy/dgram.h
@@ -1,6 +1,6 @@
 /*
- * include/haproxy/proto_udp.h
- * This file provides functions related to UDP protocol.
+ * include/haproxy/proto_dgram.h
+ * This file provides functions related to DGRAM processing.
  *
  * Copyright (C) 2014 Baptiste Assmann <bedis9@gmail.com>
  *
@@ -19,9 +19,11 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef _HAPROXY_PROTO_UDP_H
-#define _HAPROXY_PROTO_UDP_H
+#ifndef _HAPROXY_PROTO_DGRAM_H
+#define _HAPROXY_PROTO_DGRAM_H
+
+#include <haproxy/dgram-t.h>
 
 void dgram_fd_handler(int);
 
-#endif // _HAPROXY_PROTO_UDP_H
+#endif // _HAPROXY_PROTO_DGRAM_H
diff --git a/include/haproxy/dns-t.h b/include/haproxy/dns-t.h
index 9ba60012c..b1b43976c 100644
--- a/include/haproxy/dns-t.h
+++ b/include/haproxy/dns-t.h
@@ -25,8 +25,8 @@
 #include <import/eb32tree.h>
 
 #include <haproxy/connection-t.h>
+#include <haproxy/dgram-t.h>
 #include <haproxy/obj_type-t.h>
-#include <haproxy/proto_udp-t.h>
 #include <haproxy/task-t.h>
 #include <haproxy/thread.h>
 
diff --git a/src/check.c b/src/check.c
index 1a9938d64..18f83fa1b 100644
--- a/src/check.c
+++ b/src/check.c
@@ -35,6 +35,7 @@
 #include <haproxy/cfgparse.h>
 #include <haproxy/check.h>
 #include <haproxy/chunk.h>
+#include <haproxy/dgram.h>
 #include <haproxy/dns.h>
 #include <haproxy/extcheck.h>
 #include <haproxy/fd.h>
@@ -49,7 +50,6 @@
 #include <haproxy/mailers.h>
 #include <haproxy/port_range.h>
 #include <haproxy/proto_tcp.h>
-#include <haproxy/proto_udp.h>
 #include <haproxy/protocol.h>
 #include <haproxy/proxy.h>
 #include <haproxy/queue.h>
diff --git a/src/proto_udp.c b/src/dgram.c
similarity index 90%
rename from src/proto_udp.c
rename to src/dgram.c
index f5202f816..54823d157 100644
--- a/src/proto_udp.c
+++ b/src/dgram.c
@@ -1,5 +1,5 @@
 /*
- * UDP protocol related functions
+ * Datagram processing functions
  *
  * Copyright 2014 Baptiste Assmann <bedis9@gmail.com>
  *
@@ -11,7 +11,7 @@
  */
 
 #include <haproxy/fd.h>
-#include <haproxy/proto_udp-t.h>
+#include <haproxy/dgram.h>
 
 /* datagram handler callback */
 void dgram_fd_handler(int fd)
diff --git a/src/dns.c b/src/dns.c
index 55b5a3716..6f951ab5a 100644
--- a/src/dns.c
+++ b/src/dns.c
@@ -25,6 +25,7 @@
 #include <haproxy/channel.h>
 #include <haproxy/check.h>
 #include <haproxy/cli.h>
+#include <haproxy/dgram.h>
 #include <haproxy/dns.h>
 #include <haproxy/errors.h>
 #include <haproxy/fd.h>
@@ -32,7 +33,6 @@
 #include <haproxy/http_rules.h>
 #include <haproxy/log.h>
 #include <haproxy/net_helper.h>
-#include <haproxy/proto_udp.h>
 #include <haproxy/proxy.h>
 #include <haproxy/sample.h>
 #include <haproxy/server.h>
diff --git a/src/tools.c b/src/tools.c
index 0b7e77e75..35936b558 100644
--- a/src/tools.c
+++ b/src/tools.c
@@ -41,12 +41,12 @@
 
 #include <haproxy/api.h>
 #include <haproxy/chunk.h>
+#include <haproxy/dgram.h>
 #include <haproxy/dns.h>
 #include <haproxy/global.h>
 #include <haproxy/hlua.h>
 #include <haproxy/listener.h>
 #include <haproxy/namespace.h>
-#include <haproxy/proto_udp.h>
 #include <haproxy/ssl_sock.h>
 #include <haproxy/stream_interface.h>
 #include <haproxy/task.h>