diff --git a/ILD/compact/ILD_common_v02/Field_AntiDID_Map_l.xml b/ILD/compact/ILD_common_v02/Field_AntiDID_Map_l.xml
index ef914c37f..d7657f0b9 100644
--- a/ILD/compact/ILD_common_v02/Field_AntiDID_Map_l.xml
+++ b/ILD/compact/ILD_common_v02/Field_AntiDID_Map_l.xml
@@ -1,7 +1,7 @@
 <lccdd>
   <fields>
     <field name="AntiDIDMap" type="FieldXYZ"
-	   filename="${lcgeo_DIR}/fieldmaps/ild_fieldMap_antiDID_10cm_v1_20170223.root"
+	   filename="${k4geo_DIR}/fieldmaps/ild_fieldMap_antiDID_10cm_v1_20170223.root"
 	   treeName="ntuple"
 	   xVarName="x_mm"
 	   yVarName="y_mm"
diff --git a/ILD/compact/ILD_common_v02/Field_Solenoid_Map_l_3.5T.xml b/ILD/compact/ILD_common_v02/Field_Solenoid_Map_l_3.5T.xml
index 5f4773dde..b3d118d41 100644
--- a/ILD/compact/ILD_common_v02/Field_Solenoid_Map_l_3.5T.xml
+++ b/ILD/compact/ILD_common_v02/Field_Solenoid_Map_l_3.5T.xml
@@ -1,7 +1,7 @@
 <lccdd>
   <fields>
     <field name="SolenoidMap" type="FieldBrBz"
-	   filename="${lcgeo_DIR}/fieldmaps/ild_fieldMap_Solenoid3.5T_StandardYoke_10cm_v1_20170223.root"
+	   filename="${k4geo_DIR}/fieldmaps/ild_fieldMap_Solenoid3.5T_StandardYoke_10cm_v1_20170223.root"
 	   treeName="ntuple"
 	   rhoVarName="rho_mm"
 	   zVarName="z_mm"
diff --git a/ILD/compact/ILD_common_v02/Field_Solenoid_Map_s_4.0T.xml b/ILD/compact/ILD_common_v02/Field_Solenoid_Map_s_4.0T.xml
index 453faa2d7..d2a9f3b20 100644
--- a/ILD/compact/ILD_common_v02/Field_Solenoid_Map_s_4.0T.xml
+++ b/ILD/compact/ILD_common_v02/Field_Solenoid_Map_s_4.0T.xml
@@ -1,7 +1,7 @@
 <lccdd>
   <fields>
     <field name="SolenoidMap" type="FieldBrBz"
-	   filename="${lcgeo_DIR}/fieldmaps/ild_fieldMap_Solenoid4.0T_SmallYoke_10cm_v1_20180518.root"
+	   filename="${k4geo_DIR}/fieldmaps/ild_fieldMap_Solenoid4.0T_SmallYoke_10cm_v1_20180518.root"
 	   treeName="ntuple"
 	   rhoVarName="rho_mm"
 	   zVarName="z_mm"
diff --git a/ILD/compact/ILD_l1_v01/ILD_l1_v01.xml b/ILD/compact/ILD_l1_v01/ILD_l1_v01.xml
index 4afbf7c61..a9b208568 100644
--- a/ILD/compact/ILD_l1_v01/ILD_l1_v01.xml
+++ b/ILD/compact/ILD_l1_v01/ILD_l1_v01.xml
@@ -263,7 +263,7 @@
            outer_radius="world_side" />
 
     <!-- <field name="DetectorMap" type="FieldBrBz" -->
-         <!--        filename="${lcgeo_DIR}/fieldmaps/ILDMap_KB_20150204_BRhoZ.root" -->
+         <!--        filename="${k4geo_DIR}/fieldmaps/ILDMap_KB_20150204_BRhoZ.root" -->
          <!--        tree="fieldmap:rho:z:Brho:Bz" -->
          <!--        rScale = "1.0" -->
          <!--        zScale = "1.0" -->
