Index: Jenkins/TestRegen
===================================================================
--- Jenkins/TestRegen	(revision 95d0a5db33a507584580dc37674209d5be2faa98)
+++ Jenkins/TestRegen	(revision 93fe3154c52db742d025ea3dfcd69426139dc375)
@@ -70,8 +70,8 @@
 	//escapes the sandbox
 	//Also specify the compiler by hand
-	sh "./configure CXX=clang++ --host=${arch} --with-backend-compiler=gcc-6 --prefix=${install_dir} --enable-silent-rules --quiet"
+	sh "./configure CXX=clang++ CC=gcc-6 --host=${arch} --enable-silent-rules --quiet"
 
 	//Compile the project
-	sh 'make -j 8 --no-print-directory install'
+	sh 'make -j 8 --no-print-directory'
 
 	//Regenerate the desired tests
Index: Jenkinsfile
===================================================================
--- Jenkinsfile	(revision 95d0a5db33a507584580dc37674209d5be2faa98)
+++ Jenkinsfile	(revision 93fe3154c52db742d025ea3dfcd69426139dc375)
@@ -114,5 +114,5 @@
 			}
 
-			sh "${SrcDir}/configure CXX=${Settings.Compiler.cpp_cc} ${Settings.Architecture.flags} ${targets} --with-backend-compiler=${Settings.Compiler.cfa_cc} --quiet"
+			sh "${SrcDir}/configure CXX=${Settings.Compiler.CXX} CC=${Settings.Compiler.CC} ${Settings.Architecture.flags} ${targets} --quiet"
 
 			//Compile the project
@@ -235,12 +235,12 @@
 //Description of a compiler (Must be serializable since pipelines are persistent)
 class CC_Desc implements Serializable {
-	public String cc_name
-	public String cpp_cc
-	public String cfa_cc
-
-	CC_Desc(String cc_name, String cpp_cc, String cfa_cc) {
-		this.cc_name = cc_name
-		this.cpp_cc = cpp_cc
-		this.cfa_cc = cfa_cc
+	public String name
+	public String CC
+	public String CXX
+
+	CC_Desc(String name, String CC, String CXX) {
+		this.name = name
+		this.CC = CC
+		this.CXX = CXX
 	}
 }
@@ -309,7 +309,7 @@
 
 		def full = param.RunAllTests ? " (Full)" : ""
-		this.DescShort = "${ this.Compiler.cc_name }:${ this.Architecture.name }${full}"
-
-		this.DescLong = """Compiler 	         : ${ this.Compiler.cc_name } (${ this.Compiler.cpp_cc }/${ this.Compiler.cfa_cc })
+		this.DescShort = "${ this.Compiler.name }:${ this.Architecture.name }${full}"
+
+		this.DescLong = """Compiler 	         : ${ this.Compiler.name } (${ this.Compiler.CXX }/${ this.Compiler.CC })
 Architecture            : ${ this.Architecture.name }
 Arc Flags               : ${ this.Architecture.flags }