diff --git a/samples/CMakeLists.txt b/samples/CMakeLists.txt
index 1a4f0ac..2e7b8db 100644
--- a/samples/CMakeLists.txt
+++ b/samples/CMakeLists.txt
@@ -89,7 +89,7 @@ else()
   # samples above device layer
 
   make_executable(camera_with_junior_device_api
-    SRCS device_camera.cc
+    SRCS camera_with_junior_device_api.cc
     LINK_LIBS mynteye ${OpenCV_LIBS}
     DLL_SEARCH_PATHS ${PRO_DIR}/_install/bin ${OpenCV_LIB_SEARCH_PATH}
   )
@@ -100,7 +100,7 @@ else()
     ## camera_a
 
     make_executable(camera_with_senior_api
-    SRCS api_camera.cc
+    SRCS camera_with_senior_api.cc
     LINK_LIBS mynteye ${OpenCV_LIBS}
     DLL_SEARCH_PATHS ${PRO_DIR}/_install/bin ${OpenCV_LIB_SEARCH_PATH}
     )
@@ -108,7 +108,7 @@ else()
     ## get_depth_with_region
 
     make_executable(get_depth_with_region
-    SRCS api_get_depth_with_region.cc
+    SRCS get_depth_with_region.cc
     LINK_LIBS mynteye ${OpenCV_LIBS}
     DLL_SEARCH_PATHS ${PRO_DIR}/_install/bin ${OpenCV_LIB_SEARCH_PATH}
     )
@@ -194,48 +194,48 @@ if(WITH_API)
 
   ## data
 
-  make_executable2(get_device_info SRCS data_get_device_info.cc WITH_OPENCV)
-  make_executable2(get_img_params SRCS data_get_img_params.cc WITH_OPENCV)
-  make_executable2(get_imu_params SRCS data_get_imu_params.cc WITH_OPENCV)
+  make_executable2(get_device_info SRCS get_device_info.cc WITH_OPENCV)
+  make_executable2(get_img_params SRCS get_img_params.cc WITH_OPENCV)
+  make_executable2(get_imu_params SRCS get_imu_params.cc WITH_OPENCV)
 
-  make_executable2(get_stereo_rectified SRCS data_get_stereo_rectified.cc WITH_OPENCV)
-  make_executable2(get_disparity SRCS data_get_disparity.cc WITH_OPENCV)
-  make_executable2(get_depth SRCS data_get_depth.cc WITH_OPENCV)
+  make_executable2(get_stereo_rectified SRCS get_stereo_rectified.cc WITH_OPENCV)
+  make_executable2(get_disparity SRCS get_disparity.cc WITH_OPENCV)
+  make_executable2(get_depth SRCS get_depth.cc WITH_OPENCV)
 
-  make_executable2(get_data_without_select SRCS data_get_data_without_select.cc WITH_OPENCV)
+  make_executable2(get_data_without_select SRCS get_data_without_select.cc WITH_OPENCV)
   make_executable2(get_imu_correspondence
-  SRCS data_get_imu_correspondence.cc util_cv_painter.cc
+  SRCS get_imu_correspondence.cc util_cv.cc
   WITH_OPENCV
   )
-  make_executable2(get_imu SRCS data_get_imu.cc util_cv_painter.cc WITH_OPENCV)
-  make_executable2(save_single_image SRCS data_save_single_image.cc WITH_OPENCV)
+  make_executable2(get_imu SRCS get_imu.cc util_cv.cc WITH_OPENCV)
+  make_executable2(save_single_image SRCS save_single_image.cc WITH_OPENCV)
   make_executable2(get_from_callbacks
-  SRCS data_get_from_callbacks.cc util_cv_painter.cc
+  SRCS get_from_callbacks.cc util_cv.cc
   WITH_OPENCV
   )
-  make_executable2(get_with_plugin SRCS data_get_with_plugin.cc WITH_OPENCV)
+  make_executable2(get_with_plugin SRCS get_with_plugin.cc WITH_OPENCV)
 
   ## control
 
-  make_executable2(ctrl_framerate SRCS control_framerate.cc WITH_OPENCV)
-  make_executable2(ctrl_imu_low_pass_filter SRCS control_imu_low_pass_filter.cc WITH_OPENCV)
-  make_executable2(ctrl_imu_range SRCS control_imu_range.cc WITH_OPENCV)
-  make_executable2(ctrl_infrared SRCS control_infrared.cc WITH_OPENCV)
-  make_executable2(ctrl_iic_address SRCS control_iic_address.cc WITH_OPENCV)
-  make_executable2(ctrl_sync_timestamp SRCS control_sync_timestamp.cc WITH_OPENCV)
+  make_executable2(ctrl_framerate SRCS ctrl_framerate.cc WITH_OPENCV)
+  make_executable2(ctrl_imu_low_pass_filter SRCS ctrl_imu_low_pass_filter.cc WITH_OPENCV)
+  make_executable2(ctrl_imu_range SRCS ctrl_imu_range.cc WITH_OPENCV)
+  make_executable2(ctrl_infrared SRCS ctrl_infrared.cc WITH_OPENCV)
+  make_executable2(ctrl_iic_address SRCS ctrl_iic_address.cc WITH_OPENCV)
+  make_executable2(ctrl_sync_timestamp SRCS ctrl_sync_timestamp.cc WITH_OPENCV)
   make_executable2(ctrl_auto_exposure
-  SRCS control_auto_exposure.cc util_cv_painter.cc
+  SRCS ctrl_auto_exposure.cc util_cv.cc
   WITH_OPENCV
   )
   make_executable2(ctrl_manual_exposure
-  SRCS control_manual_exposure.cc util_cv_painter.cc
+  SRCS ctrl_manual_exposure.cc util_cv.cc
   WITH_OPENCV
   )
 
   if(PCL_FOUND)
 
     make_executable2(get_depth_and_points
-    SRCS intermediate_get_depth_and_points.cc util_cv_painter.cc util_pc_viewer.cc
+    SRCS get_depth_and_points.cc util_cv.cc util_pcl.cc
     WITH_OPENCV WITH_PCL
     )
 
