Index: driver/cc1.cc
===================================================================
--- driver/cc1.cc	(revision b740f0b9583eaf5e7eea275098556a30031a4056)
+++ driver/cc1.cc	(revision d6f4488012b9dc8383787c7a202110e6e2dca2a9)
@@ -10,6 +10,6 @@
 // Created On       : Fri Aug 26 14:23:51 2005
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Aug 22 17:26:09 2018
-// Update Count     : 120
+// Last Modified On : Thu Aug 23 09:48:40 2018
+// Update Count     : 122
 //
 
@@ -69,5 +69,5 @@
 	char *value;
 
-	value = getenv( "__COMPILER__" );
+	value = getenv( "__CFA_COMPILER__" );
 	if ( value != NULL ) {
 		compiler_name = value;
Index: driver/cfa.cc
===================================================================
--- driver/cfa.cc	(revision b740f0b9583eaf5e7eea275098556a30031a4056)
+++ driver/cfa.cc	(revision d6f4488012b9dc8383787c7a202110e6e2dca2a9)
@@ -10,6 +10,6 @@
 // Created On       : Tue Aug 20 13:44:49 2002
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Aug 22 17:26:19 2018
-// Update Count     : 265
+// Last Modified On : Thu Aug 23 09:42:47 2018
+// Update Count     : 267
 //
 
@@ -91,7 +91,7 @@
 	string Major( str( CFA_VERSION_MAJOR ) ), Minor( str( CFA_VERSION_MINOR ) ), Patch( str( CFA_VERSION_PATCH ) );
 
-	string installincdir( CFA_INCDIR );                         // fixed location of include files
-	string installlibdir( CFA_LIBDIR );                         // fixed location of cc1 and cfa-cpp commands when installed
-	string srcdriverdir ( TOP_BUILDDIR "driver");                // fixed location of cc1 and cfa-cpp commands when in tree
+	string installincdir( CFA_INCDIR );					// fixed location of include files
+	string installlibdir( CFA_LIBDIR );					// fixed location of cc1 and cfa-cpp commands when installed
+	string srcdriverdir ( TOP_BUILDDIR "driver");		// fixed location of cc1 and cfa-cpp commands when in tree
 
 	string heading;										// banner printed at start of cfa compilation
@@ -183,5 +183,5 @@
 				if ( i == argc ) continue;				// next argument available ?
 				compiler_path = argv[i];
-				if ( putenv( (char *)( *new string( string( "__U_COMPILER__=" ) + argv[i]) ).c_str() ) != 0 ) {
+				if ( putenv( (char *)( *new string( string( "__CFA_COMPILER__=" ) + argv[i]) ).c_str() ) != 0 ) {
 					cerr << argv[0] << " error, cannot set environment variable." << endl;
 					exit( EXIT_FAILURE );