diff --git a/apps/variable_box_controller.cpp b/apps/variable_box_controller.cpp
index de77d3b25..4b06b020c 100644
--- a/apps/variable_box_controller.cpp
+++ b/apps/variable_box_controller.cpp
@@ -99,7 +99,10 @@ void VariableBoxController::willDisplayCellForIndex(HighlightCell * cell, int in
   } else {
     assert(m_currentPage == Page::Function);
     StorageCartesianFunction f(record);
-    symbolLength = f.nameWithArgument(symbolName, Shared::StorageFunction::k_maxNameWithArgumentSize, Graph::StorageCartesianFunctionStore::Symbol());
+    symbolLength = f.nameWithArgument(
+        symbolName,
+        Shared::StorageFunction::k_maxNameWithArgumentSize,
+        Graph::StorageCartesianFunctionStore::Symbol());
   }
   Layout symbolLayout = LayoutHelper::String(symbolName, symbolLength);
   myCell->setLayout(symbolLayout);
diff --git a/apps/variable_box_controller.h b/apps/variable_box_controller.h
index b3a9ee85a..c2db65b2d 100644
--- a/apps/variable_box_controller.h
+++ b/apps/variable_box_controller.h
@@ -34,7 +34,7 @@ public:
   };
   void lockDeleteEvent(Page page);
 private:
-  // TODO: use the "(x)" define in CartesianFunctionSomething
+  // TODO: use the "(x)" defined in CartesianFunctionSomething
   constexpr static int k_functionArgLength = 3;
   constexpr static const char * k_functionArg = "(x)";
   constexpr static int k_maxNumberOfDisplayedRows = 6; //240/Metric::ToolboxRowHeight
diff --git a/escher/include/escher/expression_table_cell.h b/escher/include/escher/expression_table_cell.h
index cb0719ba0..1c927d8ac 100644
--- a/escher/include/escher/expression_table_cell.h
+++ b/escher/include/escher/expression_table_cell.h
@@ -9,7 +9,7 @@ public:
   ExpressionTableCell(Layout layout = Layout::Horizontal);
   View * labelView() const override;
   void setHighlighted(bool highlight) override;
-  void setLayout(Poincare::Layout layoutR);
+  void setLayout(Poincare::Layout layout);
   Poincare::Layout layout() const override { return m_labelExpressionView.layout(); }
 private:
   ExpressionView m_labelExpressionView;
diff --git a/escher/include/escher/expression_table_cell_with_expression.h b/escher/include/escher/expression_table_cell_with_expression.h
index 1ae00f860..bdabef00c 100644
--- a/escher/include/escher/expression_table_cell_with_expression.h
+++ b/escher/include/escher/expression_table_cell_with_expression.h
@@ -9,7 +9,7 @@ public:
   ExpressionTableCellWithExpression();
   View * accessoryView() const override;
   void setHighlighted(bool highlight) override;
-  void setAccessoryLayout(Poincare::Layout layoutR);
+  void setAccessoryLayout(Poincare::Layout l);
 private:
   ExpressionView m_accessoryExpressionView;
 };
diff --git a/escher/src/expression_table_cell.cpp b/escher/src/expression_table_cell.cpp
index 59012100d..8803515a2 100644
--- a/escher/src/expression_table_cell.cpp
+++ b/escher/src/expression_table_cell.cpp
@@ -18,7 +18,7 @@ void ExpressionTableCell::setHighlighted(bool highlight) {
   m_labelExpressionView.setBackgroundColor(backgroundColor);
 }
 
-void ExpressionTableCell::setLayout(Poincare::Layout layoutR) {
-  m_labelExpressionView.setLayout(layoutR);
+void ExpressionTableCell::setLayout(Poincare::Layout layout) {
+  m_labelExpressionView.setLayout(layout);
   layoutSubviews();
 }
diff --git a/escher/src/expression_table_cell_with_expression.cpp b/escher/src/expression_table_cell_with_expression.cpp
index 8e9c204b9..ed6f4ced7 100644
--- a/escher/src/expression_table_cell_with_expression.cpp
+++ b/escher/src/expression_table_cell_with_expression.cpp
@@ -17,7 +17,7 @@ void ExpressionTableCellWithExpression::setHighlighted(bool highlight) {
   m_accessoryExpressionView.setBackgroundColor(backgroundColor);
 }
 
-void ExpressionTableCellWithExpression::setAccessoryLayout(Poincare::Layout layoutR) {
-  m_accessoryExpressionView.setLayout(layoutR);
+void ExpressionTableCellWithExpression::setAccessoryLayout(Poincare::Layout l) {
+  m_accessoryExpressionView.setLayout(l);
   layoutSubviews();
 }