diff --git a/CHANGELOG b/CHANGELOG
index 741eca32e..4ad185741 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,8 @@
 # Nmap Changelog ($Id$); -*-text-*-
 
+o Most script names were changed to make them more consistent.
+  [Fyodor, David]
+
 o Removed ripeQuery.nse because we now have the much more robust
   whois.nse which handles all the major registries. [Fyodor]
 
diff --git a/scripts/ASN.nse b/scripts/asn-query.nse
similarity index 99%
rename from scripts/ASN.nse
rename to scripts/asn-query.nse
index cca4e796d..666cb0693 100644
--- a/scripts/ASN.nse
+++ b/scripts/asn-query.nse
@@ -26,7 +26,7 @@ server (your default DNS server, or whichever you specified with the
 -- @args dns The address of a recursive nameserver to use (optional).
 -- @output
 -- Host script results:
--- |  ASN:
+-- |  asn-query:
 -- |  BGP: 64.13.128.0/21 | Country: US
 -- |    Origin AS: 10565 SVCOLO-AS - Silicon Valley Colocation, Inc.
 -- |      Peer AS: 3561 6461
diff --git a/scripts/daytimeTest.nse b/scripts/daytime.nse
similarity index 100%
rename from scripts/daytimeTest.nse
rename to scripts/daytime.nse
diff --git a/scripts/dns-safe-recursion-port.nse b/scripts/dns-random-srcport.nse
similarity index 100%
rename from scripts/dns-safe-recursion-port.nse
rename to scripts/dns-random-srcport.nse
diff --git a/scripts/dns-safe-recursion-txid.nse b/scripts/dns-random-txid.nse
similarity index 100%
rename from scripts/dns-safe-recursion-txid.nse
rename to scripts/dns-random-txid.nse
diff --git a/scripts/dns-test-open-recursion.nse b/scripts/dns-recursion.nse
similarity index 100%
rename from scripts/dns-test-open-recursion.nse
rename to scripts/dns-recursion.nse
diff --git a/scripts/anonFTP.nse b/scripts/ftp-anon.nse
similarity index 96%
rename from scripts/anonFTP.nse
rename to scripts/ftp-anon.nse
index 159a98f84..056a6686d 100644
--- a/scripts/anonFTP.nse
+++ b/scripts/ftp-anon.nse
@@ -4,7 +4,7 @@ Checks if an FTP server allows anonymous logins.
 
 ---
 -- @output
--- |_ anonFTP: Anonymous login allowed
+-- |_ ftp-anon: Anonymous login allowed
 
 author = "Eddie Bell <ejlbell@gmail.com>"
 license = "Same as Nmap--See http://nmap.org/book/man-legal.html"
diff --git a/scripts/ftpbounce.nse b/scripts/ftp-bounce.nse
similarity index 100%
rename from scripts/ftpbounce.nse
rename to scripts/ftp-bounce.nse
diff --git a/scripts/showHTMLTitle.nse b/scripts/html-title.nse
similarity index 99%
rename from scripts/showHTMLTitle.nse
rename to scripts/html-title.nse
index d395188bc..18cdf6acc 100644
--- a/scripts/showHTMLTitle.nse
+++ b/scripts/html-title.nse
@@ -10,7 +10,7 @@ original target.
 ---
 --@output
 -- 80/tcp  open   http    syn-ack
--- |_ showHTMLTitle: Foo.
+-- |_ html-title: Foo.
 
 author = "Diman Todorov <diman.todorov@gmail.com>"
 
diff --git a/scripts/HTTPAuth.nse b/scripts/http-auth.nse
similarity index 97%
rename from scripts/HTTPAuth.nse
rename to scripts/http-auth.nse
index d4a41413c..65a098819 100644
--- a/scripts/HTTPAuth.nse
+++ b/scripts/http-auth.nse
@@ -5,7 +5,7 @@ authentication.
 
 ---
 -- @output
--- |  HTTPAuth: HTTP Service requires authentication
+-- |  http-auth: HTTP Service requires authentication
 -- |_   Auth type: Basic, realm = DSL Router
 
 -- HTTP authentication information gathering script
diff --git a/scripts/HTTP_open_proxy.nse b/scripts/http-open-proxy.nse
similarity index 100%
rename from scripts/HTTP_open_proxy.nse
rename to scripts/http-open-proxy.nse
diff --git a/scripts/HTTPpasswd.nse b/scripts/http-passwd.nse
similarity index 100%
rename from scripts/HTTPpasswd.nse
rename to scripts/http-passwd.nse
diff --git a/scripts/HTTPtrace.nse b/scripts/http-trace.nse
similarity index 96%
rename from scripts/HTTPtrace.nse
rename to scripts/http-trace.nse
index b51fc1a20..a0cfd8688 100644
--- a/scripts/HTTPtrace.nse
+++ b/scripts/http-trace.nse
@@ -6,7 +6,7 @@ response.
 ---
 -- @output
 -- 80/tcp open  http
--- |  HTTPtrace: Response differs from request.  First 5 additional lines:
+-- |  http-trace: Response differs from request.  First 5 additional lines:
 -- |  Cookie: UID=d4287aa38d02f409841b4e0c0050c13148a85d01c0c0a154d4ef56dfc2b4fc1b0
 -- |  Country: us
 -- |  Ip_is_advertise_combined: yes
diff --git a/scripts/iax2Detect.nse b/scripts/iax2-version.nse
similarity index 100%
rename from scripts/iax2Detect.nse
rename to scripts/iax2-version.nse
diff --git a/scripts/showOwner.nse b/scripts/identd-owners.nse
similarity index 100%
rename from scripts/showOwner.nse
rename to scripts/identd-owners.nse
diff --git a/scripts/ircServerInfo.nse b/scripts/irc-info.nse
similarity index 99%
rename from scripts/ircServerInfo.nse
rename to scripts/irc-info.nse
index 875c27f64..a46c1037a 100644
--- a/scripts/ircServerInfo.nse
+++ b/scripts/irc-info.nse
@@ -7,7 +7,7 @@ It uses STATS, LUSERS, and other queries to obtain this information.
 ---
 -- @output
 -- 6665/tcp open     irc
--- |  ircServerInfo: Server: foo.bar.net
+-- |  irc-info: Server: foo.bar.net
 -- |  Version: hyperion-1.0.2b(381). foo.bar.net 
 -- |  Lservers/Lusers: 0/4204
 -- |  Uptime: 106 days, 2:46:30
diff --git a/scripts/ircZombieTest.nse b/scripts/irc-zombie.nse
similarity index 100%
rename from scripts/ircZombieTest.nse
rename to scripts/irc-zombie.nse
diff --git a/scripts/MSSQLm.nse b/scripts/ms-sql-info.nse
similarity index 100%
rename from scripts/MSSQLm.nse
rename to scripts/ms-sql-info.nse
diff --git a/scripts/MySQLinfo.nse b/scripts/mysql-info.nse
similarity index 99%
rename from scripts/MySQLinfo.nse
rename to scripts/mysql-info.nse
index 194c1f326..6e4ae3de8 100644
--- a/scripts/MySQLinfo.nse
+++ b/scripts/mysql-info.nse
@@ -10,7 +10,7 @@ running this script (see the portrule).
 ---
 --@output
 -- 3306/tcp open  mysql
--- |  MySQLinfo: Protocol: 10
+-- |  mysql-info: Protocol: 10
 -- |  Version: 5.0.51a-3ubuntu5.1
 -- |  Thread ID: 7
 -- |  Some Capabilities: Connect with DB, Compress, Transactions, Secure Connection
diff --git a/scripts/brutePOP3.nse b/scripts/pop3-brute.nse
similarity index 100%
rename from scripts/brutePOP3.nse
rename to scripts/pop3-brute.nse
diff --git a/scripts/popcapa.nse b/scripts/pop3-capabilities.nse
similarity index 91%
rename from scripts/popcapa.nse
rename to scripts/pop3-capabilities.nse
index 66b667977..114db0c78 100644
--- a/scripts/popcapa.nse
+++ b/scripts/pop3-capabilities.nse
@@ -5,7 +5,7 @@ Retrieves POP3 server capabilities.
 ---
 -- @output
 -- 110/tcp open  pop3
--- |_ popcapa:  USER CAPA RESP-CODES UIDL PIPELINING STLS TOP SASL(PLAIN)
+-- |_ pop3-capabilities:  USER CAPA RESP-CODES UIDL PIPELINING STLS TOP SASL(PLAIN)
 
 author = "Philip Pickering <pgpickering@gmail.com>"
 license = "Same as Nmap--See http://nmap.org/book/man-legal.html"
diff --git a/scripts/PPTPversion.nse b/scripts/pptp-version.nse
similarity index 100%
rename from scripts/PPTPversion.nse
rename to scripts/pptp-version.nse
diff --git a/scripts/RealVNC_auth_bypass.nse b/scripts/realvnc-auth-bypass.nse
similarity index 100%
rename from scripts/RealVNC_auth_bypass.nse
rename to scripts/realvnc-auth-bypass.nse
diff --git a/scripts/robots.nse b/scripts/robots.txt.nse
similarity index 97%
rename from scripts/robots.nse
rename to scripts/robots.txt.nse
index 7711155ee..ff35cf4de 100644
--- a/scripts/robots.nse
+++ b/scripts/robots.txt.nse
@@ -7,7 +7,7 @@ The higher the verbosity or debug level, the more disallowed entries are shown.
 ---
 --@output
 -- 80/tcp  open   http    syn-ack
--- |  robots: has 156 disallowed entries (40 shown)
+-- |  robots.txt: has 156 disallowed entries (40 shown)
 -- |  /news?output=xhtml& /search /groups /images /catalogs
 -- |  /catalogues /news /nwshp /news?btcid=*& /news?btaid=*&
 -- |  /setnewsprefs? /index.html? /? /addurl/image? /pagead/ /relpage/
diff --git a/scripts/script.db b/scripts/script.db
index 807306eb0..2d4d14ea0 100644
--- a/scripts/script.db
+++ b/scripts/script.db
@@ -1,104 +1,104 @@
-Entry{ category = "default", filename = "dns-test-open-recursion.nse" }
-Entry{ category = "intrusive", filename = "dns-test-open-recursion.nse" }
-Entry{ category = "default", filename = "RealVNC_auth_bypass.nse" }
-Entry{ category = "vuln", filename = "RealVNC_auth_bypass.nse" }
-Entry{ category = "external", filename = "dns-safe-recursion-port.nse" }
-Entry{ category = "intrusive", filename = "dns-safe-recursion-port.nse" }
-Entry{ category = "discovery", filename = "smb-enumusers.nse" }
-Entry{ category = "intrusive", filename = "smb-enumusers.nse" }
-Entry{ category = "intrusive", filename = "SNMPcommunitybrute.nse" }
-Entry{ category = "auth", filename = "SNMPcommunitybrute.nse" }
-Entry{ category = "default", filename = "showOwner.nse" }
-Entry{ category = "safe", filename = "showOwner.nse" }
-Entry{ category = "default", filename = "SSLv2-support.nse" }
-Entry{ category = "safe", filename = "SSLv2-support.nse" }
-Entry{ category = "malware", filename = "ircZombieTest.nse" }
-Entry{ category = "discovery", filename = "smb-systeminfo.nse" }
-Entry{ category = "intrusive", filename = "smb-systeminfo.nse" }
-Entry{ category = "version", filename = "skype_v2-version.nse" }
-Entry{ category = "discovery", filename = "HTTPtrace.nse" }
-Entry{ category = "default", filename = "UPnP-info.nse" }
-Entry{ category = "safe", filename = "UPnP-info.nse" }
-Entry{ category = "default", filename = "rpcinfo.nse" }
-Entry{ category = "safe", filename = "rpcinfo.nse" }
-Entry{ category = "discovery", filename = "rpcinfo.nse" }
-Entry{ category = "auth", filename = "bruteTelnet.nse" }
-Entry{ category = "intrusive", filename = "bruteTelnet.nse" }
-Entry{ category = "external", filename = "dns-safe-recursion-txid.nse" }
-Entry{ category = "intrusive", filename = "dns-safe-recursion-txid.nse" }
-Entry{ category = "default", filename = "SMTPcommands.nse" }
-Entry{ category = "discovery", filename = "SMTPcommands.nse" }
-Entry{ category = "safe", filename = "SMTPcommands.nse" }
-Entry{ category = "default", filename = "robots.nse" }
-Entry{ category = "safe", filename = "robots.nse" }
-Entry{ category = "default", filename = "zoneTrans.nse" }
-Entry{ category = "intrusive", filename = "zoneTrans.nse" }
-Entry{ category = "discovery", filename = "zoneTrans.nse" }
-Entry{ category = "discovery", filename = "whois.nse" }
-Entry{ category = "external", filename = "whois.nse" }
-Entry{ category = "safe", filename = "whois.nse" }
-Entry{ category = "default", filename = "smb-os-discovery.nse" }
-Entry{ category = "discovery", filename = "smb-os-discovery.nse" }
-Entry{ category = "safe", filename = "smb-os-discovery.nse" }
-Entry{ category = "malware", filename = "strangeSMTPport.nse" }
-Entry{ category = "version", filename = "iax2Detect.nse" }
-Entry{ category = "discovery", filename = "smb-security-mode.nse" }
-Entry{ category = "safe", filename = "smb-security-mode.nse" }
-Entry{ category = "discovery", filename = "smb-enumsessions.nse" }
-Entry{ category = "intrusive", filename = "smb-enumsessions.nse" }
-Entry{ category = "discovery", filename = "ASN.nse" }
-Entry{ category = "external", filename = "ASN.nse" }
-Entry{ category = "default", filename = "showHTMLTitle.nse" }
-Entry{ category = "safe", filename = "showHTMLTitle.nse" }
-Entry{ category = "discovery", filename = "promiscuous.nse" }
-Entry{ category = "discovery", filename = "smb-enumshares.nse" }
-Entry{ category = "intrusive", filename = "smb-enumshares.nse" }
-Entry{ category = "default", filename = "anonFTP.nse" }
-Entry{ category = "auth", filename = "anonFTP.nse" }
-Entry{ category = "intrusive", filename = "anonFTP.nse" }
-Entry{ category = "intrusive", filename = "SQLInject.nse" }
-Entry{ category = "vuln", filename = "SQLInject.nse" }
-Entry{ category = "demo", filename = "SMTP_openrelay_test.nse" }
+Entry{ category = "default", filename = "robots.txt.nse" }
+Entry{ category = "safe", filename = "robots.txt.nse" }
+Entry{ category = "intrusive", filename = "pop3-brute.nse" }
+Entry{ category = "auth", filename = "pop3-brute.nse" }
+Entry{ category = "default", filename = "ftp-anon.nse" }
+Entry{ category = "auth", filename = "ftp-anon.nse" }
+Entry{ category = "intrusive", filename = "ftp-anon.nse" }
+Entry{ category = "discovery", filename = "daytime.nse" }
+Entry{ category = "default", filename = "smtp-commands.nse" }
+Entry{ category = "discovery", filename = "smtp-commands.nse" }
+Entry{ category = "safe", filename = "smtp-commands.nse" }
+Entry{ category = "default", filename = "dns-recursion.nse" }
+Entry{ category = "intrusive", filename = "dns-recursion.nse" }
+Entry{ category = "discovery", filename = "asn-query.nse" }
+Entry{ category = "external", filename = "asn-query.nse" }
+Entry{ category = "discovery", filename = "smb-enum-users.nse" }
+Entry{ category = "intrusive", filename = "smb-enum-users.nse" }
+Entry{ category = "external", filename = "dns-random-txid.nse" }
+Entry{ category = "intrusive", filename = "dns-random-txid.nse" }
+Entry{ category = "discovery", filename = "smb-enum-sessions.nse" }
+Entry{ category = "intrusive", filename = "smb-enum-sessions.nse" }
+Entry{ category = "default", filename = "pop3-capabilities.nse" }
+Entry{ category = "malware", filename = "smtp-strangeport.nse" }
+Entry{ category = "default", filename = "sshv1.nse" }
+Entry{ category = "safe", filename = "sshv1.nse" }
+Entry{ category = "version", filename = "pptp-version.nse" }
+Entry{ category = "default", filename = "irc-info.nse" }
+Entry{ category = "discovery", filename = "irc-info.nse" }
+Entry{ category = "discovery", filename = "smb-system-info.nse" }
+Entry{ category = "intrusive", filename = "smb-system-info.nse" }
+Entry{ category = "malware", filename = "irc-zombie.nse" }
+Entry{ category = "default", filename = "ms-sql-info.nse" }
+Entry{ category = "discovery", filename = "ms-sql-info.nse" }
+Entry{ category = "intrusive", filename = "ms-sql-info.nse" }
+Entry{ category = "default", filename = "zone-transfer.nse" }
+Entry{ category = "intrusive", filename = "zone-transfer.nse" }
+Entry{ category = "discovery", filename = "zone-transfer.nse" }
+Entry{ category = "default", filename = "sslv2.nse" }
+Entry{ category = "safe", filename = "sslv2.nse" }
 Entry{ category = "default", filename = "nbstat.nse" }
 Entry{ category = "discovery", filename = "nbstat.nse" }
 Entry{ category = "safe", filename = "nbstat.nse" }
-Entry{ category = "default", filename = "HTTPAuth.nse" }
-Entry{ category = "auth", filename = "HTTPAuth.nse" }
-Entry{ category = "intrusive", filename = "HTTPAuth.nse" }
+Entry{ category = "default", filename = "upnp-info.nse" }
+Entry{ category = "safe", filename = "upnp-info.nse" }
+Entry{ category = "default", filename = "rpcinfo.nse" }
+Entry{ category = "safe", filename = "rpcinfo.nse" }
+Entry{ category = "discovery", filename = "rpcinfo.nse" }
+Entry{ category = "safe", filename = "ssh-hostkey.nse" }
+Entry{ category = "default", filename = "ssh-hostkey.nse" }
+Entry{ category = "intrusive", filename = "ssh-hostkey.nse" }
+Entry{ category = "default", filename = "mysql-info.nse" }
+Entry{ category = "discovery", filename = "mysql-info.nse" }
+Entry{ category = "safe", filename = "mysql-info.nse" }
 Entry{ category = "default", filename = "finger.nse" }
 Entry{ category = "discovery", filename = "finger.nse" }
-Entry{ category = "default", filename = "SSHv1-support.nse" }
-Entry{ category = "safe", filename = "SSHv1-support.nse" }
-Entry{ category = "default", filename = "popcapa.nse" }
-Entry{ category = "default", filename = "SNMPsysdescr.nse" }
-Entry{ category = "discovery", filename = "SNMPsysdescr.nse" }
-Entry{ category = "safe", filename = "SNMPsysdescr.nse" }
-Entry{ category = "safe", filename = "SSH-hostkey.nse" }
-Entry{ category = "default", filename = "SSH-hostkey.nse" }
-Entry{ category = "intrusive", filename = "SSH-hostkey.nse" }
-Entry{ category = "intrusive", filename = "brutePOP3.nse" }
-Entry{ category = "auth", filename = "brutePOP3.nse" }
-Entry{ category = "default", filename = "MySQLinfo.nse" }
-Entry{ category = "discovery", filename = "MySQLinfo.nse" }
-Entry{ category = "safe", filename = "MySQLinfo.nse" }
-Entry{ category = "default", filename = "ftpbounce.nse" }
-Entry{ category = "intrusive", filename = "ftpbounce.nse" }
-Entry{ category = "auth", filename = "xamppDefaultPass.nse" }
-Entry{ category = "vuln", filename = "xamppDefaultPass.nse" }
-Entry{ category = "discovery", filename = "smb-enumdomains.nse" }
-Entry{ category = "intrusive", filename = "smb-enumdomains.nse" }
-Entry{ category = "intrusive", filename = "HTTPpasswd.nse" }
-Entry{ category = "vuln", filename = "HTTPpasswd.nse" }
-Entry{ category = "discovery", filename = "smb-serverstats.nse" }
-Entry{ category = "intrusive", filename = "smb-serverstats.nse" }
-Entry{ category = "version", filename = "PPTPversion.nse" }
-Entry{ category = "default", filename = "ircServerInfo.nse" }
-Entry{ category = "discovery", filename = "ircServerInfo.nse" }
-Entry{ category = "default", filename = "MSSQLm.nse" }
-Entry{ category = "discovery", filename = "MSSQLm.nse" }
-Entry{ category = "intrusive", filename = "MSSQLm.nse" }
-Entry{ category = "default", filename = "HTTP_open_proxy.nse" }
-Entry{ category = "discovery", filename = "HTTP_open_proxy.nse" }
-Entry{ category = "external", filename = "HTTP_open_proxy.nse" }
-Entry{ category = "intrusive", filename = "HTTP_open_proxy.nse" }
-Entry{ category = "discovery", filename = "daytimeTest.nse" }
+Entry{ category = "discovery", filename = "whois.nse" }
+Entry{ category = "external", filename = "whois.nse" }
+Entry{ category = "safe", filename = "whois.nse" }
+Entry{ category = "discovery", filename = "http-trace.nse" }
+Entry{ category = "intrusive", filename = "http-passwd.nse" }
+Entry{ category = "vuln", filename = "http-passwd.nse" }
+Entry{ category = "discovery", filename = "sniffer-detect.nse" }
+Entry{ category = "version", filename = "iax2-version.nse" }
+Entry{ category = "default", filename = "smb-os-discovery.nse" }
+Entry{ category = "discovery", filename = "smb-os-discovery.nse" }
+Entry{ category = "safe", filename = "smb-os-discovery.nse" }
+Entry{ category = "intrusive", filename = "snmp-brute.nse" }
+Entry{ category = "auth", filename = "snmp-brute.nse" }
+Entry{ category = "default", filename = "identd-owners.nse" }
+Entry{ category = "safe", filename = "identd-owners.nse" }
+Entry{ category = "default", filename = "html-title.nse" }
+Entry{ category = "safe", filename = "html-title.nse" }
+Entry{ category = "external", filename = "dns-random-srcport.nse" }
+Entry{ category = "intrusive", filename = "dns-random-srcport.nse" }
+Entry{ category = "discovery", filename = "smb-enum-domains.nse" }
+Entry{ category = "intrusive", filename = "smb-enum-domains.nse" }
+Entry{ category = "discovery", filename = "smb-server-stats.nse" }
+Entry{ category = "intrusive", filename = "smb-server-stats.nse" }
+Entry{ category = "default", filename = "ftp-bounce.nse" }
+Entry{ category = "intrusive", filename = "ftp-bounce.nse" }
+Entry{ category = "discovery", filename = "smb-security-mode.nse" }
+Entry{ category = "safe", filename = "smb-security-mode.nse" }
+Entry{ category = "discovery", filename = "smb-enum-shares.nse" }
+Entry{ category = "intrusive", filename = "smb-enum-shares.nse" }
+Entry{ category = "default", filename = "http-open-proxy.nse" }
+Entry{ category = "discovery", filename = "http-open-proxy.nse" }
+Entry{ category = "external", filename = "http-open-proxy.nse" }
+Entry{ category = "intrusive", filename = "http-open-proxy.nse" }
+Entry{ category = "intrusive", filename = "sql-injection.nse" }
+Entry{ category = "vuln", filename = "sql-injection.nse" }
+Entry{ category = "default", filename = "realvnc-auth-bypass.nse" }
+Entry{ category = "vuln", filename = "realvnc-auth-bypass.nse" }
+Entry{ category = "version", filename = "skypev2-version.nse" }
+Entry{ category = "default", filename = "http-auth.nse" }
+Entry{ category = "auth", filename = "http-auth.nse" }
+Entry{ category = "intrusive", filename = "http-auth.nse" }
+Entry{ category = "auth", filename = "telnet-brute.nse" }
+Entry{ category = "intrusive", filename = "telnet-brute.nse" }
+Entry{ category = "auth", filename = "xampp-default-auth.nse" }
+Entry{ category = "vuln", filename = "xampp-default-auth.nse" }
+Entry{ category = "demo", filename = "smtp-open-relay.nse" }
+Entry{ category = "default", filename = "snmp-sysdescr.nse" }
+Entry{ category = "discovery", filename = "snmp-sysdescr.nse" }
+Entry{ category = "safe", filename = "snmp-sysdescr.nse" }
diff --git a/scripts/skype_v2-version.nse b/scripts/skypev2-version.nse
similarity index 100%
rename from scripts/skype_v2-version.nse
rename to scripts/skypev2-version.nse
diff --git a/scripts/smb-enumdomains.nse b/scripts/smb-enum-domains.nse
similarity index 99%
rename from scripts/smb-enumdomains.nse
rename to scripts/smb-enum-domains.nse
index b09f93d1f..06702dc51 100644
--- a/scripts/smb-enumdomains.nse
+++ b/scripts/smb-enum-domains.nse
@@ -17,7 +17,7 @@ After the initial <code>bind()</code> to SAMR, the sequence of calls is:
 --
 --@output
 -- Host script results:
--- |  smb-enumdomains:
+-- |  smb-enum-domains:
 -- |  Domain: LOCALSYSTEM
 -- |   |_ SID: S-1-5-21-2956463495-2656032972-1271678565
 -- |   |_ Users: Administrator, Guest, SUPPORT_388945a0
diff --git a/scripts/smb-enumsessions.nse b/scripts/smb-enum-sessions.nse
similarity index 99%
rename from scripts/smb-enumsessions.nse
rename to scripts/smb-enum-sessions.nse
index 56f1676d9..bb7046635 100644
--- a/scripts/smb-enumsessions.nse
+++ b/scripts/smb-enum-sessions.nse
@@ -30,7 +30,7 @@ idea to write this one.
 --
 --@output
 -- Host script results:
--- |  smb-enumsessions:
+-- |  smb-enum-sessions:
 -- |  Users logged in:
 -- |  |_ TESTBOX\Administrator since 2008-10-21 08:17:14
 -- |  |_ DOMAIN\rbowes since 2008-10-20 09:03:23
diff --git a/scripts/smb-enumshares.nse b/scripts/smb-enum-shares.nse
similarity index 99%
rename from scripts/smb-enumshares.nse
rename to scripts/smb-enum-shares.nse
index eb00330cc..20c9b4770 100644
--- a/scripts/smb-enumshares.nse
+++ b/scripts/smb-enum-shares.nse
@@ -27,13 +27,13 @@ doing an authenticated test.
 --
 --@output
 -- Standard:
--- |  smb-enumshares:
+-- |  smb-enum-shares:
 -- |  Anonymous shares: IPC$
 -- |_ Restricted shares: F$, ADMIN$, C$
 --
 -- Verbose:
 -- Host script results:
--- |  smb-enumshares: 
+-- |  smb-enum-shares: 
 -- |  Anonymous shares:
 -- |     IPC$
 -- |     |_ Type: STYPE_IPC_HIDDEN
diff --git a/scripts/smb-enumusers.nse b/scripts/smb-enum-users.nse
similarity index 99%
rename from scripts/smb-enumusers.nse
rename to scripts/smb-enum-users.nse
index d93bffe21..3f21a255b 100644
--- a/scripts/smb-enumusers.nse
+++ b/scripts/smb-enum-users.nse
@@ -72,11 +72,11 @@ the code I wrote for this is largely based on the techniques used by them.
 --
 -- @output
 -- Host script results:
--- |  smb-enumusers:
+-- |  smb-enum-users:
 -- |_ TESTBOX\Administrator, EXTERNAL\DnsAdmins, TESTBOX\Guest, EXTERNAL\HelpServicesGroup, EXTERNAL\PARTNERS$, TESTBOX\SUPPORT_388945a0
 -- 
 -- Host script results:
--- |  smb-enumusers:
+-- |  smb-enum-users:
 -- |  Administrator
 -- |    |_ Type: User
 -- |    |_ Domain: LOCALSYSTEM
diff --git a/scripts/smb-serverstats.nse b/scripts/smb-server-stats.nse
similarity index 99%
rename from scripts/smb-serverstats.nse
rename to scripts/smb-server-stats.nse
index ac0cebec9..b5942fa23 100644
--- a/scripts/smb-serverstats.nse
+++ b/scripts/smb-server-stats.nse
@@ -16,7 +16,7 @@ the numbers that Windows returns. Take the values here with a grain of salt.
 --
 -- @output
 -- Host script results:
--- |  smb-serverstats:
+-- |  smb-server-stats:
 -- |  Server statistics collected since 2008-10-17 09:32:41 (4d0h24m29s):
 -- |  |_ Traffic 133467 bytes (0.38b/s) sent, 167696 bytes (0.48b/s) received
 -- |  |_ Failed logins: 5
diff --git a/scripts/smb-systeminfo.nse b/scripts/smb-system-info.nse
similarity index 99%
rename from scripts/smb-systeminfo.nse
rename to scripts/smb-system-info.nse
index b1e2b4b60..d3c7418eb 100644
--- a/scripts/smb-systeminfo.nse
+++ b/scripts/smb-system-info.nse
@@ -16,7 +16,7 @@ I don't know it), so this doesn't support Vista at all.
 --
 -- @output
 -- Host script results:
--- |  smb-systeminfo:
+-- |  smb-system-info:
 -- |  OS Details
 -- |  |_ Microsoft Windows Server 2003 Service Pack 2 (ServerNT 5.2 build 3790)
 -- |  |_ Installed on 2007-11-26 23:40:40
diff --git a/scripts/SMTPcommands.nse b/scripts/smtp-commands.nse
similarity index 97%
rename from scripts/SMTPcommands.nse
rename to scripts/smtp-commands.nse
index 1c3b36238..b81c872a2 100644
--- a/scripts/SMTPcommands.nse
+++ b/scripts/smtp-commands.nse
@@ -6,7 +6,7 @@ SMTP server.
 ---
 -- @output
 -- 25/tcp	open	smtp
--- |  SMTPcommands: EHLO uninvited.example.net Hello root at localhost [127.0.0.1], SIZE 52428800, PIPELINING, 250 HELP
+-- |  smtp-commands: EHLO uninvited.example.net Hello root at localhost [127.0.0.1], SIZE 52428800, PIPELINING, 250 HELP
 -- |_ HELP Commands supported:, , AUTH HELO EHLO MAIL RCPT DATA NOOP QUIT RSET HELP
 
 -- Version History
diff --git a/scripts/SMTP_openrelay_test.nse b/scripts/smtp-open-relay.nse
similarity index 100%
rename from scripts/SMTP_openrelay_test.nse
rename to scripts/smtp-open-relay.nse
diff --git a/scripts/strangeSMTPport.nse b/scripts/smtp-strangeport.nse
similarity index 91%
rename from scripts/strangeSMTPport.nse
rename to scripts/smtp-strangeport.nse
index c48aaec4f..a1a5ae3ab 100644
--- a/scripts/strangeSMTPport.nse
+++ b/scripts/smtp-strangeport.nse
@@ -8,7 +8,7 @@ system to send spam or control your machine.
 ---
 -- @output
 -- 22/tcp  open   ssh
--- |_ strangeSMTPport: Warning: smtp is running on a strange port
+-- |_ smtp-strangeport: Warning: smtp is running on a strange port
 
 author = "Diman Todorov <diman.todorov@gmail.com>"
 
diff --git a/scripts/promiscuous.nse b/scripts/sniffer-detect.nse
similarity index 100%
rename from scripts/promiscuous.nse
rename to scripts/sniffer-detect.nse
diff --git a/scripts/SNMPcommunitybrute.nse b/scripts/snmp-brute.nse
similarity index 100%
rename from scripts/SNMPcommunitybrute.nse
rename to scripts/snmp-brute.nse
diff --git a/scripts/SNMPsysdescr.nse b/scripts/snmp-sysdescr.nse
similarity index 96%
rename from scripts/SNMPsysdescr.nse
rename to scripts/snmp-sysdescr.nse
index 3a0988cd4..8da8cfe2a 100644
--- a/scripts/SNMPsysdescr.nse
+++ b/scripts/snmp-sysdescr.nse
@@ -4,7 +4,7 @@ Attempts to extract system information from an SNMP version 1 service.
 
 ---
 -- @output
--- |  SNMPsysdescr: HP ETHERNET MULTI-ENVIRONMENT,ROM A.25.80,JETDIRECT,JD117,EEPROM V.28.22,CIDATE 08/09/2006
+-- |  snmp-sysdescr: HP ETHERNET MULTI-ENVIRONMENT,ROM A.25.80,JETDIRECT,JD117,EEPROM V.28.22,CIDATE 08/09/2006
 -- |_   System uptime: 28 days, 17:18:59 (248153900 timeticks)
 
 author = "Thomas Buchanan <tbuchanan@thecompassgrp.net>"
diff --git a/scripts/SQLInject.nse b/scripts/sql-injection.nse
similarity index 100%
rename from scripts/SQLInject.nse
rename to scripts/sql-injection.nse
diff --git a/scripts/SSH-hostkey.nse b/scripts/ssh-hostkey.nse
similarity index 95%
rename from scripts/SSH-hostkey.nse
rename to scripts/ssh-hostkey.nse
index 69701c170..ccfc9103a 100644
--- a/scripts/SSH-hostkey.nse
+++ b/scripts/ssh-hostkey.nse
@@ -21,9 +21,9 @@ the output with the <code>ssh_hostkey</code> script argument.
 --
 --@output
 -- 22/tcp open  ssh
--- |  SSH-hostkey: 2048 f0:58:ce:f4:aa:a4:59:1c:8e:dd:4d:07:44:c8:25:11 (RSA)
+-- |  ssh-hostkey: 2048 f0:58:ce:f4:aa:a4:59:1c:8e:dd:4d:07:44:c8:25:11 (RSA)
 -- 22/tcp open  ssh
--- |  SSH-hostkey: 2048 f0:58:ce:f4:aa:a4:59:1c:8e:dd:4d:07:44:c8:25:11 (RSA)
+-- |  ssh-hostkey: 2048 f0:58:ce:f4:aa:a4:59:1c:8e:dd:4d:07:44:c8:25:11 (RSA)
 -- |  +--[ RSA 2048]----+
 -- |  |       .E*+      |
 -- |  |        oo       |
@@ -36,7 +36,7 @@ the output with the <code>ssh_hostkey</code> script argument.
 -- |  |    o .          |
 -- |_ +-----------------+
 -- 22/tcp open  ssh
--- |  SSH-hostkey: 2048 xuvah-degyp-nabus-zegah-hebur-nopig-bubig-difeg-hisym-rumef-cuxex (RSA)
+-- |  ssh-hostkey: 2048 xuvah-degyp-nabus-zegah-hebur-nopig-bubig-difeg-hisym-rumef-cuxex (RSA)
 -- |_ ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAwVuv2gcr0maaKQ69VVIEv2ob4OxnuI64fkeOnCXD1lUx5tTA+vefXUWEMxgMuA7iX4irJHy2zer0NQ3Z3yJvr5scPgTYIaEOp5Uo/eGFG9Agpk5wE8CoF0e47iCAPHqzlmP2V7aNURLMODb3jVZuI07A2ZRrMGrD8d888E2ORVORv1rYeTYCqcMMoVFmX9l3gWEdk4yx3w5sD8v501Iuyd1v19mPfyhrI5E1E1nl/Xjp5N0/xP2GUBrdkDMxKaxqTPMie/f0dXBUPQQN697a5q+5lBRPhKYOtn6yQKCd9s1Q22nxn72Jmi1RzbMyYJ52FosDT755Qmb46GLrDMaZMQ==
 author = "Sven Klemm <sven@c3d2.de>"
 license = "Same as Nmap--See http://nmap.org/book/man-legal.html"
diff --git a/scripts/SSHv1-support.nse b/scripts/sshv1.nse
similarity index 100%
rename from scripts/SSHv1-support.nse
rename to scripts/sshv1.nse
diff --git a/scripts/SSLv2-support.nse b/scripts/sslv2.nse
similarity index 99%
rename from scripts/SSLv2-support.nse
rename to scripts/sslv2.nse
index f305dc32b..fb7827b7d 100644
--- a/scripts/SSLv2-support.nse
+++ b/scripts/sslv2.nse
@@ -6,7 +6,7 @@ offers.
 ---
 --@output
 -- 443/tcp open   https   syn-ack
--- |  SSLv2-support: server still supports SSLv2
+-- |  sslv2: server still supports SSLv2
 -- |       SSL2_RC4_128_WITH_MD5
 -- |       SSL2_DES_192_EDE3_CBC_WITH_MD5
 -- |       SSL2_RC2_CBC_128_CBC_WITH_MD5
diff --git a/scripts/bruteTelnet.nse b/scripts/telnet-brute.nse
similarity index 100%
rename from scripts/bruteTelnet.nse
rename to scripts/telnet-brute.nse
diff --git a/scripts/UPnP-info.nse b/scripts/upnp-info.nse
similarity index 99%
rename from scripts/UPnP-info.nse
rename to scripts/upnp-info.nse
index fb45be4ca..56248ddf8 100644
--- a/scripts/UPnP-info.nse
+++ b/scripts/upnp-info.nse
@@ -4,7 +4,7 @@ Attempts to extract system information from the UPnP service.
 
 ---
 -- @output
--- |  UPnP-info:  System/1.0 UPnP/1.0 IGD/1.0
+-- |  upnp-info:  System/1.0 UPnP/1.0 IGD/1.0
 -- |_ Location: http://192.168.1.1:80/UPnP/IGD.xml
 
 author = "Thomas Buchanan <tbuchanan@thecompassgrp.net>"
diff --git a/scripts/xamppDefaultPass.nse b/scripts/xampp-default-auth.nse
similarity index 95%
rename from scripts/xamppDefaultPass.nse
rename to scripts/xampp-default-auth.nse
index 6fb653377..afd1a4a59 100644
--- a/scripts/xamppDefaultPass.nse
+++ b/scripts/xampp-default-auth.nse
@@ -8,7 +8,7 @@ administration.
 ---
 -- @output
 -- 21/tcp  open   ftp
--- |_ xamppDefaultPass: Login success with u/p: nobody/xampp
+-- |_ xampp-default-auth: Login success with u/p: nobody/xampp
 
 author = "Diman Todorov <diman.todorov@gmail.com>"
 
diff --git a/scripts/zoneTrans.nse b/scripts/zone-transfer.nse
similarity index 99%
rename from scripts/zoneTrans.nse
rename to scripts/zone-transfer.nse
index f54c4283d..51b5f5015 100644
--- a/scripts/zoneTrans.nse
+++ b/scripts/zone-transfer.nse
@@ -20,7 +20,7 @@ Useful resources
 -- @args zoneTrans.domain Domain to transfer.
 -- @output
 -- 53/tcp   open     domain
--- |  zoneTrans:
+-- |  zone-transfer:
 -- |  foo.com.            SOA     ns2.foo.com. piou.foo.com.
 -- |  foo.com.            TXT  
 -- |  foo.com.            NS      ns1.foo.com.