diff --git a/samples/ctrl_auto_exposure.cc b/samples/ctrl_auto_exposure.cc
index f506a78..13c54ed 100644
--- a/samples/ctrl_auto_exposure.cc
+++ b/samples/ctrl_auto_exposure.cc
@@ -16,7 +16,7 @@
 #include "mynteye/logger.h"
 #include "mynteye/api/api.h"
 
-#include "util_cv_painter.h"
+#include "util_cv.h"
 
 MYNTEYE_USE_NAMESPACE
 
diff --git a/samples/ctrl_manual_exposure.cc b/samples/ctrl_manual_exposure.cc
index 1471e67..b843742 100644
--- a/samples/ctrl_manual_exposure.cc
+++ b/samples/ctrl_manual_exposure.cc
@@ -16,7 +16,7 @@
 #include "mynteye/logger.h"
 #include "mynteye/api/api.h"
 
-#include "util_cv_painter.h"
+#include "util_cv.h"
 
 MYNTEYE_USE_NAMESPACE
 
diff --git a/samples/intermediate_get_depth_and_points.cc b/samples/get_depth_and_points.cc
similarity index 99%
rename from samples/intermediate_get_depth_and_points.cc
rename to samples/get_depth_and_points.cc
index d13b3ed..6ac365c 100644
--- a/samples/intermediate_get_depth_and_points.cc
+++ b/samples/get_depth_and_points.cc
@@ -17,8 +17,8 @@
 // #include "mynteye/logger.h"
 #include "mynteye/api/api.h"
 
-#include "util_cv_painter.h"
-#include "util_pc_viewer.h"
+#include "util_cv.h"
+#include "util_pcl.h"
 
 namespace {
 
diff --git a/samples/api_get_depth_with_region.cc b/samples/get_depth_with_region.cc
similarity index 100%
rename from samples/api_get_depth_with_region.cc
rename to samples/get_depth_with_region.cc
diff --git a/samples/get_from_callbacks.cc b/samples/get_from_callbacks.cc
index b0d166e..c714997 100644
--- a/samples/get_from_callbacks.cc
+++ b/samples/get_from_callbacks.cc
@@ -21,7 +21,7 @@
 #include "mynteye/logger.h"
 #include "mynteye/api/api.h"
 
-#include "util_cv_painter.h"
+#include "util_cv.h"
 
 MYNTEYE_USE_NAMESPACE
 
diff --git a/samples/get_imu.cc b/samples/get_imu.cc
index 8da15dd..a0341c3 100644
--- a/samples/get_imu.cc
+++ b/samples/get_imu.cc
@@ -16,7 +16,7 @@
 #include "mynteye/logger.h"
 #include "mynteye/api/api.h"
 
-#include "util_cv_painter.h"
+#include "util_cv.h"
 
 MYNTEYE_USE_NAMESPACE
 
diff --git a/samples/get_imu_correspondence.cc b/samples/get_imu_correspondence.cc
index ded1391..5cc56cc 100644
--- a/samples/get_imu_correspondence.cc
+++ b/samples/get_imu_correspondence.cc
@@ -16,7 +16,7 @@
 #include "mynteye/logger.h"
 #include "mynteye/api/api.h"
 
-#include "util_cv_painter.h"
+#include "util_cv.h"
 
 // #define CHECK_ACCEL_THEN_GYRO
 #define SEQ_FIRST  1  // accel
diff --git a/samples/util_cv.cc b/samples/util_cv.cc
index ab694c9..1911d78 100644
--- a/samples/util_cv.cc
+++ b/samples/util_cv.cc
@@ -11,7 +11,7 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-#include "util_cv_painter.h"
+#include "util_cv.h"
 
 #include <iomanip>
 #include <iostream>
diff --git a/samples/util_pcl.cc b/samples/util_pcl.cc
index e936aaa..4c46a0e 100644
--- a/samples/util_pcl.cc
+++ b/samples/util_pcl.cc
@@ -11,7 +11,7 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-#include "util_pc_viewer.h"
+#include "util_pcl.h"
 
 // #include <pcl/common/common_headers.h>