diff --git a/apps/calculation/Makefile b/apps/calculation/Makefile
index 422f60af2..8efeefa7c 100644
--- a/apps/calculation/Makefile
+++ b/apps/calculation/Makefile
@@ -11,12 +11,12 @@ app_calculation_src = $(addprefix apps/calculation/,\
   additional_outputs/complex_model.cpp \
   additional_outputs/complex_list_controller.cpp \
   additional_outputs/expression_with_equal_sign_view.cpp \
+  additional_outputs/expressions_list_controller.cpp \
   additional_outputs/illustrated_list_controller.cpp \
   additional_outputs/integer_list_controller.cpp \
   additional_outputs/scrollable_input_exact_approximate_expressions_cell.cpp \
   additional_outputs/list_controller.cpp \
   additional_outputs/rational_list_controller.cpp \
-  additional_outputs/simple_list_controller.cpp \
   additional_outputs/trigonometry_graph_cell.cpp \
   additional_outputs/trigonometry_list_controller.cpp \
   additional_outputs/trigonometry_model.cpp \
diff --git a/apps/calculation/additional_outputs/simple_list_controller.cpp b/apps/calculation/additional_outputs/expressions_list_controller.cpp
similarity index 52%
rename from apps/calculation/additional_outputs/simple_list_controller.cpp
rename to apps/calculation/additional_outputs/expressions_list_controller.cpp
index 29d4124ad..5b4c15a7a 100644
--- a/apps/calculation/additional_outputs/simple_list_controller.cpp
+++ b/apps/calculation/additional_outputs/expressions_list_controller.cpp
@@ -1,31 +1,31 @@
-#include "simple_list_controller.h"
+#include "expressions_list_controller.h"
 #include "../app.h"
 
 using namespace Poincare;
 
 namespace Calculation {
 
-/* Simple list controller */
+/* Expressions list controller */
 
-SimpleListController::SimpleListController(Responder * parentResponder) :
+ExpressionsListController::ExpressionsListController(Responder * parentResponder) :
   ListController(parentResponder),
   m_cells{}
 {
 }
 
-void SimpleListController::didEnterResponderChain(Responder * previousFirstResponder) {
+void ExpressionsListController::didEnterResponderChain(Responder * previousFirstResponder) {
   selectCellAtLocation(0, 0);
 }
 
-int SimpleListController::reusableCellCount(int type) {
+int ExpressionsListController::reusableCellCount(int type) {
   return k_maxNumberOfCells;
 }
 
-HighlightCell * SimpleListController::reusableCell(int index, int type) {
+HighlightCell * ExpressionsListController::reusableCell(int index, int type) {
   return &m_cells[index];
 }
 
-KDCoordinate SimpleListController::rowHeight(int j) {
+KDCoordinate ExpressionsListController::rowHeight(int j) {
   Layout l = layoutAtIndex(j);
   if (l.isUninitialized()) {
     return 0;
@@ -33,7 +33,7 @@ KDCoordinate SimpleListController::rowHeight(int j) {
   return l.layoutSize().height() + 2 * Metric::CommonSmallMargin + Metric::CellSeparatorThickness;
 }
 
-void SimpleListController::willDisplayCellForIndex(HighlightCell * cell, int index) {
+void ExpressionsListController::willDisplayCellForIndex(HighlightCell * cell, int index) {
   ExpressionTableCellWithPointer * myCell = static_cast<ExpressionTableCellWithPointer *>(cell);
   myCell->setLayout(layoutAtIndex(index));
   myCell->setAccessoryMessage(messageAtIndex(index));
diff --git a/apps/calculation/additional_outputs/simple_list_controller.h b/apps/calculation/additional_outputs/expressions_list_controller.h
similarity index 78%
rename from apps/calculation/additional_outputs/simple_list_controller.h
rename to apps/calculation/additional_outputs/expressions_list_controller.h
index 7784b60c0..b3f24015d 100644
--- a/apps/calculation/additional_outputs/simple_list_controller.h
+++ b/apps/calculation/additional_outputs/expressions_list_controller.h
@@ -1,5 +1,5 @@
-#ifndef CALCULATION_ADDITIONAL_OUTPUTS_SIMPLE_LIST_CONTROLLER_H
-#define CALCULATION_ADDITIONAL_OUTPUTS_SIMPLE_LIST_CONTROLLER_H
+#ifndef CALCULATION_ADDITIONAL_OUTPUTS_EXPRESSIONS_LIST_CONTROLLER_H
+#define CALCULATION_ADDITIONAL_OUTPUTS_EXPRESSIONS_LIST_CONTROLLER_H
 
 #include <escher.h>
 #include <poincare/expression.h>
@@ -8,9 +8,9 @@
 
 namespace Calculation {
 
-class SimpleListController : public ListController {
+class ExpressionsListController : public ListController {
 public:
-  SimpleListController(Responder * parentResponder);
+  ExpressionsListController(Responder * parentResponder);
 
   // Responder
   void didEnterResponderChain(Responder * previousFirstResponder) override;
diff --git a/apps/calculation/additional_outputs/integer_list_controller.h b/apps/calculation/additional_outputs/integer_list_controller.h
index 4119fe0a1..c627eaa0e 100644
--- a/apps/calculation/additional_outputs/integer_list_controller.h
+++ b/apps/calculation/additional_outputs/integer_list_controller.h
@@ -1,14 +1,14 @@
 #ifndef CALCULATION_ADDITIONAL_OUTPUTS_INTEGER_LIST_CONTROLLER_H
 #define CALCULATION_ADDITIONAL_OUTPUTS_INTEGER_LIST_CONTROLLER_H
 
-#include "simple_list_controller.h"
+#include "expressions_list_controller.h"
 
 namespace Calculation {
 
-class IntegerListController : public SimpleListController {
+class IntegerListController : public ExpressionsListController {
 public:
   IntegerListController() :
-    SimpleListController(nullptr) {}
+    ExpressionsListController(nullptr) {}
 
   //ListViewDataSource
   int numberOfRows() const override;
diff --git a/apps/calculation/additional_outputs/rational_list_controller.h b/apps/calculation/additional_outputs/rational_list_controller.h
index d612dbb5b..ba2c7d4e2 100644
--- a/apps/calculation/additional_outputs/rational_list_controller.h
+++ b/apps/calculation/additional_outputs/rational_list_controller.h
@@ -1,14 +1,14 @@
 #ifndef CALCULATION_ADDITIONAL_OUTPUTS_RATIONAL_LIST_CONTROLLER_H
 #define CALCULATION_ADDITIONAL_OUTPUTS_RATIONAL_LIST_CONTROLLER_H
 
-#include "simple_list_controller.h"
+#include "expressions_list_controller.h"
 
 namespace Calculation {
 
-class RationalListController : public SimpleListController {
+class RationalListController : public ExpressionsListController {
 public:
   RationalListController() :
-    SimpleListController(nullptr) {}
+    ExpressionsListController(nullptr) {}
 
   //ListViewDataSource
   int numberOfRows() const override;