diff --git a/acompaction2/makefile b/acompaction2/makefile
index df7b77b30b73d8d92b016fdc9c98e2ccf8dfef10..5e7ce1889de08f1893250e6215350c316540fde5 100644
--- a/acompaction2/makefile
+++ b/acompaction2/makefile
@@ -109,7 +109,7 @@ bin-gcc-debug/$(EXECUTABLE): obj-gcc-debug/ $(OBJECTS_GCC_DEBUG)
 
 bin-llvm-debug/$(EXECUTABLE): obj-llvm-debug/ $(OBJECTS_LLVM_DEBUG)
 	mkdir -p $(dir $@)
-	clangg++ $(OBJECTS_LLVM_DEBUG) -o $@ $(LLVM_LDFLAGS_DEBUG)
+	clang++ $(OBJECTS_LLVM_DEBUG) -o $@ $(LLVM_LDFLAGS_DEBUG)
 
 bin-gcc-release/$(EXECUTABLE): obj-gcc-release/ $(OBJECTS_GCC_RELEASE)
 	mkdir -p $(dir $@)
diff --git a/acompare2/makefile b/acompare2/makefile
index c38fa2975e289e734401c69f6e305bbe2f53b2ec..3f198f6d3fc13f367823cc5d4c7f04060348fd9f 100644
--- a/acompare2/makefile
+++ b/acompare2/makefile
@@ -109,7 +109,7 @@ bin-gcc-debug/$(EXECUTABLE): obj-gcc-debug/ $(OBJECTS_GCC_DEBUG)
 
 bin-llvm-debug/$(EXECUTABLE): obj-llvm-debug/ $(OBJECTS_LLVM_DEBUG)
 	mkdir -p $(dir $@)
-	clangg++ $(OBJECTS_LLVM_DEBUG) -o $@ $(LLVM_LDFLAGS_DEBUG)
+	clang++ $(OBJECTS_LLVM_DEBUG) -o $@ $(LLVM_LDFLAGS_DEBUG)
 
 bin-gcc-release/$(EXECUTABLE): obj-gcc-release/ $(OBJECTS_GCC_RELEASE)
 	mkdir -p $(dir $@)
diff --git a/aconversions2/makefile b/aconversions2/makefile
index aa216567dea4f24661d1d9ec043ce19195632873..d0275b85bf644e87801c525a0456696d41cc1dd4 100644
--- a/aconversions2/makefile
+++ b/aconversions2/makefile
@@ -109,7 +109,7 @@ bin-gcc-debug/$(EXECUTABLE): obj-gcc-debug/ $(OBJECTS_GCC_DEBUG)
 
 bin-llvm-debug/$(EXECUTABLE): obj-llvm-debug/ $(OBJECTS_LLVM_DEBUG)
 	mkdir -p $(dir $@)
-	clangg++ $(OBJECTS_LLVM_DEBUG) -o $@ $(LLVM_LDFLAGS_DEBUG)
+	clang++ $(OBJECTS_LLVM_DEBUG) -o $@ $(LLVM_LDFLAGS_DEBUG)
 
 bin-gcc-release/$(EXECUTABLE): obj-gcc-release/ $(OBJECTS_GCC_RELEASE)
 	mkdir -p $(dir $@)
diff --git a/aconvert2/makefile b/aconvert2/makefile
index 6fd37b70af964c595f1790fac43831a0748e368d..c93b8d833f7f4a5b54c851b34c7325b79f849f30 100644
--- a/aconvert2/makefile
+++ b/aconvert2/makefile
@@ -109,7 +109,7 @@ bin-gcc-debug/$(EXECUTABLE): obj-gcc-debug/ $(OBJECTS_GCC_DEBUG)
 
 bin-llvm-debug/$(EXECUTABLE): obj-llvm-debug/ $(OBJECTS_LLVM_DEBUG)
 	mkdir -p $(dir $@)
-	clangg++ $(OBJECTS_LLVM_DEBUG) -o $@ $(LLVM_LDFLAGS_DEBUG)
+	clang++ $(OBJECTS_LLVM_DEBUG) -o $@ $(LLVM_LDFLAGS_DEBUG)
 
 bin-gcc-release/$(EXECUTABLE): obj-gcc-release/ $(OBJECTS_GCC_RELEASE)
 	mkdir -p $(dir $@)
