--- a/src/luan/lib/BasicLib.java	Thu Dec 27 04:36:44 2012 +0000
+++ b/src/luan/lib/BasicLib.java	Fri Dec 28 03:29:12 2012 +0000
@@ -8,53 +8,53 @@
 import java.lang.reflect.Method;
 import java.util.Iterator;
 import java.util.Map;
-import luan.Lua;
-import luan.LuaState;
-import luan.LuaTable;
-import luan.LuaFunction;
-import luan.LuaJavaFunction;
-import luan.LuaException;
-import luan.LuaSource;
-import luan.LuaElement;
-import luan.interp.LuaCompiler;
+import luan.Luan;
+import luan.LuanState;
+import luan.LuanTable;
+import luan.LuanFunction;
+import luan.LuanJavaFunction;
+import luan.LuanException;
+import luan.LuanSource;
+import luan.LuanElement;
+import luan.interp.LuanCompiler;
 
 
 public final class BasicLib {
 
-	public static void register(LuaState lua) {
-		LuaTable global = lua.global();
+	public static void register(LuanState lua) {
+		LuanTable global = lua.global();
 		global.put( "_G", global );
-		add( global, "do_file", LuaState.class, String.class );
-		add( global, "error", LuaState.class, Object.class );
-		add( global, "get_metatable", LuaState.class, Object.class );
-		add( global, "ipairs", LuaTable.class );
-		add( global, "load", LuaState.class, String.class, String.class );
-		add( global, "load_file", LuaState.class, String.class );
-		add( global, "pairs", LuaTable.class );
-		add( global, "print", LuaState.class, new Object[0].getClass() );
+		add( global, "do_file", LuanState.class, String.class );
+		add( global, "error", LuanState.class, Object.class );
+		add( global, "get_metatable", LuanState.class, Object.class );
+		add( global, "ipairs", LuanTable.class );
+		add( global, "load", LuanState.class, String.class, String.class );
+		add( global, "load_file", LuanState.class, String.class );
+		add( global, "pairs", LuanTable.class );
+		add( global, "print", LuanState.class, new Object[0].getClass() );
 		add( global, "raw_equal", Object.class, Object.class );
-		add( global, "raw_get", LuaTable.class, Object.class );
-		add( global, "raw_len", LuaState.class, Object.class );
-		add( global, "raw_set", LuaTable.class, Object.class, Object.class );
-		add( global, "set_metatable", LuaTable.class, LuaTable.class );
+		add( global, "raw_get", LuanTable.class, Object.class );
+		add( global, "raw_len", LuanState.class, Object.class );
+		add( global, "raw_set", LuanTable.class, Object.class, Object.class );
+		add( global, "set_metatable", LuanTable.class, LuanTable.class );
 		add( global, "to_number", Object.class, Integer.class );
-		add( global, "to_string", LuaState.class, Object.class );
+		add( global, "to_string", LuanState.class, Object.class );
 		add( global, "type", Object.class );
-		global.put( "_VERSION", Lua.version );
+		global.put( "_VERSION", Luan.version );
 
-		add( global, "make_standard", LuaState.class );
+		add( global, "make_standard", LuanState.class );
 	}
 
-	private static void add(LuaTable t,String method,Class<?>... parameterTypes) {
+	private static void add(LuanTable t,String method,Class<?>... parameterTypes) {
 		try {
-			t.put( method, new LuaJavaFunction(BasicLib.class.getMethod(method,parameterTypes),null) );
+			t.put( method, new LuanJavaFunction(BasicLib.class.getMethod(method,parameterTypes),null) );
 		} catch(NoSuchMethodException e) {
 			throw new RuntimeException(e);
 		}
 	}
 
-	public static void make_standard(LuaState lua) {
-		LuaTable global = lua.global();
+	public static void make_standard(LuanState lua) {
+		LuanTable global = lua.global();
 		global.put( "dofile", global.get("do_file") );
 		global.put( "getmetatable", global.get("get_metatable") );
 		global.put( "loadfile", global.get("load_file") );
@@ -67,21 +67,21 @@
 		global.put( "tostring", global.get("to_string") );
 	}
 
-	public static void print(LuaState lua,Object... args) throws LuaException {
+	public static void print(LuanState lua,Object... args) throws LuanException {
 		for( int i=0; i<args.length; i++ ) {
 			if( i > 0 )
 				System.out.print('\t');
-			System.out.print( lua.toString(LuaElement.JAVA,args[i]) );
+			System.out.print( lua.toString(LuanElement.JAVA,args[i]) );
 		}
 		System.out.println();
 	}
 
 	public static String type(Object obj) {
-		return Lua.type(obj);
+		return Luan.type(obj);
 	}
 
-	public static LuaFunction load(LuaState lua,String text,String sourceName) throws LuaException {
-		return LuaCompiler.compile(lua,new LuaSource(sourceName,text));
+	public static LuanFunction load(LuanState lua,String text,String sourceName) throws LuanException {
+		return LuanCompiler.compile(lua,new LuanSource(sourceName,text));
 	}
 
 	public static String readAll(Reader in)
@@ -106,44 +106,44 @@
 	}
 
 
-	public static LuaFunction load_file(LuaState lua,String fileName) throws LuaException {
+	public static LuanFunction load_file(LuanState lua,String fileName) throws LuanException {
 		try {
 			String src = fileName==null ? readAll(new InputStreamReader(System.in)) : read(new File(fileName));
 			return load(lua,src,fileName);
 		} catch(IOException e) {
-			throw new LuaException(lua,LuaElement.JAVA,e);
+			throw new LuanException(lua,LuanElement.JAVA,e);
 		}
 	}
 
-	public static Object[] do_file(LuaState lua,String fileName) throws LuaException {
-		LuaFunction fn = load_file(lua,fileName);
-		return lua.call(fn,LuaElement.JAVA,null);
+	public static Object[] do_file(LuanState lua,String fileName) throws LuanException {
+		LuanFunction fn = load_file(lua,fileName);
+		return lua.call(fn,LuanElement.JAVA,null);
 	}
 
-	private static LuaFunction pairs(final Iterator<Map.Entry<Object,Object>> iter) {
-		return new LuaFunction() {
-			public Object[] call(LuaState lua,Object[] args) {
+	private static LuanFunction pairs(final Iterator<Map.Entry<Object,Object>> iter) {
+		return new LuanFunction() {
+			public Object[] call(LuanState lua,Object[] args) {
 				if( !iter.hasNext() )
-					return LuaFunction.EMPTY_RTN;
+					return LuanFunction.EMPTY_RTN;
 				Map.Entry<Object,Object> entry = iter.next();
 				return new Object[]{entry.getKey(),entry.getValue()};
 			}
 		};
 	}
 
-	public static LuaFunction pairs(LuaTable t) {
+	public static LuanFunction pairs(LuanTable t) {
 		return pairs( t.iterator() );
 	}
 
-	public static LuaFunction ipairs(LuaTable t) {
+	public static LuanFunction ipairs(LuanTable t) {
 		return pairs( t.listIterator() );
 	}
 
-	public static LuaTable get_metatable(LuaState lua,Object obj) {
+	public static LuanTable get_metatable(LuanState lua,Object obj) {
 		return lua.getMetatable(obj);
 	}
 
-	public static LuaTable set_metatable(LuaTable table,LuaTable metatable) {
+	public static LuanTable set_metatable(LuanTable table,LuanTable metatable) {
 		table.setMetatable(metatable);
 		return table;
 	}
@@ -152,37 +152,37 @@
 		return v1 == v2 || v1 != null && v1.equals(v2);
 	}
 
-	public static Object raw_get(LuaTable table,Object index) {
+	public static Object raw_get(LuanTable table,Object index) {
 		return table.get(index);
 	}
 
-	public static LuaTable raw_set(LuaTable table,Object index,Object value) {
+	public static LuanTable raw_set(LuanTable table,Object index,Object value) {
 		table.put(index,value);
 		return table;
 	}
 
-	public static int raw_len(LuaState lua,Object v) throws LuaException {
+	public static int raw_len(LuanState lua,Object v) throws LuanException {
 		if( v instanceof String ) {
 			String s = (String)v;
 			return s.length();
 		}
-		if( v instanceof LuaTable ) {
-			LuaTable t = (LuaTable)v;
+		if( v instanceof LuanTable ) {
+			LuanTable t = (LuanTable)v;
 			return t.length();
 		}
-		throw new LuaException( lua, LuaElement.JAVA, "bad argument #1 to 'raw_len' (table or string expected)" );
+		throw new LuanException( lua, LuanElement.JAVA, "bad argument #1 to 'raw_len' (table or string expected)" );
 	}
 
 	public static Number to_number(Object e,Integer base) {
-		return Lua.toNumber(e,base);
+		return Luan.toNumber(e,base);
 	}
 
-	public static String to_string(LuaState lua,Object v) throws LuaException {
-		return lua.toString(LuaElement.JAVA,v);
+	public static String to_string(LuanState lua,Object v) throws LuanException {
+		return lua.toString(LuanElement.JAVA,v);
 	}
 
-	public static void error(LuaState lua,Object msg) throws LuaException {
-		throw new LuaException(lua,LuaElement.JAVA,msg);
+	public static void error(LuanState lua,Object msg) throws LuanException {
+		throw new LuanException(lua,LuanElement.JAVA,msg);
 	}
 
 }