diff --git a/GeoModelTools/GeoModelXML/GeoModelXml/GeoModelXml/Gmx2Geo.h b/GeoModelTools/GeoModelXML/GeoModelXml/GeoModelXml/Gmx2Geo.h
index b2f6715115c4ebadeb5d3068d00180847c02e985..0b3cca3a8c3d9cd0b063cc662304738af6b8a043 100644
--- a/GeoModelTools/GeoModelXML/GeoModelXml/GeoModelXml/Gmx2Geo.h
+++ b/GeoModelTools/GeoModelXML/GeoModelXml/GeoModelXml/Gmx2Geo.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef GEO_MODEL_XML_GMX2GEO_H
@@ -30,9 +30,9 @@
 //    Use:
 //        #include "GeoModelXml/Gmx2Geo.h"
 //        #include "GeoModelXml/GmxInterface.h"
-//            ...create your world volume and do all the Athena setup...
+//            ...create your world volume ...
 //            ... get the filename with the xml in:
-//              std::string xmlfilename; some athena stuff to get filename from the job options...
+//              std::string xmlfilename; ...
 //            ...create your envelope GeoPhysVol...
 //            GeoPhysVol *sct(...);
 //            GmxInterface gmxInterface;
diff --git a/GeoModelTools/GeoModelXML/GeoModelXml/src/Gmx2Geo.cxx b/GeoModelTools/GeoModelXML/GeoModelXml/src/Gmx2Geo.cxx
index 75d2c6072b021f3ccc9f9886c9d07497609e95f4..ade840b91b22a57d204c82550548bc6d5aedca6f 100644
--- a/GeoModelTools/GeoModelXML/GeoModelXml/src/Gmx2Geo.cxx
+++ b/GeoModelTools/GeoModelXML/GeoModelXml/src/Gmx2Geo.cxx
@@ -42,7 +42,7 @@ Gmx2Geo::Gmx2Geo(const string xmlFile, GeoPhysVol *addHere, GmxInterface &gmxInt
     DOMDocument *doc = createDOMDocument(xmlFile, parser, flags);
     if (!doc) {// Parsed badly
         XMLPlatformUtils::Terminate();
-        msglog << MSG::FATAL << "Error in xml file " << xmlFile << ". Exiting athena." << endmsg;
+        msglog << MSG::FATAL << "Error in xml file " << xmlFile << ". Exiting program." << endmsg;
 	std::abort();
     }
 
diff --git a/GeoModelTools/GeoModelXML/GeoModelXml/src/MulticopyProcessor.cxx b/GeoModelTools/GeoModelXML/GeoModelXml/src/MulticopyProcessor.cxx
index e5b5d7c327884aa12ab3b0093dada8662d157db8..4e6871a77f1f45757989d828d2827925dd6112dd 100644
--- a/GeoModelTools/GeoModelXML/GeoModelXml/src/MulticopyProcessor.cxx
+++ b/GeoModelTools/GeoModelXML/GeoModelXml/src/MulticopyProcessor.cxx
@@ -203,7 +203,7 @@ DOMDocument *doc = element->getOwnerDocument();
 	else {
 	  msglog << MSG::FATAL << 
 	    "multicopyprocessor: error in " << name << ". <transform> object was neither assemblyref nor logvolref\n"
-                    << "Exiting Athena" << endmsg;
+                    << "Exiting program" << endmsg;
 	  std::abort();
 	}
       }
diff --git a/GeoModelTools/GeoModelXML/GeoModelXml/src/OutputDirector.h b/GeoModelTools/GeoModelXML/GeoModelXml/src/OutputDirector.h
index 2f2277ee1b6debb2fe2b752a1b6b833ab5fb16d6..b925e3175c2489814d2a26182c21fe2c488f001b 100644
--- a/GeoModelTools/GeoModelXML/GeoModelXml/src/OutputDirector.h
+++ b/GeoModelTools/GeoModelXML/GeoModelXml/src/OutputDirector.h
@@ -1,11 +1,7 @@
 /*
-    Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+    Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 */
 
-//
-//    Use gaudi messaging service when in Athena; use cout when "stand-alone".
-//
-
 #ifndef OUTPUTDIRECTOR_H
 #define OUTPUTDIRECTOR_H