diff --git a/aderivation2/makefile b/aderivation2/makefile
index bb51940d14d834afda310e190a473b35677630dd..6bfd04eceb5cf5096b8fb3ea8bf53b3414bbe6e2 100644
--- a/aderivation2/makefile
+++ b/aderivation2/makefile
@@ -109,7 +109,7 @@ bin-gcc-debug/$(EXECUTABLE): obj-gcc-debug/ $(OBJECTS_GCC_DEBUG)
 
 bin-llvm-debug/$(EXECUTABLE): obj-llvm-debug/ $(OBJECTS_LLVM_DEBUG)
 	mkdir -p $(dir $@)
-	clangg++ $(OBJECTS_LLVM_DEBUG) -o $@ $(LLVM_LDFLAGS_DEBUG)
+	clang++ $(OBJECTS_LLVM_DEBUG) -o $@ $(LLVM_LDFLAGS_DEBUG)
 
 bin-gcc-release/$(EXECUTABLE): obj-gcc-release/ $(OBJECTS_GCC_RELEASE)
 	mkdir -p $(dir $@)
diff --git a/adeterminize2/makefile b/adeterminize2/makefile
index 0e7938c28e9a4cf465b022fde8ee6ea273a1df2e..82439d7f96ca7cdd3848438185c460c106ec120a 100644
--- a/adeterminize2/makefile
+++ b/adeterminize2/makefile
@@ -109,7 +109,7 @@ bin-gcc-debug/$(EXECUTABLE): obj-gcc-debug/ $(OBJECTS_GCC_DEBUG)
 
 bin-llvm-debug/$(EXECUTABLE): obj-llvm-debug/ $(OBJECTS_LLVM_DEBUG)
 	mkdir -p $(dir $@)
-	clangg++ $(OBJECTS_LLVM_DEBUG) -o $@ $(LLVM_LDFLAGS_DEBUG)
+	clang++ $(OBJECTS_LLVM_DEBUG) -o $@ $(LLVM_LDFLAGS_DEBUG)
 
 bin-gcc-release/$(EXECUTABLE): obj-gcc-release/ $(OBJECTS_GCC_RELEASE)
 	mkdir -p $(dir $@)
diff --git a/aecho2/makefile b/aecho2/makefile
index 24f166d2bdd8c95239ce30021b7ea2fcf0003b96..3cd763c3f6fe2e012e7dfd25a0869ddfb459efff 100644
--- a/aecho2/makefile
+++ b/aecho2/makefile
@@ -109,7 +109,7 @@ bin-gcc-debug/$(EXECUTABLE): obj-gcc-debug/ $(OBJECTS_GCC_DEBUG)
 
 bin-llvm-debug/$(EXECUTABLE): obj-llvm-debug/ $(OBJECTS_LLVM_DEBUG)
 	mkdir -p $(dir $@)
-	clangg++ $(OBJECTS_LLVM_DEBUG) -o $@ $(LLVM_LDFLAGS_DEBUG)
+	clang++ $(OBJECTS_LLVM_DEBUG) -o $@ $(LLVM_LDFLAGS_DEBUG)
 
 bin-gcc-release/$(EXECUTABLE): obj-gcc-release/ $(OBJECTS_GCC_RELEASE)
 	mkdir -p $(dir $@)
diff --git a/aepsilon2/makefile b/aepsilon2/makefile
index 972737fed572e824039a7fe037791fd4d142a827..a92fcd6899ef1d8e23d431b5eead55c68be0b24d 100644
--- a/aepsilon2/makefile
+++ b/aepsilon2/makefile
@@ -109,7 +109,7 @@ bin-gcc-debug/$(EXECUTABLE): obj-gcc-debug/ $(OBJECTS_GCC_DEBUG)
 
 bin-llvm-debug/$(EXECUTABLE): obj-llvm-debug/ $(OBJECTS_LLVM_DEBUG)
 	mkdir -p $(dir $@)
-	clangg++ $(OBJECTS_LLVM_DEBUG) -o $@ $(LLVM_LDFLAGS_DEBUG)
+	clang++ $(OBJECTS_LLVM_DEBUG) -o $@ $(LLVM_LDFLAGS_DEBUG)
 
 bin-gcc-release/$(EXECUTABLE): obj-gcc-release/ $(OBJECTS_GCC_RELEASE)
 	mkdir -p $(dir $@)
diff --git a/agenerate2/makefile b/agenerate2/makefile
index 93c161f1f9f91c8705237bee59f8a765ce29d555..ef0d0671ee9b8e99c4f618687700320ddb64893a 100644
--- a/agenerate2/makefile
+++ b/agenerate2/makefile
@@ -109,7 +109,7 @@ bin-gcc-debug/$(EXECUTABLE): obj-gcc-debug/ $(OBJECTS_GCC_DEBUG)
 
 bin-llvm-debug/$(EXECUTABLE): obj-llvm-debug/ $(OBJECTS_LLVM_DEBUG)
 	mkdir -p $(dir $@)
