--- a/src/luan/modules/http/Server.luan	Mon Dec 19 01:38:21 2016 -0700
+++ b/src/luan/modules/http/Server.luan	Mon Dec 26 22:29:36 2016 -0700
@@ -13,7 +13,7 @@
 local logger = Logging.logger "http/Server"
 
 java()
-local Server = require "java:org.eclipse.jetty.server.Server"
+local JavaServer = require "java:org.eclipse.jetty.server.Server"
 local NCSARequestLog = require "java:org.eclipse.jetty.server.NCSARequestLog"
 local DefaultHandler = require "java:org.eclipse.jetty.server.handler.DefaultHandler"
 local HandlerList = require "java:org.eclipse.jetty.server.handler.HandlerList"
@@ -28,90 +28,90 @@
 local LuanHandler = require "java:luan.modules.http.LuanHandler"
 local NotFound = require "java:luan.modules.http.NotFound"
 
-local M = {}
+local Server = {}
 
-M.port = 8080
+Server.port = 8080
 
-M.welcome_file = "index.html"
+Server.welcome_file = "index.html"
 
 
-M.authentication_handler = AuthenticationHandler.new("/private/")
+Server.authentication_handler = AuthenticationHandler.new("/private/")
 
-M.luan_handler = LuanHandler.new()
+Server.luan_handler = LuanHandler.new()
 
-M.resource_handler = ResourceHandler.new()
-M.resource_handler.setDirectoriesListed(true)
+Server.resource_handler = ResourceHandler.new()
+Server.resource_handler.setDirectoriesListed(true)
 
-M.handlers = HandlerList.new()
-M.handlers.setHandlers { M.authentication_handler, M.luan_handler, M.resource_handler }
+Server.handlers = HandlerList.new()
+Server.handlers.setHandlers { Server.authentication_handler, Server.luan_handler, Server.resource_handler }
 
-function M.add_folder(context,dir)
+function Server.add_folder(context,dir)
 	local rh = ResourceHandler.new()
 	rh.setResourceBase(dir)
 	rh.setDirectoriesListed(true)
 	local ch = ContextHandler.new(context)
 	ch.setHandler(rh)
-	M.handlers.addHandler(ch)
+	Server.handlers.addHandler(ch)
 	return rh
 end
 
-M.handler_wrapper = HandlerWrapper.new()
-M.handler_wrapper.setHandler(M.handlers)
+Server.handler_wrapper = HandlerWrapper.new()
+Server.handler_wrapper.setHandler(Server.handlers)
 
-function M.zip()
+function Server.zip()
 	local h = GzipHandler.new()
-	h.setHandler(M.handler_wrapper.getHandler())
-	M.handler_wrapper.setHandler(h)
+	h.setHandler(Server.handler_wrapper.getHandler())
+	Server.handler_wrapper.setHandler(h)
 end
 
-M.log = NCSARequestLog.new()
-M.log.setExtended(false)
-M.log_handler = RequestLogHandler.new()
-M.log_handler.setRequestLog(M.log)
+Server.log = NCSARequestLog.new()
+Server.log.setExtended(false)
+Server.log_handler = RequestLogHandler.new()
+Server.log_handler.setRequestLog(Server.log)
 
-function M.set_log_file(file_name)
-	M.log.setFilename(file_name)
+function Server.set_log_file(file_name)
+	Server.log.setFilename(file_name)
 end
 
 local hc = HandlerCollection.new()
-hc.setHandlers { SessionHandler.new(), M.handler_wrapper, DefaultHandler.new(), M.log_handler }
+hc.setHandlers { SessionHandler.new(), Server.handler_wrapper, DefaultHandler.new(), Server.log_handler }
 
 
-function M.init(dir)
+function Server.init(dir)
 	dir = gsub(dir,"/$","")  -- remove trailing '/' if any
 	Http.dir = dir
 	function Io.schemes.site(path)
 		return Io.uri( dir..path )
 	end
-	M.authentication_handler.setPassword(Io.password)
+	Server.authentication_handler.setPassword(Io.password)
 	local base = dir
 	if matches(base,"^classpath:") then
-		base = dir.."#"..M.welcome_file.."#"..M.welcome_file..".luan"
+		base = dir.."#"..Server.welcome_file.."#"..Server.welcome_file..".luan"
 	end
-	M.resource_handler.setResourceBase(Io.uri(base).to_string())
-	M.resource_handler.setWelcomeFiles {M.welcome_file}
-	M.luan_handler.setWelcomeFile(M.welcome_file)
-	M.handlers.addHandler(NotFound.new(M.luan_handler))
-	M.server = Server.new(M.port)
-	M.server.setHandler(hc)
+	Server.resource_handler.setResourceBase(Io.uri(base).to_string())
+	Server.resource_handler.setWelcomeFiles {Server.welcome_file}
+	Server.luan_handler.setWelcomeFile(Server.welcome_file)
+	Server.handlers.addHandler(NotFound.new(Server.luan_handler))
+	Server.server = JavaServer.new(Server.port)
+	Server.server.setHandler(hc)
 end
 
-function M.start()
-	LuanHandler.start(M.server)
+function Server.start()
+	LuanHandler.start(Server.server)
 end
 
-function M.start_rpc()
+function Server.start_rpc()
 	function Rpc.functions.call(domain,fn_name,...)
-		return M.luan_handler.call_rpc(fn_name,...)
+		return Server.luan_handler.call_rpc(fn_name,...)
 	end
 
 	Thread.fork(Rpc.serve)
 end
 
-function M.serve(dir)
-	M.init(dir)
-	M.start_rpc()
-	M.start()
+function Server.serve(dir)
+	Server.init(dir)
+	Server.start_rpc()
+	Server.start()
 end
 
-return M
+return Server