diff --git a/LibCarla/cmake/server/CMakeLists.txt b/LibCarla/cmake/server/CMakeLists.txt
index 7a35aac9a..39c56db53 100644
--- a/LibCarla/cmake/server/CMakeLists.txt
+++ b/LibCarla/cmake/server/CMakeLists.txt
@@ -35,10 +35,10 @@ install(FILES ${libcarla_carla_streaming_low_level_headers} DESTINATION include/
 install(DIRECTORY "${BOOST_INCLUDE_PATH}/boost" DESTINATION include)
 
 if(WIN32)
-  file(GLOB boostlib_date_time "${BOOST_LIBRARY_PATH}/libboost_date_time-*-mt-*.lib")
+  file(GLOB boostlib_date_time "${BOOST_LIB_PATH}/libboost_date_time-*-mt-*.lib")
   install(FILES ${boostlib_date_time} DESTINATION lib)
 
-  file(GLOB boostlib_system "${BOOST_LIBRARY_PATH}/libboost_system-*-mt-*.lib")
+  file(GLOB boostlib_system "${BOOST_LIB_PATH}/libboost_system-*-mt-*.lib")
   install(FILES ${boostlib_system} DESTINATION lib)
 endif()
 
diff --git a/Util/BuildTools/Setup.bat b/Util/BuildTools/Setup.bat
index 92ec9d584..5537f85ad 100644
--- a/Util/BuildTools/Setup.bat
+++ b/Util/BuildTools/Setup.bat
@@ -149,7 +149,7 @@ set CMAKE_INSTALLATION_DIR=%INSTALLATION_DIR:\=/%
 >>"%INSTALLATION_DIR%CMakeLists.txt.in" echo add_definitions(-DBOOST_ERROR_CODE_HEADER_ONLY)
 >>"%INSTALLATION_DIR%CMakeLists.txt.in" echo.
 >>"%INSTALLATION_DIR%CMakeLists.txt.in" echo set(BOOST_INCLUDE_PATH "%CMAKE_INSTALLATION_DIR%boost-install/include")
->>"%INSTALLATION_DIR%CMakeLists.txt.in" echo set(BOOST_LIBRARY_PATH "%CMAKE_INSTALLATION_DIR%boost-install/lib")
+>>"%INSTALLATION_DIR%CMakeLists.txt.in" echo set(BOOST_LIB_PATH "%CMAKE_INSTALLATION_DIR%boost-install/lib")
 >>"%INSTALLATION_DIR%CMakeLists.txt.in" echo.
 >>"%INSTALLATION_DIR%CMakeLists.txt.in" echo set(RPCLIB_INCLUDE_PATH "%CMAKE_INSTALLATION_DIR%rpclib-install/include")
 >>"%INSTALLATION_DIR%CMakeLists.txt.in" echo set(RPCLIB_LIB_PATH "%CMAKE_INSTALLATION_DIR%rpclib-install/lib")