--- a/src/luan/modules/JavaLuan.java	Tue Feb 12 21:50:26 2019 -0700
+++ b/src/luan/modules/JavaLuan.java	Tue Feb 12 22:33:40 2019 -0700
@@ -18,7 +18,6 @@
 import java.util.Arrays;
 import java.util.Comparator;
 import luan.Luan;
-import luan.LuanState;
 import luan.LuanTable;
 import luan.LuanException;
 import luan.LuanFunction;
@@ -27,7 +26,7 @@
 
 public final class JavaLuan {
 
-	public static void java(LuanState luan) throws LuanException {
+	public static void java(Luan luan) throws LuanException {
 		Luan.checkSecurity(luan,"java");
 		luan.peek().javaOk = true;
 	}
@@ -35,18 +34,18 @@
 	public static final LuanFunction javaFn;
 	static {
 		try {
-			javaFn = new LuanJavaFunction(JavaLuan.class.getMethod("java",LuanState.class),null);
+			javaFn = new LuanJavaFunction(JavaLuan.class.getMethod("java",Luan.class),null);
 		} catch(NoSuchMethodException e) {
 			throw new RuntimeException(e);
 		}
 	}
 
-	private static void checkJava(LuanState luan) throws LuanException {
+	private static void checkJava(Luan luan) throws LuanException {
 		if( !luan.peek().javaOk )
 			throw new LuanException("Java isn't allowed");
 	}
 
-	public static Object __index(LuanState luan,Object obj,Object key) throws LuanException {
+	public static Object __index(Luan luan,Object obj,Object key) throws LuanException {
 		checkJava(luan);
 		Class cls;
 		if( obj instanceof Static ) {
@@ -136,7 +135,7 @@
 		}
 	}
 
-	public static void __new_index(LuanState luan,Object obj,Object key,Object value) throws LuanException {
+	public static void __new_index(Luan luan,Object obj,Object key,Object value) throws LuanException {
 		checkJava(luan);
 		Class cls;
 		if( obj instanceof Static ) {
@@ -310,7 +309,7 @@
 			return cls.isSynthetic();
 		}
 
-		public Object luan_proxy(final LuanState luan,final LuanTable t) throws LuanException {
+		public Object luan_proxy(final Luan luan,final LuanTable t) throws LuanException {
 			return Proxy.newProxyInstance(
 				cls.getClassLoader(),
 				new Class[]{cls},
@@ -334,14 +333,14 @@
 	private static final Method luan_proxyMethod;
 	static {
 		try {
-			luan_proxyMethod = Static.class.getMethod("luan_proxy",LuanState.class,LuanTable.class);
+			luan_proxyMethod = Static.class.getMethod("luan_proxy",Luan.class,LuanTable.class);
 			luan_proxyMethod.setAccessible(true);
 		} catch(NoSuchMethodException e) {
 			throw new RuntimeException(e);
 		}
 	}
 
-	public static Static load(LuanState luan,String name) throws LuanException {
+	public static Static load(Luan luan,String name) throws LuanException {
 		checkJava(luan);
 		Class cls;
 		try {
@@ -383,7 +382,7 @@
 			Collections.sort(varArgs,varArgsSorter);
 		}
 
-		@Override public Object call(LuanState luan,Object[] args) throws LuanException {
+		@Override public Object call(Luan luan,Object[] args) throws LuanException {
 			List<LuanJavaFunction> list = fnMap.get(args.length);
 			if( list != null ) {
 				for( LuanJavaFunction fn : list ) {
@@ -430,7 +429,7 @@
 			this.cls = cls;
 		}
 
-		public Object assertClass(LuanState luan,Object v) throws LuanException {
+		public Object assertClass(Luan luan,Object v) throws LuanException {
 			if( !cls.isInstance(v) ) {
 				String got = v.getClass().getSimpleName();
 				String expected = cls.getSimpleName();
@@ -442,7 +441,7 @@
 	private static final Method assertClass;
 	static {
 		try {
-			assertClass = AssertClass.class.getMethod("assertClass",LuanState.class,Object.class);
+			assertClass = AssertClass.class.getMethod("assertClass",Luan.class,Object.class);
 			assertClass.setAccessible(true);
 		} catch(NoSuchMethodException e) {
 			throw new RuntimeException(e);
@@ -450,7 +449,7 @@
 	}
 
 
-	public static Object proxy(final LuanState luan,Static st,final LuanTable t,final Object base) throws LuanException {
+	public static Object proxy(final Luan luan,Static st,final LuanTable t,final Object base) throws LuanException {
 		return Proxy.newProxyInstance(
 			st.cls.getClassLoader(),
 			new Class[]{st.cls},