diff --git a/CIbuild.sh b/CIbuild.sh
index df023316e..5d95f88a6 100755
--- a/CIbuild.sh
+++ b/CIbuild.sh
@@ -2,9 +2,9 @@
 
 set -e
 
-export BUILD_SERIES_NAME="Travis $CC $TRAVIS_MCSERVER_BUILD_TYPE"
-export BUILD_ID=$TRAVIS_JOB_NUMBER
-export BUILD_DATETIME=`date`
+export MCSERVER_BUILD_SERIES_NAME="Travis $CC $TRAVIS_MCSERVER_BUILD_TYPE"
+export MCSERVER_BUILD_ID=$TRAVIS_JOB_NUMBER
+export MCSERVER_BUILD_DATETIME=`date`
 
 cmake . -DBUILD_TOOLS=1 -DSELF_TEST=1;
 make -j 2;
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8f58f157a..188cf81e3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -18,12 +18,12 @@ if(DEFINED ENV{TRAVIS_BUILD_WITH_COVERAGE})
 	set(BUILD_WITH_COVERAGE $ENV{TRAVIS_BUILD_WITH_COVERAGE})
 endif()
 
-if(DEFINED ENV{BUILD_ID})
-	set(BUILD_ID $ENV{BUILD_ID})
-	set(BUILD_SERIES_NAME $ENV{BUILD_SERIES_NAME})
-	set(BUILD_DATETIME $ENV{BUILD_DATETIME})
-	if(DEFINED ENV{BUILD_COMMIT_ID})
-		set(BUILD_COMMIT_ID $ENV{BUILD_COMMIT_ID})
+if(DEFINED ENV{MCSERVER_BUILD_ID})
+	set(BUILD_ID $ENV{MCSERVER_BUILD_ID})
+	set(BUILD_SERIES_NAME $ENV{MCSERVER_BUILD_SERIES_NAME})
+	set(BUILD_DATETIME $ENV{MCSERVER_BUILD_DATETIME})
+	if(DEFINED ENV{MCSERVER_BUILD_COMMIT_ID})
+		set(BUILD_COMMIT_ID $ENV{MCSERVER_BUILD_COMMIT_ID})
 	else()
 		message("Commit id not set, attempting to determine id from git")
 		execute_process(