diff --git a/ILD/compact/ILD_l1_v02/ILD_l1_v02.xml b/ILD/compact/ILD_l1_v02/ILD_l1_v02.xml
index fb1c8c04b..f3765c03d 100644
--- a/ILD/compact/ILD_l1_v02/ILD_l1_v02.xml
+++ b/ILD/compact/ILD_l1_v02/ILD_l1_v02.xml
@@ -83,7 +83,7 @@
            outer_radius="world_side" />
 
     <!-- <field name="DetectorMap" type="FieldBrBz" -->
-         <!--        filename="${lcgeo_DIR}/fieldmaps/ILDMap_KB_20150204_BRhoZ.root" -->
+         <!--        filename="${k4geo_DIR}/fieldmaps/ILDMap_KB_20150204_BRhoZ.root" -->
          <!--        tree="fieldmap:rho:z:Brho:Bz" -->
          <!--        rScale = "1.0" -->
          <!--        zScale = "1.0" -->
diff --git a/ILD/compact/ILD_l2_v01/ILD_l2_v01.xml b/ILD/compact/ILD_l2_v01/ILD_l2_v01.xml
index 1f78e5e7d..966b02b7f 100644
--- a/ILD/compact/ILD_l2_v01/ILD_l2_v01.xml
+++ b/ILD/compact/ILD_l2_v01/ILD_l2_v01.xml
@@ -266,7 +266,7 @@
            outer_radius="world_side" />
 
     <!-- <field name="DetectorMap" type="FieldBrBz" -->
-         <!--        filename="${lcgeo_DIR}/fieldmaps/ILDMap_KB_20150204_BRhoZ.root" -->
+         <!--        filename="${k4geo_DIR}/fieldmaps/ILDMap_KB_20150204_BRhoZ.root" -->
          <!--        tree="fieldmap:rho:z:Brho:Bz" -->
          <!--        rScale = "1.0" -->
          <!--        zScale = "1.0" -->
diff --git a/ILD/compact/ILD_l2_v02/ILD_l2_v02.xml b/ILD/compact/ILD_l2_v02/ILD_l2_v02.xml
index 7300804d7..81e1b6a9f 100644
--- a/ILD/compact/ILD_l2_v02/ILD_l2_v02.xml
+++ b/ILD/compact/ILD_l2_v02/ILD_l2_v02.xml
@@ -84,7 +84,7 @@
            outer_radius="world_side" />
 
     <!-- <field name="DetectorMap" type="FieldBrBz" -->
-         <!--        filename="${lcgeo_DIR}/fieldmaps/ILDMap_KB_20150204_BRhoZ.root" -->
+         <!--        filename="${k4geo_DIR}/fieldmaps/ILDMap_KB_20150204_BRhoZ.root" -->
          <!--        tree="fieldmap:rho:z:Brho:Bz" -->
          <!--        rScale = "1.0" -->
          <!--        zScale = "1.0" -->
diff --git a/ILD/compact/ILD_l4_v01/ILD_l4_v01.xml b/ILD/compact/ILD_l4_v01/ILD_l4_v01.xml
index 5eb31d7ac..713e36e21 100644
--- a/ILD/compact/ILD_l4_v01/ILD_l4_v01.xml
+++ b/ILD/compact/ILD_l4_v01/ILD_l4_v01.xml
@@ -297,7 +297,7 @@
            outer_radius="world_side" />
 
     <!-- <field name="DetectorMap" type="FieldBrBz" -->
-         <!--        filename="${lcgeo_DIR}/fieldmaps/ILDMap_KB_20150204_BRhoZ.root" -->
+         <!--        filename="${k4geo_DIR}/fieldmaps/ILDMap_KB_20150204_BRhoZ.root" -->
          <!--        tree="fieldmap:rho:z:Brho:Bz" -->
          <!--        rScale = "1.0" -->
          <!--        zScale = "1.0" -->