-	clangg++ $(OBJECTS_LLVM_DEBUG) -o $@ $(LLVM_LDFLAGS_DEBUG)
+	clang++ $(OBJECTS_LLVM_DEBUG) -o $@ $(LLVM_LDFLAGS_DEBUG)
 
 bin-gcc-release/$(EXECUTABLE): obj-gcc-release/ $(OBJECTS_GCC_RELEASE)
 	mkdir -p $(dir $@)
diff --git a/aintegral2/makefile b/aintegral2/makefile
index c10f5bdf45bf1f6a2f7d7a43270322ffa28fcb7e..1dfd2a7a37115a6be57cde5ecea06b8a177e06f4 100644
--- a/aintegral2/makefile
+++ b/aintegral2/makefile
@@ -109,7 +109,7 @@ bin-gcc-debug/$(EXECUTABLE): obj-gcc-debug/ $(OBJECTS_GCC_DEBUG)
 
 bin-llvm-debug/$(EXECUTABLE): obj-llvm-debug/ $(OBJECTS_LLVM_DEBUG)
 	mkdir -p $(dir $@)
-	clangg++ $(OBJECTS_LLVM_DEBUG) -o $@ $(LLVM_LDFLAGS_DEBUG)
+	clang++ $(OBJECTS_LLVM_DEBUG) -o $@ $(LLVM_LDFLAGS_DEBUG)
 
 bin-gcc-release/$(EXECUTABLE): obj-gcc-release/ $(OBJECTS_GCC_RELEASE)
 	mkdir -p $(dir $@)
diff --git a/alangop2/makefile b/alangop2/makefile
index 56e8d06dcbca2cf4690589f73f354ececbb83854..92c8a3d0a15eb8fef9d3c2eb7c20e47effaf4afa 100644
--- a/alangop2/makefile
+++ b/alangop2/makefile
@@ -109,7 +109,7 @@ bin-gcc-debug/$(EXECUTABLE): obj-gcc-debug/ $(OBJECTS_GCC_DEBUG)
 
 bin-llvm-debug/$(EXECUTABLE): obj-llvm-debug/ $(OBJECTS_LLVM_DEBUG)
 	mkdir -p $(dir $@)
-	clangg++ $(OBJECTS_LLVM_DEBUG) -o $@ $(LLVM_LDFLAGS_DEBUG)
+	clang++ $(OBJECTS_LLVM_DEBUG) -o $@ $(LLVM_LDFLAGS_DEBUG)
 
 bin-gcc-release/$(EXECUTABLE): obj-gcc-release/ $(OBJECTS_GCC_RELEASE)
 	mkdir -p $(dir $@)
diff --git a/aminimize2/makefile b/aminimize2/makefile
index b3ae8123e94c1190ec5ae02735a30e1132bf59b1..eb158144181ea0e2770a30ce158f2968ec6cb2c0 100644
--- a/aminimize2/makefile
+++ b/aminimize2/makefile
@@ -109,7 +109,7 @@ bin-gcc-debug/$(EXECUTABLE): obj-gcc-debug/ $(OBJECTS_GCC_DEBUG)
 
 bin-llvm-debug/$(EXECUTABLE): obj-llvm-debug/ $(OBJECTS_LLVM_DEBUG)
 	mkdir -p $(dir $@)
-	clangg++ $(OBJECTS_LLVM_DEBUG) -o $@ $(LLVM_LDFLAGS_DEBUG)
+	clang++ $(OBJECTS_LLVM_DEBUG) -o $@ $(LLVM_LDFLAGS_DEBUG)
 
 bin-gcc-release/$(EXECUTABLE): obj-gcc-release/ $(OBJECTS_GCC_RELEASE)
 	mkdir -p $(dir $@)
diff --git a/anormalize2/makefile b/anormalize2/makefile
index 7a40886a1d2db8003e834f40ac496ab1259bc28e..23cfaa3a3605d1c189f23af853229494239ea595 100644
--- a/anormalize2/makefile
+++ b/anormalize2/makefile
@@ -109,7 +109,7 @@ bin-gcc-debug/$(EXECUTABLE): obj-gcc-debug/ $(OBJECTS_GCC_DEBUG)
 
 bin-llvm-debug/$(EXECUTABLE): obj-llvm-debug/ $(OBJECTS_LLVM_DEBUG)
 	mkdir -p $(dir $@)
