diff --git a/cmake/InstallGDML.cmake b/cmake/InstallGDML.cmake
index 39b1c6031da40e4f737035af85372452572986b7..5f83529f5c38ce734d9ac71df32a05256600fab4 100644
--- a/cmake/InstallGDML.cmake
+++ b/cmake/InstallGDML.cmake
@@ -1,5 +1,5 @@
-IF( NOT GDML_VERSION )
-    SET( GDML_VERSION "master" )
+IF( NOT GDML_TAG )
+    SET( GDML_TAG "master" )
 ENDIF()
 
 EXTERNALPROJECT_ADD(
@@ -9,7 +9,7 @@ EXTERNALPROJECT_ADD(
     DEPENDS XERCES Geant4 
 
     GIT_REPOSITORY "https://github.com/slaclab/gdml"
-    GIT_TAG ${GDML_VERSION}
+    GIT_TAG ${GDML_TAG}
     
     UPDATE_COMMAND ""
     PATCH_COMMAND ""
diff --git a/cmake/InstallGeant4.cmake b/cmake/InstallGeant4.cmake
index fb78efbb0d903ec7575d623149ecc2befcf36628..6cfbbc03f22c7f896d731947f39229ac60fa0f31 100644
--- a/cmake/InstallGeant4.cmake
+++ b/cmake/InstallGeant4.cmake
@@ -1,8 +1,8 @@
-IF( NOT Geant4_VERSION )
-    SET( Geant4_VERSION "v10.3.1" )
+IF( NOT Geant4_TAG )
+    SET( Geant4_TAG "v10.3.1" )
 ENDIF()
 
-IF ( Geant4_VERSION EQUAL "master" )
+IF ( Geant4_TAG EQUAL "master" )
     MESSAGE( FATAL_ERROR "Installing Geant4 from github master is not allowed." )
 ENDIF()
 
@@ -14,7 +14,7 @@ EXTERNALPROJECT_ADD(
     Geant4
 
     GIT_REPOSITORY "https://github.com/Geant4/geant4"
-    GIT_TAG ${GEANT4_VERSION}
+    GIT_TAG ${GEANT4_TAG}
     
     UPDATE_COMMAND ""
     PATCH_COMMAND ""
@@ -26,5 +26,5 @@ EXTERNALPROJECT_ADD(
     BUILD_COMMAND make -j4
 )
 
-STRING( REPLACE "v" "" Geant4_VERSION_NUMBER ${Geant4_VERSION} )
+STRING( REPLACE "v" "" Geant4_VERSION_NUMBER ${Geant4_TAG} )
 SET( Geant4_DIR ${DEPENDENCY_INSTALL_DIR}/geant4/lib64/Geant4-${Geant4_VERSION_NUMBER} CACHE PATH "Geant4 install dir" FORCE )
diff --git a/cmake/InstallLCDD.cmake b/cmake/InstallLCDD.cmake
index 761fe157796960f3edfb57c89da3e1b810fd6cea..a0081107ff081a6071f544400aa43c19382cfa28 100644
--- a/cmake/InstallLCDD.cmake
+++ b/cmake/InstallLCDD.cmake
@@ -1,5 +1,5 @@
-IF( NOT LCDD_VERSION )
-    SET( LCDD_VERSION "master" )
+IF( NOT LCDD_TAG )
+    SET( LCDD_TAG "master" )
 ENDIF()
 
 EXTERNALPROJECT_ADD(
@@ -8,7 +8,7 @@ EXTERNALPROJECT_ADD(
     DEPENDS XERCES Geant4 GDML
 
     GIT_REPOSITORY "https://github.com/slaclab/lcdd"
-    GIT_TAG ${LCDD_VERSION}
+    GIT_TAG ${LCDD_TAG}
     
     UPDATE_COMMAND ""
     PATCH_COMMAND ""
diff --git a/cmake/InstallLCIO.cmake b/cmake/InstallLCIO.cmake
index 84b14f8c32e459fba5bfeb33f92443b5d3995b0b..dbe09a2d1b4ba848806a544a77ae9a1f88685ad5 100644
--- a/cmake/InstallLCIO.cmake
+++ b/cmake/InstallLCIO.cmake
@@ -1,12 +1,12 @@
-IF( NOT LCIO_VERSION )
-    SET( LCIO_VERSION "master" )
+IF( NOT LCIO_TAG )
+    SET( LCIO_TAG "master" )
 ENDIF()
 
 EXTERNALPROJECT_ADD(
     LCIO
 
     GIT_REPOSITORY "https://github.com/iLCSoft/LCIO"
-    GIT_TAG ${LCIO_VERSION}
+    GIT_TAG ${LCIO_TAG}
     
     UPDATE_COMMAND ""
     PATCH_COMMAND ""