diff --git a/etc/dict.lua b/etc/dict.lua
index 716b8db..cedbcde 100644
--- a/etc/dict.lua
+++ b/etc/dict.lua
@@ -15,7 +15,7 @@ local socket = require("socket")
 local url = require("socket.url")
 local tp = require("socket.tp")
 
-local dict = module("socket.dict")
+module("socket.dict")
 
 -----------------------------------------------------------------------------
 -- Globals 
@@ -151,4 +151,4 @@ get = socket.protect(function(gett)
     else return tget(gett) end
 end)
 
-base.setmetatable(dict, nil)
+base.getmetatable(_M).__index = nil
diff --git a/etc/lp.lua b/etc/lp.lua
index a5327d1..801e5ed 100644
--- a/etc/lp.lua
+++ b/etc/lp.lua
@@ -14,7 +14,7 @@ local base = require("base")
 local string = require("string")
 local socket = require("socket")
 local ltn12 = require("ltn12")
-local lp = module("socket.lp")
+module("socket.lp")
 
 -- default port
 PORT = 515
@@ -318,4 +318,4 @@ query = socket.protect(function(p)
   return data
 end)
 
-base.setmetatable(lp, nil)
+base.getmetatable(_M).__index = nil
diff --git a/etc/tftp.lua b/etc/tftp.lua
index 83a08b9..a8158e2 100644
--- a/etc/tftp.lua
+++ b/etc/tftp.lua
@@ -15,7 +15,7 @@ local string = require("string")
 local socket = require("socket")
 local ltn12 = require("ltn12")
 local url = require("socket.url")
-local tftp = module("socket.tftp")
+module("socket.tftp")
 
 -----------------------------------------------------------------------------
 -- Program constants
@@ -153,4 +153,4 @@ get = socket.protect(function(gett)
     else return tget(gett) end
 end)
 
-base.setmetatable(tftp, nil)
+base.getmetatable(_M).__index = nil
diff --git a/src/ftp.lua b/src/ftp.lua
index 4529acd..c3292c2 100644
--- a/src/ftp.lua
+++ b/src/ftp.lua
@@ -16,7 +16,7 @@ local socket = require("socket")
 local url = require("socket.url")
 local tp = require("socket.tp")
 local ltn12 = require("ltn12")
-local ftp = module("socket.ftp")
+module("socket.ftp")
 
 -----------------------------------------------------------------------------
 -- Program constants
@@ -278,4 +278,4 @@ get = socket.protect(function(gett)
     else return tget(gett) end
 end)
 
-base.setmetatable(ftp, nil)
+base.getmetatable(_M).__index = nil
diff --git a/src/http.lua b/src/http.lua
index 87a9d9a..cdaac33 100644
--- a/src/http.lua
+++ b/src/http.lua
@@ -15,7 +15,7 @@ local mime = require("mime")
 local string = require("string")
 local base = require("base")
 local table = require("table")
-local http = module("socket.http")
+module("socket.http")
 
 -----------------------------------------------------------------------------
 -- Program constants
@@ -259,4 +259,4 @@ request = socket.protect(function(reqt, body)
     else return trequest(reqt) end
 end)
 
-base.setmetatable(http, nil)
+base.getmetatable(_M).__index = nil
diff --git a/src/ltn12.lua b/src/ltn12.lua
index 1a13a43..b876ecc 100644
--- a/src/ltn12.lua
+++ b/src/ltn12.lua
@@ -12,7 +12,7 @@ local string = require("string")
 local table = require("table")
 local base = require("base")
 local coroutine = require("coroutine")
-local ltn12 = module("ltn12")
+module("ltn12")
 
 filter = {}
 source = {}
@@ -276,4 +276,4 @@ function pump.all(src, snk, step)
     end
 end
 
-base.setmetatable(ltn12, nil)
+base.getmetatable(_M).__index = nil
diff --git a/src/mime.lua b/src/mime.lua
index 42d0b3c..62c23bb 100644
--- a/src/mime.lua
+++ b/src/mime.lua
@@ -85,4 +85,4 @@ function mime.stuff()
     return ltn12.filter.cycle(dot, 2)
 end
 
-base.setmetatable(mime, nil)
+base.getmetatable(_M).__index = nil
diff --git a/src/smtp.lua b/src/smtp.lua
index 9d49178..c3924a1 100644
--- a/src/smtp.lua
+++ b/src/smtp.lua
@@ -17,7 +17,7 @@ local socket = require("socket")
 local tp = require("socket.tp")
 local ltn12 = require("ltn12")
 local mime = require("mime")
-local smtp = module("socket.smtp")
+module("socket.smtp")
 
 -----------------------------------------------------------------------------
 -- Program constants
@@ -245,4 +245,4 @@ send = socket.protect(function(mailt)
     return s:close()
 end)
 
-base.setmetatable(smtp, nil)
+base.getmetatable(_M).__index = nil
diff --git a/src/socket.lua b/src/socket.lua
index c3bbba9..53cae60 100644
--- a/src/socket.lua
+++ b/src/socket.lua
@@ -172,4 +172,4 @@ socket.sourcet["default"] = socket.sourcet["until-closed"]
 
 socket.source = socket.choose(socket.sourcet)
 
-base.setmetatable(socket, nil)
+base.getmetatable(_M).__index = nil
diff --git a/src/tp.lua b/src/tp.lua
index 0a671fb..e70831a 100644
--- a/src/tp.lua
+++ b/src/tp.lua
@@ -12,8 +12,7 @@ local base = require("base")
 local string = require("string")
 local socket = require("socket")
 local ltn12 = require("ltn12")
-
-local tp = module("socket.tp")
+module("socket.tp")
 
 -----------------------------------------------------------------------------
 -- Program constants
@@ -121,4 +120,4 @@ function connect(host, port, timeout)
     return base.setmetatable({c = c}, metat)
 end
 
-base.setmetatable(tp, nil)
+base.getmetatable(_M).__index
diff --git a/src/url.lua b/src/url.lua
index 08081f0..7f2c756 100644
--- a/src/url.lua
+++ b/src/url.lua
@@ -11,7 +11,7 @@
 local string = require("string")
 local base = require("base")
 local table = require("table")
-local url = module("socket.url")
+module("socket.url")
 
 -----------------------------------------------------------------------------
 -- Encodes a string into its escaped hexadecimal representation
@@ -273,4 +273,4 @@ function build_path(parsed, unsafe)
 	return path
 end
 
-base.setmetatable(url, nil)
+base.getmetatable(_M).__index = nil