diff --git a/DetectorDescription/FaserReadoutGeometry/CMakeLists.txt b/DetectorDescription/FaserReadoutGeometry/CMakeLists.txt
index 7866144d75d7dc4784c79dbf226f27049572f6c1..df6eddbb2ac80b097c1987635c21481b21e5ea5f 100644
--- a/DetectorDescription/FaserReadoutGeometry/CMakeLists.txt
+++ b/DetectorDescription/FaserReadoutGeometry/CMakeLists.txt
@@ -27,7 +27,7 @@ atlas_depends_on_subdirs( PUBLIC
 # External dependencies:
 find_package( CLHEP )
 find_package( Eigen )
-find_package( GeoModel )
+find_package( GeoModelCore )
 
 # Component(s) in the package:
 atlas_add_library( FaserReadoutGeometry
diff --git a/DetectorDescription/GeoModel/GeoModelFaserUtilities/CMakeLists.txt b/DetectorDescription/GeoModel/GeoModelFaserUtilities/CMakeLists.txt
index 8028900c7cd120007a76e591d4ec9f9dc44d4b0f..f138e9339149260279701ccb17147428255889bf 100644
--- a/DetectorDescription/GeoModel/GeoModelFaserUtilities/CMakeLists.txt
+++ b/DetectorDescription/GeoModel/GeoModelFaserUtilities/CMakeLists.txt
@@ -23,7 +23,7 @@ atlas_depends_on_subdirs( PUBLIC
 find_package( Boost COMPONENTS filesystem thread system )
 find_package( Eigen )
 find_package( CORAL COMPONENTS CoralBase CoralKernel RelationalAccess )
-find_package( GeoModel )
+find_package( GeoModelCore )
 
 # Component(s) in the package:
 atlas_add_library( GeoModelFaserUtilities
diff --git a/DetectorDescription/GeoModel/GeoModelSvc/CMakeLists.txt b/DetectorDescription/GeoModel/GeoModelSvc/CMakeLists.txt
index d4ba92d12c5e02a9659d8ccb42bcab6c244b3c19..381aa7c5ca6e89cc272a09ace40af3027806cb89 100644
--- a/DetectorDescription/GeoModel/GeoModelSvc/CMakeLists.txt
+++ b/DetectorDescription/GeoModel/GeoModelSvc/CMakeLists.txt
@@ -26,7 +26,7 @@ find_package( Boost COMPONENTS filesystem thread system )
 find_package( CORAL COMPONENTS CoralBase CoralKernel RelationalAccess )
 
 
-find_package( GeoModel )
+find_package( GeoModelCore )
 
 # Component(s) in the package:
 atlas_add_component( GeoModelSvc
diff --git a/DetectorDescription/GeoModel/GeoModelTest/CMakeLists.txt b/DetectorDescription/GeoModel/GeoModelTest/CMakeLists.txt
index 900dbf3e9228aeab263d3760218d3521f2b53b14..5e1e09ed0ace5925babadb107fb7c37094d13ded 100644
--- a/DetectorDescription/GeoModel/GeoModelTest/CMakeLists.txt
+++ b/DetectorDescription/GeoModel/GeoModelTest/CMakeLists.txt
@@ -16,7 +16,7 @@ atlas_depends_on_subdirs( PRIVATE
                         )
 
 # External dependencies:
-find_package( GeoModel )
+find_package( GeoModelCore )
 
 # Component(s) in the package:
 atlas_add_component( GeoModelTest
diff --git a/Scintillator/ScintDetDescr/ScintGeoModelUtils/CMakeLists.txt b/Scintillator/ScintDetDescr/ScintGeoModelUtils/CMakeLists.txt
index 44c51708b1ae93e25dfe9f1c6e3f412163c438f1..d582f2628d13398c82dce49114ea2d51db1ed6ad 100644
--- a/Scintillator/ScintDetDescr/ScintGeoModelUtils/CMakeLists.txt
+++ b/Scintillator/ScintDetDescr/ScintGeoModelUtils/CMakeLists.txt
@@ -22,7 +22,7 @@ atlas_depends_on_subdirs( PUBLIC
 find_package( Boost COMPONENTS filesystem thread system )
 find_package( CLHEP )
 find_package( CORAL COMPONENTS CoralBase CoralKernel RelationalAccess )
-find_package( GeoModel )
+find_package( GeoModelCore )
 
 # Component(s) in the package:
 atlas_add_library( ScintGeoModelUtils
diff --git a/Scintillator/ScintDetDescr/ScintReadoutGeometry/CMakeLists.txt b/Scintillator/ScintDetDescr/ScintReadoutGeometry/CMakeLists.txt
index 364640487da099ceebadc7c95487e7ce1258c767..992fbb0b2a822c4f91df8055412eeba13ddf29b2 100644
--- a/Scintillator/ScintDetDescr/ScintReadoutGeometry/CMakeLists.txt
+++ b/Scintillator/ScintDetDescr/ScintReadoutGeometry/CMakeLists.txt
@@ -30,7 +30,7 @@ atlas_depends_on_subdirs( PUBLIC
 # External dependencies:
 find_package( CLHEP )
 find_package( Eigen )
-find_package( GeoModel )
+find_package( GeoModelCore )
 
 # Component(s) in the package:
 atlas_add_library( ScintReadoutGeometry
diff --git a/Scintillator/ScintDetDescr/VetoGeoModel/CMakeLists.txt b/Scintillator/ScintDetDescr/VetoGeoModel/CMakeLists.txt
index 97e45b33da4d7a8c354a317caf72a85adf68bfce..b590639e4cf819a4debcae1bdddf7061e9c1935e 100644
--- a/Scintillator/ScintDetDescr/VetoGeoModel/CMakeLists.txt
+++ b/Scintillator/ScintDetDescr/VetoGeoModel/CMakeLists.txt
@@ -31,7 +31,7 @@ atlas_depends_on_subdirs( PUBLIC
 find_package( Boost COMPONENTS filesystem thread system )
 find_package( CORAL COMPONENTS CoralBase CoralKernel RelationalAccess )
 find_package( Eigen )
-find_package( GeoModel )
+find_package( GeoModelCore )
 
 # Component(s) in the package:
 atlas_add_component( VetoGeoModel
diff --git a/Simulation/G4Utilities/Geo2G4/CMakeLists.txt b/Simulation/G4Utilities/Geo2G4/CMakeLists.txt
index cc72f51fd8bdf64a2466de13d52b7f78460d9741..a6b11f4dc8aec94827dad63b59d4a114e6464922 100644
--- a/Simulation/G4Utilities/Geo2G4/CMakeLists.txt
+++ b/Simulation/G4Utilities/Geo2G4/CMakeLists.txt
@@ -27,7 +27,7 @@ find_package( CLHEP )
 find_package( Geant4 )
 find_package( ROOT COMPONENTS MathCore RIO Core Tree Hist pthread )
 find_package( XercesC )
-find_package( GeoModel )
+find_package( GeoModelCore )
 
 # Component(s) in the package:
 atlas_add_library( Geo2G4Lib
diff --git a/Tracker/TrackerDetDescr/DipoleGeoModel/CMakeLists.txt b/Tracker/TrackerDetDescr/DipoleGeoModel/CMakeLists.txt
index c0a38bf6fadbbeb2cf1139f11e890fad97c4f87b..c4aeda237a3ba3445a7b6aef647282266e232997 100644
--- a/Tracker/TrackerDetDescr/DipoleGeoModel/CMakeLists.txt
+++ b/Tracker/TrackerDetDescr/DipoleGeoModel/CMakeLists.txt
@@ -27,7 +27,7 @@ atlas_depends_on_subdirs( PUBLIC
 find_package( Boost COMPONENTS filesystem thread system )
 find_package( CORAL COMPONENTS CoralBase CoralKernel RelationalAccess )
 find_package( Eigen )
-find_package( GeoModel )
+find_package( GeoModelCore )
 
 # Component(s) in the package:
 atlas_add_component( DipoleGeoModel
diff --git a/Tracker/TrackerDetDescr/FaserSCT_GeoModel/CMakeLists.txt b/Tracker/TrackerDetDescr/FaserSCT_GeoModel/CMakeLists.txt
index 1258b9536d7d4ed296565271b482a1fcf361871d..0f9ae155d5408e345cd196054294ddc6e4410687 100644
--- a/Tracker/TrackerDetDescr/FaserSCT_GeoModel/CMakeLists.txt
+++ b/Tracker/TrackerDetDescr/FaserSCT_GeoModel/CMakeLists.txt
@@ -29,7 +29,7 @@ atlas_depends_on_subdirs( PUBLIC
 find_package( Boost COMPONENTS filesystem thread system )
 find_package( CORAL COMPONENTS CoralBase CoralKernel RelationalAccess )
 find_package( Eigen )
-find_package( GeoModel )
+find_package( GeoModelCore )
 
 # Component(s) in the package:
 atlas_add_component( FaserSCT_GeoModel
diff --git a/Tracker/TrackerDetDescr/TrackerGeoModelUtils/CMakeLists.txt b/Tracker/TrackerDetDescr/TrackerGeoModelUtils/CMakeLists.txt
index c1afb08a4b29c743cb308c06e7817749ae292c76..e0fdcf14b89eec1b79ac51f6a17ea04d4fc2dedd 100644
--- a/Tracker/TrackerDetDescr/TrackerGeoModelUtils/CMakeLists.txt
+++ b/Tracker/TrackerDetDescr/TrackerGeoModelUtils/CMakeLists.txt
@@ -22,7 +22,7 @@ atlas_depends_on_subdirs( PUBLIC
 find_package( Boost COMPONENTS filesystem thread system )
 find_package( CLHEP )
 find_package( CORAL COMPONENTS CoralBase CoralKernel RelationalAccess )
-find_package( GeoModel )
+find_package( GeoModelCore )
 
 # Component(s) in the package:
 atlas_add_library( TrackerGeoModelUtils
diff --git a/Tracker/TrackerDetDescr/TrackerReadoutGeometry/CMakeLists.txt b/Tracker/TrackerDetDescr/TrackerReadoutGeometry/CMakeLists.txt
index 13dbf391aa0ecfffa86b640649d18fc6a562036b..a36752e33887220c3ceab393add0168163adf674 100644
--- a/Tracker/TrackerDetDescr/TrackerReadoutGeometry/CMakeLists.txt
+++ b/Tracker/TrackerDetDescr/TrackerReadoutGeometry/CMakeLists.txt
@@ -31,7 +31,7 @@ atlas_depends_on_subdirs( PUBLIC
 # External dependencies:
 find_package( CLHEP )
 find_package( Eigen )
-find_package( GeoModel )
+find_package( GeoModelCore )
 
 # Component(s) in the package:
 atlas_add_library( TrackerReadoutGeometry
diff --git a/graphics/VTI12/VTI12Systems/VTI12GeometrySystems/CMakeLists.txt b/graphics/VTI12/VTI12Systems/VTI12GeometrySystems/CMakeLists.txt
index 8224c45f6d262a20e41531374c62a9ed48d569c0..cc9c9d37494a24147d46b198bbac81a657c19d25 100644
--- a/graphics/VTI12/VTI12Systems/VTI12GeometrySystems/CMakeLists.txt
+++ b/graphics/VTI12/VTI12Systems/VTI12GeometrySystems/CMakeLists.txt
@@ -26,7 +26,7 @@ atlas_depends_on_subdirs(
 find_package( CLHEP )
 find_package( Coin3D )
 find_package( Qt5 COMPONENTS Core Gui Widgets Sql )
-find_package( GeoModel )
+find_package( GeoModelCore )
 if( APPLE )
   find_package(OpenGL REQUIRED)
 endif()
diff --git a/graphics/VTI12/VTI12Systems/VTI12TrackSystems/CMakeLists.txt b/graphics/VTI12/VTI12Systems/VTI12TrackSystems/CMakeLists.txt
index 69cf2097669434ab5cd30dfdeabacd842d9dc9eb..578bdd147f0026ca323589539781e92f15d9e031 100644
--- a/graphics/VTI12/VTI12Systems/VTI12TrackSystems/CMakeLists.txt
+++ b/graphics/VTI12/VTI12Systems/VTI12TrackSystems/CMakeLists.txt
@@ -59,7 +59,7 @@ find_package( CLHEP )
 find_package( Coin3D )
 find_package( HepMC )
 find_package( Qt5 COMPONENTS Core Gui Widgets  )
-find_package( GeoModel )
+find_package( GeoModelCore )
 
 # Generate UI files automatically:
 # Note: add the "Widgets" component to "find_package( Qt5 ...)" if you have UI files, otherwise UIC, even if CMAKE_AUTOUIC is set to ON, is not run
diff --git a/graphics/VTI12/VTI12Utils/CMakeLists.txt b/graphics/VTI12/VTI12Utils/CMakeLists.txt
index af07e3edf0a9d7d61085e2a559e6c8ed86c880b6..bf13d44408521eccfa3065aa067171142fce3b75 100644
--- a/graphics/VTI12/VTI12Utils/CMakeLists.txt
+++ b/graphics/VTI12/VTI12Utils/CMakeLists.txt
@@ -39,7 +39,7 @@ find_package( Coin3D )
 find_package( Eigen )
 find_package( HepPDT )
 find_package( Qt5 COMPONENTS Core REQUIRED)
-find_package( GeoModel )
+find_package( GeoModelCore )
 
 # Generate MOC files automatically:
 set( CMAKE_AUTOMOC ON )