diff --git a/ILD/compact/ILD_l4_v02/ILD_l4_o1_v02.xml b/ILD/compact/ILD_l4_v02/ILD_l4_o1_v02.xml
index abe311a39..5463c3cee 100644
--- a/ILD/compact/ILD_l4_v02/ILD_l4_o1_v02.xml
+++ b/ILD/compact/ILD_l4_v02/ILD_l4_o1_v02.xml
@@ -86,7 +86,7 @@
            outer_radius="world_side" />
 
     <!-- <field name="DetectorMap" type="FieldBrBz" -->
-         <!--        filename="${lcgeo_DIR}/fieldmaps/ILDMap_KB_20150204_BRhoZ.root" -->
+         <!--        filename="${k4geo_DIR}/fieldmaps/ILDMap_KB_20150204_BRhoZ.root" -->
          <!--        tree="fieldmap:rho:z:Brho:Bz" -->
          <!--        rScale = "1.0" -->
          <!--        zScale = "1.0" -->
diff --git a/ILD/compact/ILD_l4_v02/ILD_l4_o2_v02.xml b/ILD/compact/ILD_l4_v02/ILD_l4_o2_v02.xml
index cca84ac45..fdedf4068 100644
--- a/ILD/compact/ILD_l4_v02/ILD_l4_o2_v02.xml
+++ b/ILD/compact/ILD_l4_v02/ILD_l4_o2_v02.xml
@@ -86,7 +86,7 @@
            outer_radius="world_side" />
 
     <!-- <field name="DetectorMap" type="FieldBrBz" -->
-         <!--        filename="${lcgeo_DIR}/fieldmaps/ILDMap_KB_20150204_BRhoZ.root" -->
+         <!--        filename="${k4geo_DIR}/fieldmaps/ILDMap_KB_20150204_BRhoZ.root" -->
          <!--        tree="fieldmap:rho:z:Brho:Bz" -->
          <!--        rScale = "1.0" -->
          <!--        zScale = "1.0" -->
diff --git a/ILD/compact/ILD_l4_v02/ILD_l4_v02.xml b/ILD/compact/ILD_l4_v02/ILD_l4_v02.xml
index 77eb795e7..39bf49d65 100644
--- a/ILD/compact/ILD_l4_v02/ILD_l4_v02.xml
+++ b/ILD/compact/ILD_l4_v02/ILD_l4_v02.xml
@@ -86,7 +86,7 @@
            outer_radius="world_side" />
 
     <!-- <field name="DetectorMap" type="FieldBrBz" -->
-         <!--        filename="${lcgeo_DIR}/fieldmaps/ILDMap_KB_20150204_BRhoZ.root" -->
+         <!--        filename="${k4geo_DIR}/fieldmaps/ILDMap_KB_20150204_BRhoZ.root" -->
          <!--        tree="fieldmap:rho:z:Brho:Bz" -->
          <!--        rScale = "1.0" -->
          <!--        zScale = "1.0" -->
diff --git a/ILD/compact/ILD_l6_v02/ILD_l6_v02.xml b/ILD/compact/ILD_l6_v02/ILD_l6_v02.xml
index 6cac4da2e..810419f28 100644
--- a/ILD/compact/ILD_l6_v02/ILD_l6_v02.xml
+++ b/ILD/compact/ILD_l6_v02/ILD_l6_v02.xml
@@ -85,7 +85,7 @@
            outer_radius="world_side" />
 
     <!-- <field name="DetectorMap" type="FieldBrBz" -->
-         <!--        filename="${lcgeo_DIR}/fieldmaps/ILDMap_KB_20150204_BRhoZ.root" -->
+         <!--        filename="${k4geo_DIR}/fieldmaps/ILDMap_KB_20150204_BRhoZ.root" -->
          <!--        tree="fieldmap:rho:z:Brho:Bz" -->
          <!--        rScale = "1.0" -->
          <!--        zScale = "1.0" -->
