diff --git a/CMakeLists.txt b/CMakeLists.txt
index be4623f1106fc2a05fe88fae2c6d46a0b8cc0dbe..daeb512137849d6003cc275592b22f9f2ccdfa6f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -279,12 +279,12 @@ set(hpp_for_lib
 #file(GLOB_RECURSE hpp_for_lib ${PROJECT_SOURCE_DIR}/*.hpp)
 LIST(APPEND source_files ${hpp_for_lib} ${cpp_for_lib})
 
-add_library(turtle ${source_files})
+add_library(TurTLE ${source_files})
 
-target_link_libraries(turtle ${TURTLE_LIBS})
+target_link_libraries(TurTLE ${TURTLE_LIBS})
 
-install(TARGETS turtle EXPORT TURTLE_EXPORT DESTINATION lib/ )
-install(DIRECTORY ${PROJECT_SOURCE_DIR}/cpp/ DESTINATION include/turtle/ FILES_MATCHING PATTERN "*.h*")
+install(TARGETS TurTLE EXPORT TURTLE_EXPORT DESTINATION lib/ )
+install(DIRECTORY ${PROJECT_SOURCE_DIR}/cpp/ DESTINATION include/TurTLE/ FILES_MATCHING PATTERN "*.h*")
 
 #####################################################################################
 ## Export the configuration
@@ -292,18 +292,18 @@ install(DIRECTORY ${PROJECT_SOURCE_DIR}/cpp/ DESTINATION include/turtle/ FILES_M
 configure_file(${PROJECT_SOURCE_DIR}/cmake/TurTLEConfig.cmake.in ${PROJECT_BINARY_DIR}/TurTLEConfig.cmake @ONLY)
 
 install(FILES "${PROJECT_BINARY_DIR}/TurTLEConfig.cmake" DESTINATION lib/)
-export(TARGETS turtle FILE "${PROJECT_BINARY_DIR}/TurTLELibraryDepends.cmake")
+export(TARGETS TurTLE FILE "${PROJECT_BINARY_DIR}/TurTLELibraryDepends.cmake")
 install(EXPORT TURTLE_EXPORT DESTINATION lib/)
 
 
 #####################################################################################
 ## Install the python wrapper
 # copy command
-install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E copy_directory ${PROJECT_SOURCE_DIR}/turtle ${PROJECT_BINARY_DIR}/python/turtle/)")
+install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E copy_directory ${PROJECT_SOURCE_DIR}/TurTLE ${PROJECT_BINARY_DIR}/python/TurTLE/)")
 if(EXISTS "${PROJECT_SOURCE_DIR}/host_info.py")
-    install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E copy ${PROJECT_SOURCE_DIR}/host_info.py ${PROJECT_BINARY_DIR}/python/turtle/)")
+    install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E copy ${PROJECT_SOURCE_DIR}/host_info.py ${PROJECT_BINARY_DIR}/python/TurTLE/)")
 else()
-    install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E copy ${PROJECT_SOURCE_DIR}/pc_host_info.py ${PROJECT_BINARY_DIR}/python/turtle/host_info.py)")
+    install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E copy ${PROJECT_SOURCE_DIR}/pc_host_info.py ${PROJECT_BINARY_DIR}/python/TurTLE/host_info.py)")
 endif()
 install(CODE "execute_process(COMMAND python ${PROJECT_SOURCE_DIR}/setup.py install --force --prefix=${CMAKE_INSTALL_PREFIX} WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/python/)")
 
diff --git a/TurTLE/test/test_bfps_NSVEparticles.py b/TurTLE/test/test_turtle_NSVEparticles.py
similarity index 100%
rename from TurTLE/test/test_bfps_NSVEparticles.py
rename to TurTLE/test/test_turtle_NSVEparticles.py
diff --git a/setup.py b/setup.py
index 6d31877e68cf290a7bb603df5d5d483cb304bacc..9f5900fa57fe1299ffda83aebe5e889839b4e4a6 100644
--- a/setup.py
+++ b/setup.py
@@ -80,11 +80,11 @@ setup(
         package_data = {'TurTLE': ['test/B32p1e4_checkpoint_0.h5']},
         entry_points = {
             'console_scripts': [
-                'turtle = turtle.__main__:main',
-                'turtle.test_NSVEparticles = turtle.test.test_turtle_NSVEparticles:main',
-                'turtle.test_particles = turtle.test.test_particles:main',
-                'turtle.test_Parseval = turtle.test.test_Parseval:main',
-                'turtle.test_fftw = turtle.test.test_fftw:main'],
+                'turtle = TurTLE.__main__:main',
+                'turtle.test_NSVEparticles = TurTLE.test.test_turtle_NSVEparticles:main',
+                'turtle.test_particles = TurTLE.test.test_particles:main',
+                'turtle.test_Parseval = TurTLE.test.test_Parseval:main',
+                'turtle.test_fftw = TurTLE.test.test_fftw:main'],
             },
         version = VERSION,
 ########################################################################