diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt
index 499561c0144a27e1daad52e197d5568264dfa848..e149c14e7cf8e9bb1b1fb89b8ae3445daf1b2e45 100644
--- a/python/CMakeLists.txt
+++ b/python/CMakeLists.txt
@@ -3,7 +3,7 @@ STRING(REGEX REPLACE "-" "_" PY_NAME ${PROJECT_NAME})
 ADD_REQUIRED_DEPENDENCY("eigenpy")
 
 # Define the wrapper library that wraps our library
-add_library( ${PY_NAME} SHARED spline_python.cpp )
+add_library( ${PY_NAME} SHARED curve_python.cpp )
 #~ target_link_libraries( centroidal_dynamics ${Boost_LIBRARIES} ${PROJECT_NAME} )
 # don't prepend wrapper library name with lib
 set_target_properties( ${PY_NAME} PROPERTIES PREFIX "" )
@@ -18,4 +18,4 @@ INSTALL(
   TARGETS ${PY_NAME}	DESTINATION ${PYTHON_SITELIB}
   )
 
-ADD_PYTHON_UNIT_TEST("python-spline" "python/test/test.py" "python")
+ADD_PYTHON_UNIT_TEST("python-curve" "python/test/test.py" "python")
diff --git a/python/spline_python.cpp b/python/curve_python.cpp
similarity index 100%
rename from python/spline_python.cpp
rename to python/curve_python.cpp
diff --git a/python/test/test.py b/python/test/test.py
index 0b3406d01a3285185f5b07ca1dabdb57f8d145e1..c35a8788c3b41c3ee2cbf9d937e037b096e109fa 100644
--- a/python/test/test.py
+++ b/python/test/test.py
@@ -9,8 +9,8 @@ from numpy.testing import assert_allclose
 from curves import bezier3, bezier6, curve_constraints, exact_cubic, from_bezier, polynom, spline_deriv_constraint
 
 
-class TestSpline(unittest.TestCase):
-    def test_spline(self):
+class TestCurve(unittest.TestCase):
+    def test_curve(self):
         waypoints = matrix([[1., 2., 3.], [4., 5., 6.]]).T
         waypoints6 = matrix([[1., 2., 3., 7., 5., 5.], [4., 5., 6., 4., 5., 6.]]).T
         time_waypoints = matrix([0., 1.]).T
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 70960bbbfd3df38d9fe09ab0138fc8c6e1ef02d9..e03c2b0434e161f67df8e1c89f78049b7f9eda65 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -1,3 +1,3 @@
 ADD_UNIT_TEST(
-				spline_tests Main.cpp
+				curve_tests Main.cpp
 )