diff --git a/ILD/compact/ILD_o1_v05/ILD_o1_v05.xml b/ILD/compact/ILD_o1_v05/ILD_o1_v05.xml
index 0386c8a92..d4a774495 100644
--- a/ILD/compact/ILD_o1_v05/ILD_o1_v05.xml
+++ b/ILD/compact/ILD_o1_v05/ILD_o1_v05.xml
@@ -593,7 +593,7 @@
 
   <!-- Solenoidal Field from Br(r,z) and Bz(r,z) field map -->
   <!-- <field name="DetectorMap_Solenoid" type="FieldBrBz" -->
-  <!--        filename    = "${lcgeo_DIR}/fieldmaps/ild_fieldMap_Solenoid3.5T_StandardYoke_10cm_v1_20170223.root" -->
+  <!--        filename    = "${k4geo_DIR}/fieldmaps/ild_fieldMap_Solenoid3.5T_StandardYoke_10cm_v1_20170223.root" -->
   <!--        treeName    = "ntuple" -->
   <!--        rhoVarName  = "rho_mm" -->
   <!--        zVarName    = "z_mm" -->
@@ -609,7 +609,7 @@
   
   <!-- anti-DID Field from Bx(x,y,z), By(x,y,z) and Bz(x,y,z) field map -->
   <!-- <field name="DetectorMap_antiDID" type="FieldXYZ" -->
-  <!--        filename    = "${lcgeo_DIR}/fieldmaps/ild_fieldMap_antiDID_10cm_v1_20170223.root" -->
+  <!--        filename    = "${k4geo_DIR}/fieldmaps/ild_fieldMap_antiDID_10cm_v1_20170223.root" -->
   <!--        treeName    = "ntuple" -->
   <!--        xVarName    = "x_mm" -->
   <!--        yVarName    = "y_mm" -->
diff --git a/ILD/compact/ILD_o3_v05/ILD_o3_v05.xml b/ILD/compact/ILD_o3_v05/ILD_o3_v05.xml
index 126c0d81b..3fb8449ce 100644
--- a/ILD/compact/ILD_o3_v05/ILD_o3_v05.xml
+++ b/ILD/compact/ILD_o3_v05/ILD_o3_v05.xml
@@ -584,7 +584,7 @@
   	  outer_radius="world_side" />
 
   <!-- <field name="DetectorMap" type="FieldBrBz" -->
-  <!--        filename="${lcgeo_DIR}/fieldmaps/ILDMap_KB_20150204_BRhoZ.root" -->
+  <!--        filename="${k4geo_DIR}/fieldmaps/ILDMap_KB_20150204_BRhoZ.root" -->
   <!--        tree="fieldmap:rho:z:Brho:Bz" -->
   <!--        rScale = "1.0" -->
   <!--        zScale = "1.0" -->
diff --git a/ILD/compact/ILD_s1_v01/ILD_s1_v01.xml b/ILD/compact/ILD_s1_v01/ILD_s1_v01.xml
index e5766175b..9201f7dd2 100644
--- a/ILD/compact/ILD_s1_v01/ILD_s1_v01.xml
+++ b/ILD/compact/ILD_s1_v01/ILD_s1_v01.xml
@@ -262,7 +262,7 @@
            outer_radius="world_side" />
 
     <!-- <field name="DetectorMap" type="FieldBrBz" -->
-         <!--        filename="${lcgeo_DIR}/fieldmaps/ILDMap_KB_20150204_BRhoZ.root" -->
+         <!--        filename="${k4geo_DIR}/fieldmaps/ILDMap_KB_20150204_BRhoZ.root" -->
          <!--        tree="fieldmap:rho:z:Brho:Bz" -->
          <!--        rScale = "1.0" -->
          <!--        zScale = "1.0" -->
diff --git a/ILD/compact/ILD_s1_v02/ILD_s1_v02.xml b/ILD/compact/ILD_s1_v02/ILD_s1_v02.xml
index b60e2b102..7bc834ead 100644
--- a/ILD/compact/ILD_s1_v02/ILD_s1_v02.xml
+++ b/ILD/compact/ILD_s1_v02/ILD_s1_v02.xml
@@ -81,7 +81,7 @@
            outer_radius="world_side" />
 
     <!-- <field name="DetectorMap" type="FieldBrBz" -->
