diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt
index 21b11a23..e2271fd3 100644
--- a/library/CMakeLists.txt
+++ b/library/CMakeLists.txt
@@ -4,30 +4,30 @@ PROJECT(PolyVox)
 
 #By default only build static libraries on Windows but both on Linux
 #If we ever require CMake 2.8 then use http://www.kitware.com/blog/home/post/82
-option(BUILD_STATIC_LIBRARIES "Build static libraries" ON)
+option(ENABLE_STATIC_LIBRARIES "Build static libraries" ON)
 if(WIN32)
-	option(BUILD_DYNAMIC_LIBRARIES "Build dynamic libraries" OFF)
+	option(ENABLE_DYNAMIC_LIBRARIES "Build dynamic libraries" OFF)
 else()
-	option(BUILD_DYNAMIC_LIBRARIES "Build dynamic libraries" ON)
+	option(ENABLE_DYNAMIC_LIBRARIES "Build dynamic libraries" ON)
 endif()
 
 if(WIN32)
 	#If both are enabled then diable the dyanamic build
-	if(BUILD_STATIC_LIBRARIES AND BUILD_DYNAMIC_LIBRARIES)
+	if(ENABLE_STATIC_LIBRARIES AND ENABLE_DYNAMIC_LIBRARIES)
 		message(STATUS "Building both static and dynamic libraries is not supported on Windows. Disabling dynamic libraries.")
-		set(BUILD_DYNAMIC_LIBRARIES OFF CACHE BOOL "Build dynamic libraries" FORCE)
+		set(ENABLE_DYNAMIC_LIBRARIES OFF CACHE BOOL "Build dynamic libraries" FORCE)
 	endif()
 	#If both are diabled then re-enable the static build
-	if(NOT BUILD_STATIC_LIBRARIES AND NOT BUILD_DYNAMIC_LIBRARIES)
+	if(NOT ENABLE_STATIC_LIBRARIES AND NOT ENABLE_DYNAMIC_LIBRARIES)
 		message(STATUS "Both dynamic and static libraries were disabled - re-enabling static build.")
-		set(BUILD_STATIC_LIBRARIES ON CACHE BOOL "Build static libraries" FORCE)
+		set(ENABLE_STATIC_LIBRARIES ON CACHE BOOL "Build static libraries" FORCE)
 	endif()
 else()
 	#It's nonsense to disble both so on Linux, re-enable both.
-	if(NOT BUILD_STATIC_LIBRARIES AND NOT BUILD_DYNAMIC_LIBRARIES)
+	if(NOT ENABLE_STATIC_LIBRARIES AND NOT ENABLE_DYNAMIC_LIBRARIES)
 		message(STATUS "Both dynamic and static libraries were disabled - re-enabling both.")
-		set(BUILD_STATIC_LIBRARIES ON CACHE BOOL "Build static libraries" FORCE)
-		set(BUILD_DYNAMIC_LIBRARIES ON CACHE BOOL "Build dynamic libraries" FORCE)
+		set(ENABLE_STATIC_LIBRARIES ON CACHE BOOL "Build static libraries" FORCE)
+		set(ENABLE_DYNAMIC_LIBRARIES ON CACHE BOOL "Build dynamic libraries" FORCE)
 	endif()
 endif()
 
diff --git a/library/PolyVoxCore/CMakeLists.txt b/library/PolyVoxCore/CMakeLists.txt
index 528fae18..ca8adc40 100644
--- a/library/PolyVoxCore/CMakeLists.txt
+++ b/library/PolyVoxCore/CMakeLists.txt
@@ -113,7 +113,7 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/include)
 
 #Core
 #Build
-IF(BUILD_STATIC_LIBRARIES)
+IF(ENABLE_STATIC_LIBRARIES)
 	ADD_LIBRARY(PolyVoxCoreStatic STATIC ${CORE_SRC_FILES} ${CORE_INC_FILES} ${IMPL_SRC_FILES} ${IMPL_INC_FILES})
 	SET_TARGET_PROPERTIES(PolyVoxCoreStatic PROPERTIES OUTPUT_NAME "PolyVoxCore")
 	SET_TARGET_PROPERTIES(PolyVoxCoreStatic PROPERTIES VERSION ${POLYVOX_VERSION} SOVERSION ${POLYVOX_VERSION_MAJOR})
@@ -122,7 +122,7 @@ IF(BUILD_STATIC_LIBRARIES)
 	ENDIF(MSVC)
 	SET(PolyVoxCore_LIBRARY "PolyVoxCoreStatic")
 ENDIF()
-IF(BUILD_DYNAMIC_LIBRARIES)
+IF(ENABLE_DYNAMIC_LIBRARIES)
 	ADD_LIBRARY(PolyVoxCoreDynamic SHARED ${CORE_SRC_FILES} ${CORE_INC_FILES} ${IMPL_SRC_FILES} ${IMPL_INC_FILES})
 	SET_TARGET_PROPERTIES(PolyVoxCoreDynamic PROPERTIES OUTPUT_NAME "PolyVoxCore")
 	SET_TARGET_PROPERTIES(PolyVoxCoreDynamic PROPERTIES COMPILE_FLAGS "-DPOLYVOX_SHARED_EXPORTS")
@@ -135,14 +135,14 @@ ENDIF()
 
 #Install
 IF(WIN32)
-	IF(BUILD_STATIC_LIBRARIES)
+	IF(ENABLE_STATIC_LIBRARIES)
 		INSTALL(TARGETS PolyVoxCoreStatic
 			RUNTIME DESTINATION PolyVoxCore/bin COMPONENT library
 			LIBRARY DESTINATION PolyVoxCore/lib COMPONENT library
 			ARCHIVE DESTINATION PolyVoxCore/lib COMPONENT library
 		)
 	ENDIF()
