diff --git a/poincare/include/poincare/context.h b/poincare/include/poincare/context.h
index 6ce7ebd06..498268ccf 100644
--- a/poincare/include/poincare/context.h
+++ b/poincare/include/poincare/context.h
@@ -3,13 +3,13 @@
 
 namespace Poincare {
 
-class ExpressionReference;
-class SymbolReference;
+class Expression;
+class Symbol;
 
 class Context {
 public:
-  virtual const ExpressionReference expressionForSymbol(const SymbolReference symbol) = 0;
-  virtual void setExpressionForSymbolName(const ExpressionReference expression, const SymbolReference symbol, Context & context) = 0;
+  virtual const Expression expressionForSymbol(const Symbol symbol) = 0;
+  virtual void setExpressionForSymbolName(const Expression expression, const Symbol symbol, Context & context) = 0;
 };
 
 }