diff --git a/apps/graph/Makefile b/apps/graph/Makefile
index 46f7f3634..5284a2dac 100644
--- a/apps/graph/Makefile
+++ b/apps/graph/Makefile
@@ -3,7 +3,7 @@ app_headers += apps/graph/app.h
 
 app_graph_src = $(addprefix apps/graph/,\
   app.cpp \
-  cartesian_function_store.cpp \
+  continuous_function_store.cpp \
   graph/banner_view.cpp \
   graph/calculation_graph_controller.cpp \
   graph/calculation_parameter_controller.cpp \
diff --git a/apps/graph/app.h b/apps/graph/app.h
index 75fa24765..9dec85163 100644
--- a/apps/graph/app.h
+++ b/apps/graph/app.h
@@ -2,7 +2,7 @@
 #define GRAPH_APP_H
 
 #include <escher.h>
-#include "cartesian_function_store.h"
+#include "continuous_function_store.h"
 #include "graph/graph_controller.h"
 #include "list/list_controller.h"
 #include "values/values_controller.h"
diff --git a/apps/graph/cartesian_function_store.cpp b/apps/graph/continuous_function_store.cpp
similarity index 97%
rename from apps/graph/cartesian_function_store.cpp
rename to apps/graph/continuous_function_store.cpp
index 175e7896e..74e6a3946 100644
--- a/apps/graph/cartesian_function_store.cpp
+++ b/apps/graph/continuous_function_store.cpp
@@ -1,4 +1,4 @@
-#include "cartesian_function_store.h"
+#include "continuous_function_store.h"
 extern "C" {
 #include <assert.h>
 #include <stddef.h>
diff --git a/apps/graph/cartesian_function_store.h b/apps/graph/continuous_function_store.h
similarity index 92%
rename from apps/graph/cartesian_function_store.h
rename to apps/graph/continuous_function_store.h
index f88a8000a..895bbba64 100644
--- a/apps/graph/cartesian_function_store.h
+++ b/apps/graph/continuous_function_store.h
@@ -1,5 +1,5 @@
-#ifndef GRAPH_CARTESIAN_FUNCTION_STORE_H
-#define GRAPH_CARTESIAN_FUNCTION_STORE_H
+#ifndef GRAPH_CONTINUOUS_FUNCTION_STORE_H
+#define GRAPH_CONTINUOUS_FUNCTION_STORE_H
 
 #include "../shared/cartesian_function.h"
 #include "../shared/function_store.h"
diff --git a/apps/graph/graph/calculation_graph_controller.h b/apps/graph/graph/calculation_graph_controller.h
index 73fb59f8d..a400f56ab 100644
--- a/apps/graph/graph/calculation_graph_controller.h
+++ b/apps/graph/graph/calculation_graph_controller.h
@@ -5,7 +5,7 @@
 #include "banner_view.h"
 #include "../../shared/simple_interactive_curve_view_controller.h"
 #include "../../shared/function_banner_delegate.h"
-#include "../cartesian_function_store.h"
+#include "../continuous_function_store.h"
 
 namespace Graph {
 
diff --git a/apps/graph/graph/graph_controller.h b/apps/graph/graph/graph_controller.h
index 9c746eccb..ea7092329 100644
--- a/apps/graph/graph/graph_controller.h
+++ b/apps/graph/graph/graph_controller.h
@@ -9,7 +9,7 @@
 #include "../../shared/curve_view_cursor.h"
 #include "../../shared/round_cursor_view.h"
 #include "../../shared/interactive_curve_view_range.h"
-#include "../cartesian_function_store.h"
+#include "../continuous_function_store.h"
 
 namespace Graph {
 
diff --git a/apps/graph/list/list_controller.h b/apps/graph/list/list_controller.h
index 81764bf07..714182cdd 100644
--- a/apps/graph/list/list_controller.h
+++ b/apps/graph/list/list_controller.h
@@ -4,7 +4,7 @@
 #include <escher.h>
 #include "list_parameter_controller.h"
 #include "text_field_function_title_cell.h"
-#include "../cartesian_function_store.h"
+#include "../continuous_function_store.h"
 #include <apps/shared/function_expression_cell.h>
 #include <apps/shared/function_list_controller.h>
 #include <apps/shared/text_field_delegate.h>
diff --git a/apps/graph/values/derivative_parameter_controller.h b/apps/graph/values/derivative_parameter_controller.h
index eb13bb443..10d64bec0 100644
--- a/apps/graph/values/derivative_parameter_controller.h
+++ b/apps/graph/values/derivative_parameter_controller.h
@@ -2,7 +2,7 @@
 #define GRAPH_DERIVATIVE_PARAM_CONTROLLER_H
 
 #include <escher.h>
-#include "../cartesian_function_store.h"
+#include "../continuous_function_store.h"
 
 namespace Graph {
 
diff --git a/apps/graph/values/values_controller.h b/apps/graph/values/values_controller.h
index b7c4bf760..9aa3c844a 100644
--- a/apps/graph/values/values_controller.h
+++ b/apps/graph/values/values_controller.h
@@ -1,7 +1,7 @@
 #ifndef GRAPH_VALUES_CONTROLLER_H
 #define GRAPH_VALUES_CONTROLLER_H
 
-#include "../cartesian_function_store.h"
+#include "../continuous_function_store.h"
 #include "../../shared/buffer_function_title_cell.h"
 #include "../../shared/hideable_even_odd_buffer_text_cell.h"
 #include "../../shared/values_controller.h"