diff --git a/examples/c++/CMakeLists.txt b/examples/c++/CMakeLists.txt
index 68553354..0fa132ba 100644
--- a/examples/c++/CMakeLists.txt
+++ b/examples/c++/CMakeLists.txt
@@ -3,16 +3,10 @@ file (GLOB example_src_list RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.cxx")
 
 # - Handle special cases here --------------------------------------------------
 
-# Test humidity interface for 2 sensor libraries
-add_example(interfaces-humiditysensor.cxx TARGETS si7005 bmp280)
-# Test pressure interface for 2 sensor libraries
-add_example(interfaces-pressuresensor.cxx TARGETS bmp280 bmpx8x)
-# Test temperature interface for 3 sensor libraries
-add_example(interfaces-temperaturesensor.cxx TARGETS bmp280 bmpx8x si7005)
-# Test light interface for 2 sensor libraries
-add_example(interfaces-lightsensor.cxx TARGETS si1132 max44009)
-# Test light controller interface for 3 sensor libraries
-add_example(interfaces-lightcontroller.cxx TARGETS lp8860 ds1808lc hlg150h)
+# Test temperature interface for 2 sensor libraries
+add_example(iTemperature-sample.cxx TARGETS lm35 abp)
+# Test light interface for 3 sensor libraries
+add_example(iLight-sample.cxx TARGETS apds9002 bh1750 max44009)
 
 # - Create an executable for all other src files in this directory -------------
 foreach (_example_src ${example_src_list})