diff --git a/src/buffer.c b/src/buffer.c
index fff1634..592ca47 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -14,8 +14,8 @@
 static int recvraw(p_buffer buf, size_t wanted, luaL_Buffer *b);
 static int recvline(p_buffer buf, luaL_Buffer *b);
 static int recvall(p_buffer buf, luaL_Buffer *b);
-static int buffer_get(p_buffer buf, const char **data, size_t *count);
-static void buffer_skip(p_buffer buf, size_t count);
+static int luasocket_buffer_get(p_buffer buf, const char **data, size_t *count);
+static void luasocket_buffer_skip(p_buffer buf, size_t count);
 static int sendraw(p_buffer buf, const char *data, size_t count, size_t *sent);
 
 /* min and max macros */
@@ -32,7 +32,7 @@ static int sendraw(p_buffer buf, const char *data, size_t count, size_t *sent);
 /*-------------------------------------------------------------------------*\
 * Initializes module
 \*-------------------------------------------------------------------------*/
-int buffer_open(lua_State *L) {
+int luasocket_buffer_open(lua_State *L) {
     (void) L;
     return 0;
 }
@@ -40,7 +40,7 @@ int buffer_open(lua_State *L) {
 /*-------------------------------------------------------------------------*\
 * Initializes C structure
 \*-------------------------------------------------------------------------*/
-void buffer_init(p_buffer buf, p_io io, p_timeout tm) {
+void luasocket_buffer_init(p_buffer buf, p_io io, p_timeout tm) {
     buf->first = buf->last = 0;
     buf->io = io;
     buf->tm = tm;
@@ -51,7 +51,7 @@ void buffer_init(p_buffer buf, p_io io, p_timeout tm) {
 /*-------------------------------------------------------------------------*\
 * object:getstats() interface
 \*-------------------------------------------------------------------------*/
-int buffer_meth_getstats(lua_State *L, p_buffer buf) {
+int luasocket_buffer_meth_getstats(lua_State *L, p_buffer buf) {
     lua_pushnumber(L, (lua_Number) buf->received);
     lua_pushnumber(L, (lua_Number) buf->sent);
     lua_pushnumber(L, timeout_gettime() - buf->birthday);
@@ -61,7 +61,7 @@ int buffer_meth_getstats(lua_State *L, p_buffer buf) {
 /*-------------------------------------------------------------------------*\
 * object:setstats() interface
 \*-------------------------------------------------------------------------*/
-int buffer_meth_setstats(lua_State *L, p_buffer buf) {
+int luasocket_buffer_meth_setstats(lua_State *L, p_buffer buf) {
     buf->received = (long) luaL_optnumber(L, 2, (lua_Number) buf->received);
     buf->sent = (long) luaL_optnumber(L, 3, (lua_Number) buf->sent);
     if (lua_isnumber(L, 4)) buf->birthday = timeout_gettime() - lua_tonumber(L, 4);
@@ -72,7 +72,7 @@ int buffer_meth_setstats(lua_State *L, p_buffer buf) {
 /*-------------------------------------------------------------------------*\
 * object:send() interface
 \*-------------------------------------------------------------------------*/
-int buffer_meth_send(lua_State *L, p_buffer buf) {
+int luasocket_buffer_meth_send(lua_State *L, p_buffer buf) {
     int top = lua_gettop(L);
     int err = IO_DONE;
     size_t size = 0, sent = 0;
@@ -105,7 +105,7 @@ int buffer_meth_send(lua_State *L, p_buffer buf) {
 /*-------------------------------------------------------------------------*\
 * object:receive() interface
 \*-------------------------------------------------------------------------*/
-int buffer_meth_receive(lua_State *L, p_buffer buf) {
+int luasocket_buffer_meth_receive(lua_State *L, p_buffer buf) {
     int err = IO_DONE, top = lua_gettop(L);
     luaL_Buffer b;
     size_t size;
@@ -154,7 +154,7 @@ int buffer_meth_receive(lua_State *L, p_buffer buf) {
 /*-------------------------------------------------------------------------*\
 * Determines if there is any data in the read buffer
 \*-------------------------------------------------------------------------*/
-int buffer_isempty(p_buffer buf) {
+int luasocket_buffer_isempty(p_buffer buf) {
     return buf->first >= buf->last;
 }
 
@@ -189,10 +189,10 @@ static int recvraw(p_buffer buf, size_t wanted, luaL_Buffer *b) {
     size_t total = 0;
     while (err == IO_DONE) {
         size_t count; const char *data;
-        err = buffer_get(buf, &data, &count);
+        err = luasocket_buffer_get(buf, &data, &count);
         count = MIN(count, wanted - total);
         luaL_addlstring(b, data, count);
-        buffer_skip(buf, count);
+        luasocket_buffer_skip(buf, count);
         total += count;
         if (total >= wanted) break;
     }
@@ -207,10 +207,10 @@ static int recvall(p_buffer buf, luaL_Buffer *b) {
     size_t total = 0;
     while (err == IO_DONE) {
         const char *data; size_t count;
-        err = buffer_get(buf, &data, &count);
+        err = luasocket_buffer_get(buf, &data, &count);
         total += count;
         luaL_addlstring(b, data, count);
-        buffer_skip(buf, count);
+        luasocket_buffer_skip(buf, count);
     }
     if (err == IO_CLOSED) {
         if (total > 0) return IO_DONE;
@@ -226,7 +226,7 @@ static int recvline(p_buffer buf, luaL_Buffer *b) {
     int err = IO_DONE;
     while (err == IO_DONE) {
         size_t count, pos; const char *data;
-        err = buffer_get(buf, &data, &count);
+        err = luasocket_buffer_get(buf, &data, &count);
         pos = 0;
         while (pos < count && data[pos] != '\n') {
             /* we ignore all \r's */
@@ -234,10 +234,10 @@ static int recvline(p_buffer buf, luaL_Buffer *b) {
             pos++;
         }
         if (pos < count) { /* found '\n' */
-            buffer_skip(buf, pos+1); /* skip '\n' too */
+            luasocket_buffer_skip(buf, pos+1); /* skip '\n' too */
             break; /* we are done */
         } else /* reached the end of the buffer */
-            buffer_skip(buf, pos);
+            luasocket_buffer_skip(buf, pos);
     }
     return err;
 }
@@ -246,10 +246,10 @@ static int recvline(p_buffer buf, luaL_Buffer *b) {
 * Skips a given number of bytes from read buffer. No data is read from the
 * transport layer
 \*-------------------------------------------------------------------------*/
-static void buffer_skip(p_buffer buf, size_t count) {
+static void luasocket_buffer_skip(p_buffer buf, size_t count) {
     buf->received += count;
     buf->first += count;
-    if (buffer_isempty(buf))
+    if (luasocket_buffer_isempty(buf))
         buf->first = buf->last = 0;
 }
 
@@ -257,11 +257,11 @@ static void buffer_skip(p_buffer buf, size_t count) {
 * Return any data available in buffer, or get more data from transport layer
 * if buffer is empty
 \*-------------------------------------------------------------------------*/
-static int buffer_get(p_buffer buf, const char **data, size_t *count) {
+static int luasocket_buffer_get(p_buffer buf, const char **data, size_t *count) {
     int err = IO_DONE;
     p_io io = buf->io;
     p_timeout tm = buf->tm;
-    if (buffer_isempty(buf)) {
+    if (luasocket_buffer_isempty(buf)) {
         size_t got;
         err = io->recv(io->ctx, buf->data, BUF_SIZE, &got, tm);
         buf->first = 0;
diff --git a/src/buffer.h b/src/buffer.h
index 1281bb3..142f876 100644
--- a/src/buffer.h
+++ b/src/buffer.h
@@ -34,12 +34,12 @@ typedef struct t_buffer_ {
 } t_buffer;
 typedef t_buffer *p_buffer;
 
-int buffer_open(lua_State *L);
-void buffer_init(p_buffer buf, p_io io, p_timeout tm);
-int buffer_meth_send(lua_State *L, p_buffer buf);
-int buffer_meth_receive(lua_State *L, p_buffer buf);
-int buffer_meth_getstats(lua_State *L, p_buffer buf);
-int buffer_meth_setstats(lua_State *L, p_buffer buf);
-int buffer_isempty(p_buffer buf);
+int luasocket_buffer_open(lua_State *L);
+void luasocket_buffer_init(p_buffer buf, p_io io, p_timeout tm);
+int luasocket_buffer_meth_send(lua_State *L, p_buffer buf);
+int luasocket_buffer_meth_receive(lua_State *L, p_buffer buf);
+int luasocket_buffer_meth_getstats(lua_State *L, p_buffer buf);
+int luasocket_buffer_meth_setstats(lua_State *L, p_buffer buf);
+int luasocket_buffer_isempty(p_buffer buf);
 
 #endif /* BUF_H */
diff --git a/src/luasocket.c b/src/luasocket.c
index d2752a7..512bb35 100755
--- a/src/luasocket.c
+++ b/src/luasocket.c
@@ -46,7 +46,7 @@ static const luaL_Reg mod[] = {
     {"auxiliar", auxiliar_open},
     {"except", except_open},
     {"timeout", timeout_open},
-    {"buffer", buffer_open},
+    {"buffer", luasocket_buffer_open},
     {"inet", inet_open},
     {"tcp", tcp_open},
     {"udp", udp_open},
diff --git a/src/serial.c b/src/serial.c
index 7bdb21c..8637f99 100644
--- a/src/serial.c
+++ b/src/serial.c
@@ -74,22 +74,22 @@ LUASOCKET_API int luaopen_socket_serial(lua_State *L) {
 \*-------------------------------------------------------------------------*/
 static int meth_send(lua_State *L) {
     p_unix un = (p_unix) auxiliar_checkclass(L, "serial{client}", 1);
-    return buffer_meth_send(L, &un->buf);
+    return luasocket_buffer_meth_send(L, &un->buf);
 }
 
 static int meth_receive(lua_State *L) {
     p_unix un = (p_unix) auxiliar_checkclass(L, "serial{client}", 1);
-    return buffer_meth_receive(L, &un->buf);
+    return luasocket_buffer_meth_receive(L, &un->buf);
 }
 
 static int meth_getstats(lua_State *L) {
     p_unix un = (p_unix) auxiliar_checkclass(L, "serial{client}", 1);
-    return buffer_meth_getstats(L, &un->buf);
+    return luasocket_buffer_meth_getstats(L, &un->buf);
 }
 
 static int meth_setstats(lua_State *L) {
     p_unix un = (p_unix) auxiliar_checkclass(L, "serial{client}", 1);
-    return buffer_meth_setstats(L, &un->buf);
+    return luasocket_buffer_meth_setstats(L, &un->buf);
 }
 
 /*-------------------------------------------------------------------------*\
@@ -110,7 +110,7 @@ static int meth_setfd(lua_State *L) {
 
 static int meth_dirty(lua_State *L) {
     p_unix un = (p_unix) auxiliar_checkgroup(L, "serial{any}", 1);
-    lua_pushboolean(L, !buffer_isempty(&un->buf));
+    lua_pushboolean(L, !luasocket_buffer_isempty(&un->buf));
     return 1;
 }
 
@@ -167,6 +167,6 @@ static int global_create(lua_State *L) {
     io_init(&un->io, (p_send) socket_write, (p_recv) socket_read,
             (p_error) socket_ioerror, &un->sock);
     timeout_init(&un->tm, -1, -1);
-    buffer_init(&un->buf, &un->io, &un->tm);
+    luasocket_buffer_init(&un->buf, &un->io, &un->tm);
     return 1;
 }
diff --git a/src/tcp.c b/src/tcp.c
index ef9ee6f..e00adbb 100644
--- a/src/tcp.c
+++ b/src/tcp.c
@@ -127,22 +127,22 @@ int tcp_open(lua_State *L)
 \*-------------------------------------------------------------------------*/
 static int meth_send(lua_State *L) {
     p_tcp tcp = (p_tcp) auxiliar_checkclass(L, "tcp{client}", 1);
-    return buffer_meth_send(L, &tcp->buf);
+    return luasocket_buffer_meth_send(L, &tcp->buf);
 }
 
 static int meth_receive(lua_State *L) {
     p_tcp tcp = (p_tcp) auxiliar_checkclass(L, "tcp{client}", 1);
-    return buffer_meth_receive(L, &tcp->buf);
+    return luasocket_buffer_meth_receive(L, &tcp->buf);
 }
 
 static int meth_getstats(lua_State *L) {
     p_tcp tcp = (p_tcp) auxiliar_checkclass(L, "tcp{client}", 1);
-    return buffer_meth_getstats(L, &tcp->buf);
+    return luasocket_buffer_meth_getstats(L, &tcp->buf);
 }
 
 static int meth_setstats(lua_State *L) {
     p_tcp tcp = (p_tcp) auxiliar_checkclass(L, "tcp{client}", 1);
-    return buffer_meth_setstats(L, &tcp->buf);
+    return luasocket_buffer_meth_setstats(L, &tcp->buf);
 }
 
 /*-------------------------------------------------------------------------*\
@@ -181,7 +181,7 @@ static int meth_setfd(lua_State *L)
 static int meth_dirty(lua_State *L)
 {
     p_tcp tcp = (p_tcp) auxiliar_checkgroup(L, "tcp{any}", 1);
-    lua_pushboolean(L, !buffer_isempty(&tcp->buf));
+    lua_pushboolean(L, !luasocket_buffer_isempty(&tcp->buf));
     return 1;
 }
 
@@ -206,7 +206,7 @@ static int meth_accept(lua_State *L)
         io_init(&clnt->io, (p_send) socket_send, (p_recv) socket_recv,
                 (p_error) socket_ioerror, &clnt->sock);
         timeout_init(&clnt->tm, -1, -1);
-        buffer_init(&clnt->buf, &clnt->io, &clnt->tm);
+        luasocket_buffer_init(&clnt->buf, &clnt->io, &clnt->tm);
         clnt->family = server->family;
         return 1;
     } else {
@@ -377,7 +377,7 @@ static int tcp_create(lua_State *L, int family) {
     io_init(&tcp->io, (p_send) socket_send, (p_recv) socket_recv,
             (p_error) socket_ioerror, &tcp->sock);
     timeout_init(&tcp->tm, -1, -1);
-    buffer_init(&tcp->buf, &tcp->io, &tcp->tm);
+    luasocket_buffer_init(&tcp->buf, &tcp->io, &tcp->tm);
     if (family != AF_UNSPEC) {
         const char *err = inet_trycreate(&tcp->sock, family, SOCK_STREAM, 0);
         if (err != NULL) {
@@ -416,7 +416,7 @@ static int global_connect(lua_State *L) {
     io_init(&tcp->io, (p_send) socket_send, (p_recv) socket_recv,
             (p_error) socket_ioerror, &tcp->sock);
     timeout_init(&tcp->tm, -1, -1);
-    buffer_init(&tcp->buf, &tcp->io, &tcp->tm);
+    luasocket_buffer_init(&tcp->buf, &tcp->io, &tcp->tm);
     tcp->sock = SOCKET_INVALID;
     tcp->family = AF_UNSPEC;
     /* allow user to pick local address and port */
diff --git a/src/unixdgram.c b/src/unixdgram.c
index 0d6f18c..dee86b9 100644
--- a/src/unixdgram.c
+++ b/src/unixdgram.c
@@ -395,7 +395,7 @@ static int global_create(lua_State *L)
         io_init(&un->io, (p_send) socket_send, (p_recv) socket_recv,
                 (p_error) socket_ioerror, &un->sock);
         timeout_init(&un->tm, -1, -1);
-        buffer_init(&un->buf, &un->io, &un->tm);
+        luasocket_buffer_init(&un->buf, &un->io, &un->tm);
         return 1;
     } else {
         lua_pushnil(L);
diff --git a/src/unixstream.c b/src/unixstream.c
index 0b9055c..a61ef23 100644
--- a/src/unixstream.c
+++ b/src/unixstream.c
@@ -104,22 +104,22 @@ int unixstream_open(lua_State *L)
 \*-------------------------------------------------------------------------*/
 static int meth_send(lua_State *L) {
     p_unix un = (p_unix) auxiliar_checkclass(L, "unixstream{client}", 1);
-    return buffer_meth_send(L, &un->buf);
+    return luasocket_buffer_meth_send(L, &un->buf);
 }
 
 static int meth_receive(lua_State *L) {
     p_unix un = (p_unix) auxiliar_checkclass(L, "unixstream{client}", 1);
-    return buffer_meth_receive(L, &un->buf);
+    return luasocket_buffer_meth_receive(L, &un->buf);
 }
 
 static int meth_getstats(lua_State *L) {
     p_unix un = (p_unix) auxiliar_checkclass(L, "unixstream{client}", 1);
-    return buffer_meth_getstats(L, &un->buf);
+    return luasocket_buffer_meth_getstats(L, &un->buf);
 }
 
 static int meth_setstats(lua_State *L) {
     p_unix un = (p_unix) auxiliar_checkclass(L, "unixstream{client}", 1);
-    return buffer_meth_setstats(L, &un->buf);
+    return luasocket_buffer_meth_setstats(L, &un->buf);
 }
 
 /*-------------------------------------------------------------------------*\
@@ -148,7 +148,7 @@ static int meth_setfd(lua_State *L) {
 
 static int meth_dirty(lua_State *L) {
     p_unix un = (p_unix) auxiliar_checkgroup(L, "unixstream{any}", 1);
-    lua_pushboolean(L, !buffer_isempty(&un->buf));
+    lua_pushboolean(L, !luasocket_buffer_isempty(&un->buf));
     return 1;
 }
 
@@ -171,7 +171,7 @@ static int meth_accept(lua_State *L) {
         io_init(&clnt->io, (p_send)socket_send, (p_recv)socket_recv,
                 (p_error) socket_ioerror, &clnt->sock);
         timeout_init(&clnt->tm, -1, -1);
-        buffer_init(&clnt->buf, &clnt->io, &clnt->tm);
+        luasocket_buffer_init(&clnt->buf, &clnt->io, &clnt->tm);
         return 1;
     } else {
         lua_pushnil(L);
@@ -347,7 +347,7 @@ static int global_create(lua_State *L) {
         io_init(&un->io, (p_send) socket_send, (p_recv) socket_recv,
                 (p_error) socket_ioerror, &un->sock);
         timeout_init(&un->tm, -1, -1);
-        buffer_init(&un->buf, &un->io, &un->tm);
+        luasocket_buffer_init(&un->buf, &un->io, &un->tm);
         return 1;
     } else {
         lua_pushnil(L);