-         <!--        filename="${lcgeo_DIR}/fieldmaps/ILDMap_KB_20150204_BRhoZ.root" -->
+         <!--        filename="${k4geo_DIR}/fieldmaps/ILDMap_KB_20150204_BRhoZ.root" -->
          <!--        tree="fieldmap:rho:z:Brho:Bz" -->
          <!--        rScale = "1.0" -->
          <!--        zScale = "1.0" -->
diff --git a/ILD/compact/ILD_s2_v01/ILD_s2_v01.xml b/ILD/compact/ILD_s2_v01/ILD_s2_v01.xml
index 899d6ab08..b2e36af53 100644
--- a/ILD/compact/ILD_s2_v01/ILD_s2_v01.xml
+++ b/ILD/compact/ILD_s2_v01/ILD_s2_v01.xml
@@ -264,7 +264,7 @@
            outer_radius="world_side" />
 
     <!-- <field name="DetectorMap" type="FieldBrBz" -->
-         <!--        filename="${lcgeo_DIR}/fieldmaps/ILDMap_KB_20150204_BRhoZ.root" -->
+         <!--        filename="${k4geo_DIR}/fieldmaps/ILDMap_KB_20150204_BRhoZ.root" -->
          <!--        tree="fieldmap:rho:z:Brho:Bz" -->
          <!--        rScale = "1.0" -->
          <!--        zScale = "1.0" -->
diff --git a/ILD/compact/ILD_s2_v02/ILD_s2_v02.xml b/ILD/compact/ILD_s2_v02/ILD_s2_v02.xml
index a7b588f13..f5292c7af 100644
--- a/ILD/compact/ILD_s2_v02/ILD_s2_v02.xml
+++ b/ILD/compact/ILD_s2_v02/ILD_s2_v02.xml
@@ -83,7 +83,7 @@
            outer_radius="world_side" />
 
     <!-- <field name="DetectorMap" type="FieldBrBz" -->
-         <!--        filename="${lcgeo_DIR}/fieldmaps/ILDMap_KB_20150204_BRhoZ.root" -->
+         <!--        filename="${k4geo_DIR}/fieldmaps/ILDMap_KB_20150204_BRhoZ.root" -->
          <!--        tree="fieldmap:rho:z:Brho:Bz" -->
          <!--        rScale = "1.0" -->
          <!--        zScale = "1.0" -->
diff --git a/ILD/compact/ILD_s4_v02/ILD_s4_o1_v02.xml b/ILD/compact/ILD_s4_v02/ILD_s4_o1_v02.xml
index 723f21abf..50a82af15 100644
--- a/ILD/compact/ILD_s4_v02/ILD_s4_o1_v02.xml
+++ b/ILD/compact/ILD_s4_v02/ILD_s4_o1_v02.xml
@@ -86,7 +86,7 @@
            outer_radius="world_side" />
 
     <!-- <field name="DetectorMap" type="FieldBrBz" -->
-         <!--        filename="${lcgeo_DIR}/fieldmaps/ILDMap_KB_20150204_BRhoZ.root" -->
+         <!--        filename="${k4geo_DIR}/fieldmaps/ILDMap_KB_20150204_BRhoZ.root" -->
          <!--        tree="fieldmap:rho:z:Brho:Bz" -->
          <!--        rScale = "1.0" -->
          <!--        zScale = "1.0" -->
diff --git a/ILD/compact/ILD_s4_v02/ILD_s4_o2_v02.xml b/ILD/compact/ILD_s4_v02/ILD_s4_o2_v02.xml
index 8025c5a35..71a8065ba 100644
--- a/ILD/compact/ILD_s4_v02/ILD_s4_o2_v02.xml
+++ b/ILD/compact/ILD_s4_v02/ILD_s4_o2_v02.xml
@@ -86,7 +86,7 @@
            outer_radius="world_side" />
 
     <!-- <field name="DetectorMap" type="FieldBrBz" -->
