diff --git a/apps/sequence/list/list_controller.cpp b/apps/sequence/list/list_controller.cpp
index 8ad3159d0..52f55853f 100644
--- a/apps/sequence/list/list_controller.cpp
+++ b/apps/sequence/list/list_controller.cpp
@@ -29,8 +29,8 @@ Toolbox * ListController::toolboxForTextInput(TextInput * textInput) {
   return toolboxForSender(textInput);
 }
 
-Toolbox * ListController::toolboxForExpressionLayoutField(ExpressionLayoutField * expressionLayoutField) {
-  return toolboxForSender(expressionLayoutField);
+Toolbox * ListController::toolboxForLayoutField(LayoutField * layoutField) {
+  return toolboxForSender(layoutField);
 }
 
 TextFieldDelegateApp * ListController::textFieldDelegateApp() {
diff --git a/apps/sequence/list/list_controller.h b/apps/sequence/list/list_controller.h
index 883280932..91b84f88e 100644
--- a/apps/sequence/list/list_controller.h
+++ b/apps/sequence/list/list_controller.h
@@ -14,7 +14,7 @@
 
 namespace Sequence {
 
-class ListController : public Shared::FunctionListController, public Shared::TextFieldDelegate, public Shared::ExpressionLayoutFieldDelegate {
+class ListController : public Shared::FunctionListController, public Shared::TextFieldDelegate, public Shared::LayoutFieldDelegate {
 public:
   ListController(Responder * parentResponder, SequenceStore * sequenceStore, ButtonRowController * header, ButtonRowController * footer);
   const char * title() override;
@@ -22,7 +22,7 @@ public:
   KDCoordinate expressionRowHeight(int j) override;
   void willDisplayCellAtLocation(HighlightCell * cell, int i, int j) override;
   Toolbox * toolboxForTextInput(TextInput * textInput) override;
-  Toolbox * toolboxForExpressionLayoutField(ExpressionLayoutField * expressionLayoutField) override;
+  Toolbox * toolboxForLayoutField(LayoutField * layoutField) override;
   void selectPreviousNewSequenceCell();
   void editExpression(Sequence * sequence, int sequenceDefinitionIndex, Ion::Events::Event event);
 private:
diff --git a/apps/solver/list_controller.cpp b/apps/solver/list_controller.cpp
index 9084b6305..0e201f9cb 100644
--- a/apps/solver/list_controller.cpp
+++ b/apps/solver/list_controller.cpp
@@ -129,21 +129,21 @@ bool ListController::textFieldDidReceiveEvent(TextField * textField, Ion::Events
   return false;
 }
 
-bool ListController::expressionLayoutFieldDidReceiveEvent(ExpressionLayoutField * expressionLayoutField, Ion::Events::Event event) {
-  if (expressionLayoutField->isEditing() && expressionLayoutField->expressionLayoutFieldShouldFinishEditing(event)) {
+bool ListController::layoutFieldDidReceiveEvent(LayoutField * layoutField, Ion::Events::Event event) {
+  if (layoutField->isEditing() && layoutField->layoutFieldShouldFinishEditing(event)) {
     char buffer[TextField::maxBufferSize()];
-    expressionLayoutField->serialize(buffer, TextField::maxBufferSize());
+    layoutField->serialize(buffer, TextField::maxBufferSize());
     if (!textRepresentsAnEquality(buffer)) {
-      expressionLayoutField->handleEvent(Ion::Events::ShiftRight);
-      expressionLayoutField->handleEventWithText("=0");
-      expressionLayoutField->serialize(buffer, TextField::maxBufferSize());
+      layoutField->handleEvent(Ion::Events::ShiftRight);
+      layoutField->handleEventWithText("=0");
+      layoutField->serialize(buffer, TextField::maxBufferSize());
       if (!textRepresentsAnEquality(buffer)) {
         app()->displayWarning(I18n::Message::RequireEquation);
         return true;
       }
     }
   }
-  if (Shared::ExpressionLayoutFieldDelegate::expressionLayoutFieldDidReceiveEvent(expressionLayoutField, event)) {
+  if (Shared::LayoutFieldDelegate::layoutFieldDidReceiveEvent(layoutField, event)) {
     return true;
   }
   return false;
@@ -154,7 +154,7 @@ bool ListController::textFieldDidFinishEditing(TextField * textField, const char
   return true;
 }
 
-bool ListController::expressionLayoutFieldDidFinishEditing(ExpressionLayoutField * expressionLayoutField, Poincare::ExpressionLayout * layout, Ion::Events::Event event) {
+bool ListController::layoutFieldDidFinishEditing(LayoutField * layoutField, Poincare::ExpressionLayout * layout, Ion::Events::Event event) {
   reloadButtonMessage();
   return true;
 }
diff --git a/apps/solver/list_controller.h b/apps/solver/list_controller.h
index a83a5eecd..3e4fa4f3e 100644
--- a/apps/solver/list_controller.h
+++ b/apps/solver/list_controller.h
@@ -12,7 +12,7 @@
 
 namespace Solver {
 
-class ListController : public Shared::ExpressionModelListController, public ButtonRowDelegate, public ListViewDataSource, public Shared::TextFieldDelegate, public Shared::ExpressionLayoutFieldDelegate {
+class ListController : public Shared::ExpressionModelListController, public ButtonRowDelegate, public ListViewDataSource, public Shared::TextFieldDelegate, public Shared::LayoutFieldDelegate {
 public:
   ListController(Responder * parentResponder, EquationStore * equationStore, ButtonRowController * footer);
   /* ButtonRowDelegate */
@@ -34,13 +34,13 @@ public:
   void didBecomeFirstResponder() override;
   void didEnterResponderChain(Responder * previousFirstResponder) override;
   void editExpression(Shared::ExpressionModel * model, Ion::Events::Event event) override { return Shared::ExpressionModelListController::editExpression(model, event); }
-  /* Text/ExpressionLayout Field Delegate */
+  /* Text/Layout Field Delegate */
   Shared::TextFieldDelegateApp * textFieldDelegateApp() override;
   Shared::ExpressionFieldDelegateApp * expressionFieldDelegateApp() override;
   bool textFieldDidReceiveEvent(TextField * textField, Ion::Events::Event event) override;
-  bool expressionLayoutFieldDidReceiveEvent(ExpressionLayoutField * expressionLayoutField, Ion::Events::Event event) override;
+  bool layoutFieldDidReceiveEvent(LayoutField * layoutField, Ion::Events::Event event) override;
   bool textFieldDidFinishEditing(TextField * textField, const char * text, Ion::Events::Event event) override;
-  bool expressionLayoutFieldDidFinishEditing(ExpressionLayoutField * expressionLayoutField, Poincare::ExpressionLayout * layout, Ion::Events::Event event) override;
+  bool layoutFieldDidFinishEditing(LayoutField * layoutField, Poincare::ExpressionLayout * layout, Ion::Events::Event event) override;
   /* Specific to Solver */
   void resolveEquations();
 private:
diff --git a/escher/include/escher/expression_field.h b/escher/include/escher/expression_field.h
index 9336b0540..e2d4209cd 100644
--- a/escher/include/escher/expression_field.h
+++ b/escher/include/escher/expression_field.h
@@ -14,7 +14,7 @@ public:
   void setEditing(bool isEditing, bool reinitDraftBuffer = true);
   bool isEditing() const;
   /* Warning: this function is VERY dangerous! Indeed: sometimes the
-   * m_expressionLayoutField might overflow the m_textBuffer once serialized
+   * m_layoutField might overflow the m_textBuffer once serialized
    * and still have been accepted before because the model can hold a longer
    * buffer. This is the case in the application 'Calculation' and we do not
    * use text() there... TODO: change text() for fillTextInBuffer?*/
diff --git a/escher/src/layout_field.cpp b/escher/src/layout_field.cpp
index afe7fc3b1..88813e7c6 100644
--- a/escher/src/layout_field.cpp
+++ b/escher/src/layout_field.cpp
@@ -139,7 +139,7 @@ bool LayoutField::privateHandleEvent(Ion::Events::Event event) {
   }
   if (Responder::handleEvent(event)) {
     /* The only event Responder handles is 'Toolbox' displaying. In that case,
-     * the ExpressionLayoutField is forced into editing mode. */
+     * the LayoutField is forced into editing mode. */
     if (!isEditing()) {
       setEditing(true);
     }