4 files changed, 14 insertions, 14 deletions
diff --git a/base/src/bjc/dicelang/expr/ExprREPL.java b/base/src/bjc/dicelang/expr/ExprREPL.java
index bbfeeb2..7cc53ee 100644
--- a/base/src/bjc/dicelang/expr/ExprREPL.java
+++ b/base/src/bjc/dicelang/expr/ExprREPL.java
@@ -2,8 +2,8 @@ package bjc.dicelang.expr;
 
 import java.util.Scanner;
 
-import bjc.data.ITree;
-import bjc.funcdata.IList;
+import bjc.data.Tree;
+import bjc.funcdata.ListEx;
 import bjc.utils.parserutils.TreeConstructor;
 
 /**
@@ -54,7 +54,7 @@ public class ExprREPL {
 			System.out.println();
 
 			/* Shunt infix tokens to postfix tokens. */
-			final IList<Token> postfixTokens = Shunter.shuntTokens(infixTokens);
+			final ListEx<Token> postfixTokens = Shunter.shuntTokens(infixTokens);
 			System.out.println("Lexed tokens: ");
 			for(final Token tok : postfixTokens) {
 				System.out.println("\t" + tok);
@@ -73,7 +73,7 @@ public class ExprREPL {
 			/*
 			 * Construct a tree from the list of postfixed tokens.
 			 */
-			final ITree<Token> ast = TreeConstructor.constructTree(postfixTokens,
+			final Tree<Token> ast = TreeConstructor.constructTree(postfixTokens,
 					tok -> tok.typ.isOperator);
 
 			/*
diff --git a/base/src/bjc/dicelang/expr/Lexer.java b/base/src/bjc/dicelang/expr/Lexer.java
index 20e2a40..f9a645a 100644
--- a/base/src/bjc/dicelang/expr/Lexer.java
+++ b/base/src/bjc/dicelang/expr/Lexer.java
@@ -3,7 +3,7 @@ package bjc.dicelang.expr;
 import java.util.LinkedList;
 import java.util.List;
 
-import bjc.funcdata.IList;
+import bjc.funcdata.ListEx;
 import bjc.utils.parserutils.splitter.ConfigurableTokenSplitter;
 
 /*
@@ -50,10 +50,10 @@ public class Lexer {
 		/* Process each token. */
 		for(final String spacedToken : spacedTokens) {
 			/* Split on operators. */
-			final IList<String> splitTokens = split.split(spacedToken);
+			final ListEx<String> splitTokens = split.split(spacedToken);
 
 			/* Convert strings to tokens. */
-			final IList<Token> rawTokens = splitTokens.map(tok -> {
+			final ListEx<Token> rawTokens = splitTokens.map(tok -> {
 				return tks.lexToken(tok, spacedToken);
 			});
 
diff --git a/base/src/bjc/dicelang/expr/Parser.java b/base/src/bjc/dicelang/expr/Parser.java
index 8f02853..990b2c8 100644
--- a/base/src/bjc/dicelang/expr/Parser.java
+++ b/base/src/bjc/dicelang/expr/Parser.java
@@ -1,6 +1,6 @@
 package bjc.dicelang.expr;
 
-import bjc.data.ITree;
+import bjc.data.Tree;
 
 /**
  * Parser for simple math expressions.
@@ -16,7 +16,7 @@ public class Parser {
 	 *            The AST to canonicalize.
 	 * @return The canonicalized AST.
 	 */
-	public static String toCanonicalExpr(final ITree<Token> ast) {
+	public static String toCanonicalExpr(final Tree<Token> ast) {
 		final Token data = ast.getHead();
 
 		if (ast.getChildrenCount() == 0) {
@@ -25,8 +25,8 @@ public class Parser {
 		}
 
 		/* The left/right children. */
-		final ITree<Token> left = ast.getChild(0);
-		final ITree<Token> right = ast.getChild(1);
+		final Tree<Token> left = ast.getChild(0);
+		final Tree<Token> right = ast.getChild(1);
 
 		/* Recursively canonicalize them. */
 		String leftExpr = toCanonicalExpr(left);
diff --git a/base/src/bjc/dicelang/expr/Shunter.java b/base/src/bjc/dicelang/expr/Shunter.java
index f1d3414..bfc0a83 100644
--- a/base/src/bjc/dicelang/expr/Shunter.java
+++ b/base/src/bjc/dicelang/expr/Shunter.java
@@ -4,7 +4,7 @@ import java.util.Deque;
 import java.util.LinkedList;
 
 import bjc.funcdata.FunctionalList;
-import bjc.funcdata.IList;
+import bjc.funcdata.ListEx;
 
 /**
  * Converts a infix series of tokens into a prefix series of tokens.
@@ -20,9 +20,9 @@ public class Shunter {
 	 *
 	 * @return The tokens in postfix order.
 	 */
-	public static IList<Token> shuntTokens(final Token[] infixTokens) {
+	public static ListEx<Token> shuntTokens(final Token[] infixTokens) {
 		/* The returned tokens. */
-		final IList<Token> postfixTokens = new FunctionalList<>();
+		final ListEx<Token> postfixTokens = new FunctionalList<>();
 
 		/* The current stack of operators. */
 		final Deque<Token> opStack = new LinkedList<>();