--- a/src/luan/modules/http/LuanHandler.java	Tue Feb 12 21:50:26 2019 -0700
+++ b/src/luan/modules/http/LuanHandler.java	Tue Feb 12 22:33:40 2019 -0700
@@ -20,7 +20,6 @@
 import luan.webserver.Handler;
 import luan.webserver.ResponseOutputStream;
 import luan.Luan;
-import luan.LuanState;
 import luan.LuanTable;
 import luan.LuanFunction;
 import luan.LuanJavaFunction;
@@ -31,12 +30,12 @@
 import luan.modules.logging.LuanLogger;
 
 
-public final class LuanHandler implements Handler, LuanState.OnClose {
-	private final LuanState luanInit;
+public final class LuanHandler implements Handler, Luan.OnClose {
+	private final Luan luanInit;
 	private final Logger logger;
 	private final ReadWriteLock lock = new ReentrantReadWriteLock();
 	private final List<Reference<Closeable>> onClose = new ArrayList<Reference<Closeable>>();
-	private volatile LuanState currentLuan;
+	private volatile Luan currentLuan;
 	private volatile boolean isDisabled = false;
 
 	private static final Method resetLuanMethod;
@@ -52,7 +51,7 @@
 		}
 	}
 
-	public LuanHandler(LuanState luanInit) {
+	public LuanHandler(Luan luanInit) {
 		this.luanInit = luanInit;
 		this.logger = LuanLogger.getLogger(luanInit,LuanHandler.class.getName());
 		try {
@@ -66,9 +65,9 @@
 		currentLuan = newLuan();
 	}
 
-	private LuanState newLuan() {
+	private Luan newLuan() {
 		LuanCloner cloner = new LuanCloner(LuanCloner.Type.COMPLETE);
-		LuanState luan = (LuanState)cloner.clone(luanInit);
+		Luan luan = (Luan)cloner.clone(luanInit);
 		luan.onClose = this;
 		try {
 			PackageLuan.load(luan,"site:/init.luan");
@@ -81,7 +80,7 @@
 	}
 
 /*
-	public LuanState getLuan() {
+	public Luan getLuan() {
 		return luan;
 	}
 */
@@ -138,7 +137,7 @@
 		lock.readLock().lock();
 		try {
 			LuanFunction fn;
-			LuanState luan = currentLuan;
+			Luan luan = currentLuan;
 			synchronized(luan) {
 				PackageLuan.enableLoad(luan,"luan:Rpc.luan");
 				LuanTable rpc = (LuanTable)luan.require("luan:Rpc.luan");
@@ -147,7 +146,7 @@
 				if( fn == null )
 					throw new LuanException( "function not found: " + fnName );
 				LuanCloner cloner = new LuanCloner(LuanCloner.Type.INCREMENTAL);
-				luan = (LuanState)cloner.clone(luan);
+				luan = (Luan)cloner.clone(luan);
 				fn = (LuanFunction)cloner.get(fn);
 			}
 			return fn.call(luan,args);
@@ -178,10 +177,10 @@
 		lock.readLock().lock();
 		try {
 			LuanFunction fn = Luan.load(sourceText,sourceName);
-			LuanState luan = currentLuan;
+			Luan luan = currentLuan;
 			synchronized(luan) {
 				LuanCloner cloner = new LuanCloner(LuanCloner.Type.INCREMENTAL);
-				LuanState luan2 = (LuanState)cloner.clone(luan);
+				Luan luan2 = (Luan)cloner.clone(luan);
 				return fn.call(luan2);
 			}
 		} finally {
@@ -190,11 +189,11 @@
 	}
 
 	public void eval_in_root(String text) throws LuanException {
-		LuanState oldLuan = currentLuan;
-		LuanState luan;
+		Luan oldLuan = currentLuan;
+		Luan luan;
 		synchronized(oldLuan) {
 			LuanCloner cloner = new LuanCloner(LuanCloner.Type.COMPLETE);
-			luan = (LuanState)cloner.clone(oldLuan);
+			luan = (Luan)cloner.clone(oldLuan);
 		}
 		luan.onClose = this;
 		BasicLuan.load(text,"<eval_in_root>",null).call(luan);