--- a/core/src/luan/impl/LuanParser.java	Wed May 06 12:58:06 2015 -0600
+++ b/core/src/luan/impl/LuanParser.java	Wed May 06 14:32:29 2015 -0600
@@ -9,6 +9,7 @@
 import luan.Luan;
 import luan.LuanState;
 import luan.LuanSource;
+import luan.LuanElement;
 import luan.modules.PackageLuan;
 
 
@@ -110,12 +111,12 @@
 		frame.addUpValueGetter(name,new UpValue.ValueGetter(value));
 	}
 
-	private LuanSource.Element se(int start) {
+	private LuanElement se(int start) {
 		return se(start,null);
 	}
 
-	private LuanSource.Element se(int start,String text) {
-		return new LuanSource.Element(source,start,parser.currentIndex(),text);
+	private LuanElement se(int start,String text) {
+		return new LuanElement(source,start,parser.currentIndex(),text);
 	}
 
 	private List<String> symbols() {
@@ -268,7 +269,7 @@
 		Expressions exprs = TemplateExpressions(In.NOTHING);
 		if( exprs == null )
 			return null;
-		LuanSource.Element se = se(start,"require 'luan:Io'");
+		LuanElement se = se(start,"require 'luan:Io'");
 		FnCall requireCall = new FnCall( se, new ConstExpr(se,PackageLuan.requireFn), new ConstExpr(se,"luan:Io") );
 		se = se(start,"stdout");
 		Expr stdoutExp = new IndexExpr( se, expr(requireCall), new ConstExpr(se,"stdout") );
@@ -878,7 +879,7 @@
 		return nameVar(se(start,name),name);
 	}
 
-	private Var nameVar(final LuanSource.Element se,final String name) {
+	private Var nameVar(final LuanElement se,final String name) {
 		return new Var() {
 
 			public Expr expr() {