diff --git a/src/models/formulas/EquationFormula.java b/src/models/formulas/EquationFormula.java
index 3fa8cf8..e12dc46 100644
--- a/src/models/formulas/EquationFormula.java
+++ b/src/models/formulas/EquationFormula.java
@@ -1,23 +1,23 @@
 package models.formulas;
 
 import lombok.Getter;
-import models.terms.RDLTerm;
+import models.terms.EvaluatableTerm;
 
 @Getter
 public class EquationFormula extends Formula {
 
-	private RDLTerm leftTerm;
-	private RDLTerm rightTerm;
+	private EvaluatableTerm leftSideHand;
+	private EvaluatableTerm rightSideHand;
 		
-	public EquationFormula(RDLTerm leftTerm, RDLTerm rightTerm) {
-		this.leftTerm = leftTerm;
-		this.rightTerm = rightTerm;
+	public EquationFormula(EvaluatableTerm leftTerm, EvaluatableTerm rightTerm) {
+		this.leftSideHand = leftTerm;
+		this.rightSideHand = rightTerm;
 	}
 
 	
 	@Override
 	public String toString() {
-		return leftTerm.toString() + " = " + rightTerm.toString();
+		return leftSideHand.toString() + " = " + rightSideHand.toString();
 	}
 
 	@Override
@@ -26,7 +26,7 @@
 			return false;
 		}
 		EquationFormula anotherFormula = (EquationFormula) another;
-		return leftTerm.equals(anotherFormula.getLeftTerm()) && rightTerm.equals(anotherFormula.getRightTerm());
+		return leftSideHand.equals(anotherFormula.getLeftSideHand()) && rightSideHand.equals(anotherFormula.getRightSideHand());
 	}
 
 	@Override
diff --git a/src/models/formulas/meta/MetaEquationFormula.java b/src/models/formulas/meta/MetaEquationFormula.java
index 62ed104..e1ccf2f 100644
--- a/src/models/formulas/meta/MetaEquationFormula.java
+++ b/src/models/formulas/meta/MetaEquationFormula.java
@@ -14,8 +14,8 @@
 @Getter
 public class MetaEquationFormula extends MetaFormula {
 
-	private MetaRDLTerm leftTerm;
-	private MetaRDLTerm rightTerm;
+	private MetaRDLTerm leftSideHand;
+	private MetaRDLTerm rightSideHand;
 	
 	public MetaEquationFormula(MetaRDLTerm left, MetaRDLTerm right) {
 		if (! left.isEvaluatableTerm()) {
@@ -25,8 +25,8 @@
 			throw new IllegalTypeException();
 		}
 		
-		this.leftTerm = left;
-		this.rightTerm = right;
+		this.leftSideHand = left;
+		this.rightSideHand = right;
 	}
 	
 	@Override
@@ -36,7 +36,7 @@
 			return false;
 		}
 		EquationFormula eq = (EquationFormula) formula;
-		return leftTerm.isMatchedBy(eq.getLeftTerm(), binding, orderConstraint) && rightTerm.isMatchedBy(eq.getRightTerm(), binding, orderConstraint);
+		return leftSideHand.isMatchedBy(eq.getLeftSideHand(), binding, orderConstraint) && rightSideHand.isMatchedBy(eq.getRightSideHand(), binding, orderConstraint);
 	}