-	clangg++ $(OBJECTS_LLVM_DEBUG) -o $@ $(LLVM_LDFLAGS_DEBUG)
+	clang++ $(OBJECTS_LLVM_DEBUG) -o $@ $(LLVM_LDFLAGS_DEBUG)
 
 bin-gcc-release/$(EXECUTABLE): obj-gcc-release/ $(OBJECTS_GCC_RELEASE)
 	mkdir -p $(dir $@)
diff --git a/arand2/makefile b/arand2/makefile
index be0908303706e01473245289711a841aef44366a..7b9e19f8cecc41008fd98ce0b69d3785c0caa30e 100644
--- a/arand2/makefile
+++ b/arand2/makefile
@@ -109,7 +109,7 @@ bin-gcc-debug/$(EXECUTABLE): obj-gcc-debug/ $(OBJECTS_GCC_DEBUG)
 
 bin-llvm-debug/$(EXECUTABLE): obj-llvm-debug/ $(OBJECTS_LLVM_DEBUG)
 	mkdir -p $(dir $@)
-	clangg++ $(OBJECTS_LLVM_DEBUG) -o $@ $(LLVM_LDFLAGS_DEBUG)
+	clang++ $(OBJECTS_LLVM_DEBUG) -o $@ $(LLVM_LDFLAGS_DEBUG)
 
 bin-gcc-release/$(EXECUTABLE): obj-gcc-release/ $(OBJECTS_GCC_RELEASE)
 	mkdir -p $(dir $@)
diff --git a/arename2/makefile b/arename2/makefile
index d919438febf335528316a7894183ec2ba675fdbb..b88ec8e474f73d5b30a6828f3adc145f8e55026f 100644
--- a/arename2/makefile
+++ b/arename2/makefile
@@ -109,7 +109,7 @@ bin-gcc-debug/$(EXECUTABLE): obj-gcc-debug/ $(OBJECTS_GCC_DEBUG)
 
 bin-llvm-debug/$(EXECUTABLE): obj-llvm-debug/ $(OBJECTS_LLVM_DEBUG)
 	mkdir -p $(dir $@)
-	clangg++ $(OBJECTS_LLVM_DEBUG) -o $@ $(LLVM_LDFLAGS_DEBUG)
+	clang++ $(OBJECTS_LLVM_DEBUG) -o $@ $(LLVM_LDFLAGS_DEBUG)
 
 bin-gcc-release/$(EXECUTABLE): obj-gcc-release/ $(OBJECTS_GCC_RELEASE)
 	mkdir -p $(dir $@)
diff --git a/areverse2/makefile b/areverse2/makefile
index 9a1fed50ba45ae3bbb4f10cb9ce88fba63ea270e..8730473c1ca5a712fde05ce61ddde58701b915b0 100644
--- a/areverse2/makefile
+++ b/areverse2/makefile
@@ -109,7 +109,7 @@ bin-gcc-debug/$(EXECUTABLE): obj-gcc-debug/ $(OBJECTS_GCC_DEBUG)
 
 bin-llvm-debug/$(EXECUTABLE): obj-llvm-debug/ $(OBJECTS_LLVM_DEBUG)
 	mkdir -p $(dir $@)
-	clangg++ $(OBJECTS_LLVM_DEBUG) -o $@ $(LLVM_LDFLAGS_DEBUG)
+	clang++ $(OBJECTS_LLVM_DEBUG) -o $@ $(LLVM_LDFLAGS_DEBUG)
 
 bin-gcc-release/$(EXECUTABLE): obj-gcc-release/ $(OBJECTS_GCC_RELEASE)
 	mkdir -p $(dir $@)
diff --git a/arun2/makefile b/arun2/makefile
index 5b6fad53a440796b78cd283572d3273949be13fc..f9c4af2773e66b23558771a9d6fd62b8af6ad527 100644
--- a/arun2/makefile
+++ b/arun2/makefile
@@ -109,7 +109,7 @@ bin-gcc-debug/$(EXECUTABLE): obj-gcc-debug/ $(OBJECTS_GCC_DEBUG)
 
 bin-llvm-debug/$(EXECUTABLE): obj-llvm-debug/ $(OBJECTS_LLVM_DEBUG)
 	mkdir -p $(dir $@)