-	IF(BUILD_DYNAMIC_LIBRARIES)
+	IF(ENABLE_DYNAMIC_LIBRARIES)
 		INSTALL(TARGETS PolyVoxCoreDynamic
 			RUNTIME DESTINATION PolyVoxCore/bin COMPONENT library
 			LIBRARY DESTINATION PolyVoxCore/lib COMPONENT library
@@ -159,14 +159,14 @@ IF(WIN32)
 	INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/Debug/PolyVoxCore.pdb DESTINATION PolyVoxCore/lib CONFIGURATIONS Debug)
 	INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo/PolyVoxCore.pdb DESTINATION PolyVoxCore/lib CONFIGURATIONS RelWithDebInfo)
 ELSE(WIN32)
-	IF(BUILD_STATIC_LIBRARIES)
+	IF(ENABLE_STATIC_LIBRARIES)
 		INSTALL(TARGETS PolyVoxCoreStatic
 			RUNTIME DESTINATION bin COMPONENT library
 			LIBRARY DESTINATION lib COMPONENT library
 			ARCHIVE DESTINATION lib COMPONENT library
 		)
 	ENDIF()
-	IF(BUILD_DYNAMIC_LIBRARIES)
+	IF(ENABLE_DYNAMIC_LIBRARIES)
 		INSTALL(TARGETS PolyVoxCoreDynamic
 			RUNTIME DESTINATION bin COMPONENT library
 			LIBRARY DESTINATION lib COMPONENT library
diff --git a/library/PolyVoxUtil/CMakeLists.txt b/library/PolyVoxUtil/CMakeLists.txt
index 3c2a78a4..5fc41d03 100644
--- a/library/PolyVoxUtil/CMakeLists.txt
+++ b/library/PolyVoxUtil/CMakeLists.txt
@@ -29,7 +29,7 @@ LINK_DIRECTORIES(${PolyVoxCore_BINARY_DIR}/debug ${PolyVoxCore_BINARY_DIR}/relea
 
 #Util
 #Build
-IF(BUILD_STATIC_LIBRARIES)
+IF(ENABLE_STATIC_LIBRARIES)
 	ADD_LIBRARY(PolyVoxUtilStatic STATIC ${UTIL_SRC_FILES} ${UTIL_INC_FILES})
 	TARGET_LINK_LIBRARIES(PolyVoxUtilStatic PolyVoxCore)
 	SET_TARGET_PROPERTIES(PolyVoxUtilStatic PROPERTIES OUTPUT_NAME "PolyVoxUtil")
@@ -39,7 +39,7 @@ IF(BUILD_STATIC_LIBRARIES)
 	ENDIF(MSVC)
 	ADD_DEPENDENCIES(PolyVoxUtilStatic PolyVoxCoreStatic)
 ENDIF()
-IF(BUILD_DYNAMIC_LIBRARIES)
+IF(ENABLE_DYNAMIC_LIBRARIES)
 	ADD_LIBRARY(PolyVoxUtilDynamic SHARED ${UTIL_SRC_FILES} ${UTIL_INC_FILES})
 	TARGET_LINK_LIBRARIES(PolyVoxUtilDynamic PolyVoxCore)
 	SET_TARGET_PROPERTIES(PolyVoxUtilDynamic PROPERTIES OUTPUT_NAME "PolyVoxUtil")
@@ -53,14 +53,14 @@ ENDIF()
 
 #Install
 IF(WIN32)
-	IF(BUILD_STATIC_LIBRARIES)
+	IF(ENABLE_STATIC_LIBRARIES)
 		INSTALL(TARGETS PolyVoxUtilStatic
 			RUNTIME DESTINATION PolyVoxUtil/bin COMPONENT library
 			LIBRARY DESTINATION PolyVoxUtil/lib COMPONENT library
 			ARCHIVE DESTINATION PolyVoxUtil/lib COMPONENT library
 		)
 	ENDIF()
-	IF(BUILD_DYNAMIC_LIBRARIES)
+	IF(ENABLE_DYNAMIC_LIBRARIES)
 		INSTALL(TARGETS PolyVoxUtilDynamic
 			RUNTIME DESTINATION PolyVoxUtil/bin COMPONENT library
 			LIBRARY DESTINATION PolyVoxUtil/lib COMPONENT library
@@ -77,14 +77,14 @@ IF(WIN32)
 	INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/Debug/PolyVoxUtil.pdb DESTINATION PolyVoxUtil/lib CONFIGURATIONS Debug)
 	INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo/PolyVoxUtil.pdb DESTINATION PolyVoxUtil/lib CONFIGURATIONS RelWithDebInfo)
 ELSE(WIN32)
-	IF(BUILD_STATIC_LIBRARIES)
+	IF(ENABLE_STATIC_LIBRARIES)
 		INSTALL(TARGETS PolyVoxUtilStatic
 			RUNTIME DESTINATION bin COMPONENT library
 			LIBRARY DESTINATION lib COMPONENT library
 			ARCHIVE DESTINATION lib COMPONENT library
 		)
 	ENDIF()
-	IF(BUILD_DYNAMIC_LIBRARIES)
+	IF(ENABLE_DYNAMIC_LIBRARIES)
 		INSTALL(TARGETS PolyVoxUtilDynamic
 			RUNTIME DESTINATION bin COMPONENT library
 			LIBRARY DESTINATION lib COMPONENT library