diff --git a/nselib/base64.lua b/nselib/base64.lua
index d9812b25b..db28bb115 100644
--- a/nselib/base64.lua
+++ b/nselib/base64.lua
@@ -5,7 +5,7 @@
 -- author: Philip Pickering <pgpickering@gmail.com>
 -- thanks to Patrick Donnelly for some optimizations
 
-module(...,package.seeall)
+module(... or "base64",package.seeall)
 
 
 -- todo: make metatable/index --> '' for b64dctable
diff --git a/nselib/comm.lua b/nselib/comm.lua
index 4f6cf69c5..88725866c 100644
--- a/nselib/comm.lua
+++ b/nselib/comm.lua
@@ -1,6 +1,6 @@
 -- Kris Katterjohn 04/2008
 
-module(..., package.seeall)
+module(... or "comm", package.seeall)
 
 ------
 --
diff --git a/nselib/datafiles.lua b/nselib/datafiles.lua
index b45d0d59d..e94f0d6cf 100644
--- a/nselib/datafiles.lua
+++ b/nselib/datafiles.lua
@@ -1,6 +1,6 @@
 -- Kris Katterjohn 03/2008
 
-module(..., package.seeall)
+module(... or "datafiles", package.seeall)
 
 require 'stdnse'
 
diff --git a/nselib/http.lua b/nselib/http.lua
index 01f76426b..998b4cc59 100644
--- a/nselib/http.lua
+++ b/nselib/http.lua
@@ -1,5 +1,5 @@
 -- See nmaps COPYING for licence
-module(...,package.seeall)
+module(... or "http",package.seeall)
 
 require 'stdnse'
 require 'url'
diff --git a/nselib/ipOps.lua b/nselib/ipOps.lua
index a01e3580d..19cc2df06 100644
--- a/nselib/ipOps.lua
+++ b/nselib/ipOps.lua
@@ -1,5 +1,5 @@
 -- See nmaps COPYING for licence
-module(...,package.seeall)
+module(... or "ipOps",package.seeall)
 
 
 -- check to see if ip is part of RFC 1918 address space
diff --git a/nselib/listop.lua b/nselib/listop.lua
index f083eee41..b8ceac6b6 100644
--- a/nselib/listop.lua
+++ b/nselib/listop.lua
@@ -1,5 +1,5 @@
 -- See nmaps COPYING for licence
-module(..., package.seeall)
+module(... or "listop", package.seeall)
 
 --[[
 --
diff --git a/nselib/match.lua b/nselib/match.lua
index ba3a866ef..dbcf67174 100644
--- a/nselib/match.lua
+++ b/nselib/match.lua
@@ -1,5 +1,5 @@
 -- See nmaps COPYING for licence
-module(...,  package.seeall)
+module(... or "match",  package.seeall)
 require "pcre"
 
 --various functions for use with nse's nsock:receive_buf - function
diff --git a/nselib/packet.lua b/nselib/packet.lua
index d5d106a46..4add75ba2 100644
--- a/nselib/packet.lua
+++ b/nselib/packet.lua
@@ -1,5 +1,5 @@
 -- license = "See nmaps COPYING for license"
-module("packet" ,package.seeall)
+module(... or "packet" ,package.seeall)
 
 -- Raw package parsing functions. Used with raw sockets
 -- in nse.
diff --git a/nselib/pop3.lua b/nselib/pop3.lua
index c6ec6ad48..9c58d89e1 100644
--- a/nselib/pop3.lua
+++ b/nselib/pop3.lua
@@ -1,7 +1,7 @@
 --- POP3 functions
 --@copyright See nmaps COPYING for licence
 
-module(...,package.seeall)
+module(... or "pop3",package.seeall)
 
 require 'base64'
 require 'bit'
diff --git a/nselib/shortport.lua b/nselib/shortport.lua
index 2e45346c7..947eed6a2 100644
--- a/nselib/shortport.lua
+++ b/nselib/shortport.lua
@@ -1,5 +1,5 @@
 -- See nmaps COPYING for licence
-module(..., package.seeall)
+module(... or "shortport", package.seeall)
 
 portnumber = function(port, _proto, _state)
 	local port_table, state_table
diff --git a/nselib/snmp.lua b/nselib/snmp.lua
index 112d87a80..1ccc6560b 100644
--- a/nselib/snmp.lua
+++ b/nselib/snmp.lua
@@ -2,7 +2,7 @@
 --@copyright See nmaps COPYING for licence
 
 
-module(...,package.seeall)
+module(... or "snmp",package.seeall)
 
 
 ---
diff --git a/nselib/strbuf.lua b/nselib/strbuf.lua
index 7b251b02f..2f5e8a1d6 100644
--- a/nselib/strbuf.lua
+++ b/nselib/strbuf.lua
@@ -11,7 +11,7 @@ local pairs = pairs;
 local concat = table.concat;
 
 
-module("strbuf");
+module(... or "strbuf");
 
 -- String buffer functions. Concatenation is not efficient in 
 -- lua as strings are immutable. If a large amount of '..' sequential
diff --git a/nselib/tab.lua b/nselib/tab.lua
index 290f60cbf..3479f4f15 100644
--- a/nselib/tab.lua
+++ b/nselib/tab.lua
@@ -1,5 +1,5 @@
 -- See nmaps COPYING for license
-module("tab" ,package.seeall)
+module(... or "tab" ,package.seeall)
 
 --[[ Provide NSE scripts with a way to output structured tables similar to
      NmapOutputTable.cc. See end for an example on how to use it. --]]
diff --git a/nselib/unpwdb.lua b/nselib/unpwdb.lua
index 0c3846027..b1857c2e9 100644
--- a/nselib/unpwdb.lua
+++ b/nselib/unpwdb.lua
@@ -1,6 +1,6 @@
 -- Kris Katterjohn 06/2008
 
-module(..., package.seeall)
+module(... or "unpwdb", package.seeall)
 
 ---- Username/Password DB Library
 --
diff --git a/nselib/url.lua b/nselib/url.lua
index 8ce85a1f0..a4d6bcdc1 100644
--- a/nselib/url.lua
+++ b/nselib/url.lua
@@ -15,7 +15,7 @@ parse_query() and build_query() added For nmap (Eddie Bell <ejlbell@gmail.com>)
 local string = require("string")
 local base = _G
 local table = require("table")
-module(...,package.seeall)
+module(... or "url",package.seeall)
 
 _VERSION = "URL 1.0"