-	clangg++ $(OBJECTS_LLVM_DEBUG) -o $@ $(LLVM_LDFLAGS_DEBUG)
+	clang++ $(OBJECTS_LLVM_DEBUG) -o $@ $(LLVM_LDFLAGS_DEBUG)
 
 bin-gcc-release/$(EXECUTABLE): obj-gcc-release/ $(OBJECTS_GCC_RELEASE)
 	mkdir -p $(dir $@)
diff --git a/astat2/makefile b/astat2/makefile
index ffb05e6845dfadbaba0cee0f7a482819ff0cb574..7590ee88cff4b7c3a37a34a345371e8bb9c9da59 100644
--- a/astat2/makefile
+++ b/astat2/makefile
@@ -109,7 +109,7 @@ bin-gcc-debug/$(EXECUTABLE): obj-gcc-debug/ $(OBJECTS_GCC_DEBUG)
 
 bin-llvm-debug/$(EXECUTABLE): obj-llvm-debug/ $(OBJECTS_LLVM_DEBUG)
 	mkdir -p $(dir $@)
-	clangg++ $(OBJECTS_LLVM_DEBUG) -o $@ $(LLVM_LDFLAGS_DEBUG)
+	clang++ $(OBJECTS_LLVM_DEBUG) -o $@ $(LLVM_LDFLAGS_DEBUG)
 
 bin-gcc-release/$(EXECUTABLE): obj-gcc-release/ $(OBJECTS_GCC_RELEASE)
 	mkdir -p $(dir $@)
diff --git a/astringology2/makefile b/astringology2/makefile
index fbfd38d0c3e70a777e805a0c7b14f1d8de7dc43f..f86f3208d645fe29b41e92458eae8d9785a6b777 100644
--- a/astringology2/makefile
+++ b/astringology2/makefile
@@ -109,7 +109,7 @@ bin-gcc-debug/$(EXECUTABLE): obj-gcc-debug/ $(OBJECTS_GCC_DEBUG)
 
 bin-llvm-debug/$(EXECUTABLE): obj-llvm-debug/ $(OBJECTS_LLVM_DEBUG)
 	mkdir -p $(dir $@)
-	clangg++ $(OBJECTS_LLVM_DEBUG) -o $@ $(LLVM_LDFLAGS_DEBUG)
+	clang++ $(OBJECTS_LLVM_DEBUG) -o $@ $(LLVM_LDFLAGS_DEBUG)
 
 bin-gcc-release/$(EXECUTABLE): obj-gcc-release/ $(OBJECTS_GCC_RELEASE)
 	mkdir -p $(dir $@)
diff --git a/atrim2/makefile b/atrim2/makefile
index ba1981de901a67ecaedd1b6a2bf0e3e198faa050..8c98723b245ce851074fa015f6f879739d64ceba 100644
--- a/atrim2/makefile
+++ b/atrim2/makefile
@@ -109,7 +109,7 @@ bin-gcc-debug/$(EXECUTABLE): obj-gcc-debug/ $(OBJECTS_GCC_DEBUG)
 
 bin-llvm-debug/$(EXECUTABLE): obj-llvm-debug/ $(OBJECTS_LLVM_DEBUG)
 	mkdir -p $(dir $@)
-	clangg++ $(OBJECTS_LLVM_DEBUG) -o $@ $(LLVM_LDFLAGS_DEBUG)
+	clang++ $(OBJECTS_LLVM_DEBUG) -o $@ $(LLVM_LDFLAGS_DEBUG)
 
 bin-gcc-release/$(EXECUTABLE): obj-gcc-release/ $(OBJECTS_GCC_RELEASE)
 	mkdir -p $(dir $@)
diff --git a/tniceprint/makefile b/tniceprint/makefile
index a880042677397eec1da08b786e5ce71f939e5952..15f2fe04d6b6093f8f4095d724162adfbd1119f1 100644
--- a/tniceprint/makefile
+++ b/tniceprint/makefile
@@ -109,7 +109,7 @@ bin-gcc-debug/$(EXECUTABLE): obj-gcc-debug/ $(OBJECTS_GCC_DEBUG)
 
 bin-llvm-debug/$(EXECUTABLE): obj-llvm-debug/ $(OBJECTS_LLVM_DEBUG)
 	mkdir -p $(dir $@)
-	clangg++ $(OBJECTS_LLVM_DEBUG) -o $@ $(LLVM_LDFLAGS_DEBUG)
+	clang++ $(OBJECTS_LLVM_DEBUG) -o $@ $(LLVM_LDFLAGS_DEBUG)
 
 bin-gcc-release/$(EXECUTABLE): obj-gcc-release/ $(OBJECTS_GCC_RELEASE)
 	mkdir -p $(dir $@)