-         <!--        filename="${lcgeo_DIR}/fieldmaps/ILDMap_KB_20150204_BRhoZ.root" -->
+         <!--        filename="${k4geo_DIR}/fieldmaps/ILDMap_KB_20150204_BRhoZ.root" -->
          <!--        tree="fieldmap:rho:z:Brho:Bz" -->
          <!--        rScale = "1.0" -->
          <!--        zScale = "1.0" -->
diff --git a/ILD/compact/ILD_s4_v02/ILD_s4_v02.xml b/ILD/compact/ILD_s4_v02/ILD_s4_v02.xml
index d139670c4..28a8ee497 100644
--- a/ILD/compact/ILD_s4_v02/ILD_s4_v02.xml
+++ b/ILD/compact/ILD_s4_v02/ILD_s4_v02.xml
@@ -86,7 +86,7 @@
            outer_radius="world_side" />
 
     <!-- <field name="DetectorMap" type="FieldBrBz" -->
-         <!--        filename="${lcgeo_DIR}/fieldmaps/ILDMap_KB_20150204_BRhoZ.root" -->
+         <!--        filename="${k4geo_DIR}/fieldmaps/ILDMap_KB_20150204_BRhoZ.root" -->
          <!--        tree="fieldmap:rho:z:Brho:Bz" -->
          <!--        rScale = "1.0" -->
          <!--        zScale = "1.0" -->
diff --git a/ILD/compact/ILD_s6_v02/ILD_s6_v02.xml b/ILD/compact/ILD_s6_v02/ILD_s6_v02.xml
index 5ef264dfe..3b7408c5e 100644
--- a/ILD/compact/ILD_s6_v02/ILD_s6_v02.xml
+++ b/ILD/compact/ILD_s6_v02/ILD_s6_v02.xml
@@ -83,7 +83,7 @@
            outer_radius="world_side" />
 
     <!-- <field name="DetectorMap" type="FieldBrBz" -->
-         <!--        filename="${lcgeo_DIR}/fieldmaps/ILDMap_KB_20150204_BRhoZ.root" -->
+         <!--        filename="${k4geo_DIR}/fieldmaps/ILDMap_KB_20150204_BRhoZ.root" -->
          <!--        tree="fieldmap:rho:z:Brho:Bz" -->
          <!--        rScale = "1.0" -->
          <!--        zScale = "1.0" -->
diff --git a/ILD/compact/extra_stuff/FCAL_l1_v01.xml b/ILD/compact/extra_stuff/FCAL_l1_v01.xml
index 1187451e7..2052377c0 100644
--- a/ILD/compact/extra_stuff/FCAL_l1_v01.xml
+++ b/ILD/compact/extra_stuff/FCAL_l1_v01.xml
@@ -158,7 +158,7 @@
            outer_radius="world_side" />
 
     <!-- <field name="DetectorMap" type="FieldBrBz" -->
-         <!--        filename="${lcgeo_DIR}/fieldmaps/ILDMap_KB_20150204_BRhoZ.root" -->
+         <!--        filename="${k4geo_DIR}/fieldmaps/ILDMap_KB_20150204_BRhoZ.root" -->
          <!--        tree="fieldmap:rho:z:Brho:Bz" -->
          <!--        rScale = "1.0" -->
          <!--        zScale = "1.0" -->
diff --git a/doc/ReleaseNotes.md b/doc/ReleaseNotes.md
index f2c8af276..4a736a643 100644
--- a/doc/ReleaseNotes.md
+++ b/doc/ReleaseNotes.md
@@ -1983,7 +1983,7 @@ N. Nikiforou 19/08/2015
      - Example XML for the fields section of the compact XML
 
             <field name="DetectorMap" type="FieldBrBz"
-                   filename="${lcgeo_DIR}/fieldmaps/ILDMap_KB_20150204_BRhoZ.root"
+                   filename="${k4geo_DIR}/fieldmaps/ILDMap_KB_20150204_BRhoZ.root"
                tree="fieldmap:rho:z:Brho:Bz"
                rScale = "1.0"
                zScale = "1.0"