diff --git a/parallel_worlds_0/src/CMakeLists.txt b/parallel_worlds_0/src/CMakeLists.txt
index b7fe01daec965902fdd742defe0683dc76193161..8be0ca1a96e9fcd81aca63479ac34e0f73ed6fd8 100644
--- a/parallel_worlds_0/src/CMakeLists.txt
+++ b/parallel_worlds_0/src/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required( VERSION 3.1 )
-project( parallelwelten_0 )
+project( parallel_worlds_0 )
 
-set( EXECUTABLE DeviceQuery )
+set( EXECUTABLE ${PROJECT_NAME} )
 
 if( MSVC )
 	message( "MSVC: adding compiler flags" )
@@ -24,7 +24,7 @@ set(OpenCL_LIBRARIES ${OpenCL_LIBRARIES} CACHE FILEPATH "OpenCL libraries")
 
 message( "OpenCL include directory is: " ${OpenCL_INCLUDE_DIRS} )
 
-add_executable( ${EXECUTABLE} DeviceQuery.cpp )
+add_executable( ${EXECUTABLE} main.cpp )
 target_link_libraries( ${EXECUTABLE} ${OpenCL_LIBRARIES} )
 target_link_libraries( ${EXECUTABLE} ${OpenCV_LIBS} )
 
diff --git a/parallel_worlds_0/src/DeviceQuery.cpp b/parallel_worlds_0/src/main.cpp
similarity index 100%
rename from parallel_worlds_0/src/DeviceQuery.cpp
rename to parallel_worlds_0/src/main.cpp
diff --git a/parallel_worlds_1/src/CMakeLists.txt b/parallel_worlds_1/src/CMakeLists.txt
index 3bdc0c876f0d4f3845e4da129b056ce66376a68b..1e2bd5914a8c4d6873491200417e2c3991be5423 100644
--- a/parallel_worlds_1/src/CMakeLists.txt
+++ b/parallel_worlds_1/src/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required( VERSION 3.1 )
-project( parallelwelten_1 )
+project( parallel_worlds_1 )
 
-set( EXECUTABLE parallelwelten_1 )
+set( EXECUTABLE parallel_worlds_1 )
 
 if( MSVC )
 	message( "MSVC: adding compiler flags" )
diff --git a/parallel_worlds_2/src/CMakeLists.txt b/parallel_worlds_2/src/CMakeLists.txt
index 2b94dd2d4c4c943fad8f9d1b0c3e7f18bc33b5c5..74c59bbc7ff3510767355db6a0ca251eb5aa3dd6 100644
--- a/parallel_worlds_2/src/CMakeLists.txt
+++ b/parallel_worlds_2/src/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required( VERSION 3.1 )
-project( parallelwelten_2 )
+project( parallel_worlds_2 )
 
 set( EXECUTABLE parallelwelten_2 )
 
diff --git a/parallel_worlds_3/src/CMakeLists.txt b/parallel_worlds_3/src/CMakeLists.txt
index eb6d0b179c877aff863c84db1d0a5607e6f1fda6..ee669339c1b74bc30742ab01386320a1da02ddb4 100644
--- a/parallel_worlds_3/src/CMakeLists.txt
+++ b/parallel_worlds_3/src/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required( VERSION 3.1 )
-project( parallelwelten_3 )
+project( parallel_worlds_3 )
 
 set( EXECUTABLE parallelwelten_3 )