diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6ceae58d4..83375e97c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -165,6 +165,10 @@ IF(MSVC)
 	ENDIF(MSVC11)
 
 	ADD_COMPILER_FLAGS("/D_CRT_SECURE_NO_DEPRECATE /D_CRT_SECURE_NO_WARNINGS /D_CRT_NONSTDC_NO_WARNINGS /DWIN32 /D_WINDOWS /Zm1000 /wd4250")
+	
+	ADD_DEFINITIONS(
+      /Zc:wchar_t-                                # Treat wchar_t as built-in type
+	)
 ENDIF()
 
 ############### Configure checks ###############
diff --git a/samples/CMakeLists.txt b/samples/CMakeLists.txt
index 4ec2bec48..2e087986a 100644
--- a/samples/CMakeLists.txt
+++ b/samples/CMakeLists.txt
@@ -1,6 +1,6 @@
-ADD_SUBDIRECTORY(Logging)
+ADD_SUBDIRECTORY(logging)
 ADD_SUBDIRECTORY(com_server)
 ADD_SUBDIRECTORY(com_client)
-ADD_SUBDIRECTORY(Geodetic2Ecef)
+ADD_SUBDIRECTORY(geodetic2ecef)
 ADD_SUBDIRECTORY(interpolator)
 ADD_SUBDIRECTORY(config)
\ No newline at end of file
diff --git a/samples/geodetic2ecef/CMakeLists.txt b/samples/geodetic2ecef/CMakeLists.txt
index b3afc69b1..0b3848fa2 100644
--- a/samples/geodetic2ecef/CMakeLists.txt
+++ b/samples/geodetic2ecef/CMakeLists.txt
@@ -1,6 +1,6 @@
 FILE(GLOB SRC *.cpp)
 
-ADD_EXECUTABLE(sample_Geodetic2Ecef ${SRC})
+ADD_EXECUTABLE(sample_geodetic2ecef ${SRC})
 
-TARGET_LINK_LIBRARIES(sample_Geodetic2Ecef blackmisc blackcore ${QT_LIBRARIES})
-SET_TARGET_PROPERTIES(sample_Geodetic2Ecef PROPERTIES PROJECT_LABEL "Samples - Geodetic to Ecef")
\ No newline at end of file
+TARGET_LINK_LIBRARIES(sample_geodetic2ecef blackmisc blackcore ${QT_LIBRARIES})
+SET_TARGET_PROPERTIES(sample_geodetic2ecef PROPERTIES PROJECT_LABEL "Samples - Geodetic to Ecef")
\ No newline at end of file