diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0973a788fe761802faf6d0387ed32ac74ddc7b54..2a57fedaec025efc11ef21be554c193026a80f61 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.6)
 
 # Configurable options for building Gaudi in the ATLAS software stack:
 option( GAUDI_ATLAS "Enable ATLAS-specific settings" OFF )
-set( GAUDI_ATLAS_BASE_PROJECT "AtlasExternals" CACHE STRING
+set( GAUDI_ATLAS_BASE_PROJECT "AthenaExternals" CACHE STRING
    "Name of the ATLAS base project to build Gaudi against" )
 
 # Ensure that we can find GaudiProjectConfig.cmake
diff --git a/cmake/GaudiProjectConfig.cmake b/cmake/GaudiProjectConfig.cmake
index 62c8ea3eee5e4172a1d74a2cc11eebc8220c6efc..5f0c443b33da0587c3d2b5446b2dc14b9d6bf7da 100644
--- a/cmake/GaudiProjectConfig.cmake
+++ b/cmake/GaudiProjectConfig.cmake
@@ -224,15 +224,6 @@ include(CMakeParseArguments)
 include(CMakeFunctionalUtils)
 include(BinaryTagUtils)
 
-find_package(PythonInterp 2.7)
-
-find_package(Boost)
-if((Boost_VERSION GREATER 106700) OR (Boost_VERSION EQUAL 106700))
-  set(boost_python_version "${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}")
-else()
-  set(boost_python_version "")
-endif()
-
 #-------------------------------------------------------------------------------
 # gaudi_project(project version
 #               [USE proj1 vers1 [proj2 vers2 ...]]
@@ -331,6 +322,15 @@ macro(gaudi_project project version)
     enable_testing()
   endif()
 
+  #-- Set up the boost_python_version variable for the project
+  find_package(PythonInterp 2.7)
+  find_package(Boost)
+  if((Boost_VERSION GREATER 106700) OR (Boost_VERSION EQUAL 106700))
+     set(boost_python_version "${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}")
+  else()
+     set(boost_python_version "")
+  endif()
+
   #--- Allow installation on failed builds
   add_custom_target(unsafe-install
                     COMMAND ${CMAKE_COMMAND} -P ${CMAKE_BINARY_DIR}/cmake_install.cmake)