diff --git a/test/Driver/bindings.c b/test/Driver/bindings.c
index e013e33..0e5623f 100644
--- a/test/Driver/bindings.c
+++ b/test/Driver/bindings.c
@@ -1,47 +1,47 @@
 // Basic binding.
-// RUN: clang-driver -ccc-host-triple i386-unknown-unknown -ccc-print-bindings %s 2> %t &&
+// RUN: clang -ccc-host-triple i386-unknown-unknown -ccc-print-bindings %s 2> %t &&
 // RUN: grep 'bind - "clang", inputs: \[".*bindings.c"\], output: ".*\.s"' %t &&
 // RUN: grep 'bind - "gcc::Assemble", inputs: \[".*\.s"\], output: ".*\.o"' %t &&
 // RUN: grep 'bind - "gcc::Link", inputs: \[".*\.o"\], output: "a.out"' %t &&
 
-// RUN: clang-driver -ccc-host-triple i386-unknown-unknown -ccc-print-bindings -ccc-no-clang %s 2> %t &&
+// RUN: clang -ccc-host-triple i386-unknown-unknown -ccc-print-bindings -ccc-no-clang %s 2> %t &&
 // RUN: grep 'bind - "gcc::Compile", inputs: \[".*bindings.c"\], output: ".*\.s"' %t &&
 // RUN: grep 'bind - "gcc::Assemble", inputs: \[".*\.s"\], output: ".*\.o"' %t &&
 // RUN: grep 'bind - "gcc::Link", inputs: \[".*\.o"\], output: "a.out"' %t &&
 
-// RUN: clang-driver -ccc-host-triple i386-unknown-unknown -ccc-print-bindings -ccc-no-clang -no-integrated-cpp %s 2> %t &&
+// RUN: clang -ccc-host-triple i386-unknown-unknown -ccc-print-bindings -ccc-no-clang -no-integrated-cpp %s 2> %t &&
 // RUN: grep 'bind - "gcc::Preprocess", inputs: \[".*bindings.c"\], output: ".*\.i"' %t &&
 // RUN: grep 'bind - "gcc::Compile", inputs: \[".*\.i"\], output: ".*\.s"' %t &&
 // RUN: grep 'bind - "gcc::Assemble", inputs: \[".*\.s"\], output: ".*\.o"' %t &&
 // RUN: grep 'bind - "gcc::Link", inputs: \[".*\.o"\], output: "a.out"' %t &&
 
-// RUN: clang-driver -ccc-host-triple i386-unknown-unknown -ccc-print-bindings -ccc-no-clang -no-integrated-cpp -pipe %s 2> %t &&
+// RUN: clang -ccc-host-triple i386-unknown-unknown -ccc-print-bindings -ccc-no-clang -no-integrated-cpp -pipe %s 2> %t &&
 // RUN: grep 'bind - "gcc::Preprocess", inputs: \[".*bindings.c"\], output: (pipe)' %t &&
 // RUN: grep 'bind - "gcc::Compile", inputs: \[(pipe)\], output: (pipe)' %t &&
 // RUN: grep 'bind - "gcc::Assemble", inputs: \[(pipe)\], output: ".*\.o"' %t &&
 // RUN: grep 'bind - "gcc::Link", inputs: \[".*\.o"\], output: "a.out"' %t &&
 
-// RUN: clang-driver -ccc-host-triple i386-unknown-unknown -ccc-print-bindings -ccc-no-clang -x c-header %s 2> %t &&
+// RUN: clang -ccc-host-triple i386-unknown-unknown -ccc-print-bindings -ccc-no-clang -x c-header %s 2> %t &&
 // RUN: grep 'bind - "gcc::Precompile", inputs: \[".*bindings.c"\], output: ".*bindings.c.gch' %t &&
 
 // Clang control options
 
-// RUN: clang-driver -ccc-host-triple i386-unknown-unknown -ccc-print-bindings -fsyntax-only %s 2> %t &&
+// RUN: clang -ccc-host-triple i386-unknown-unknown -ccc-print-bindings -fsyntax-only %s 2> %t &&
 // RUN: grep 'bind - "clang", inputs: \[".*bindings.c"\], output: (nothing)' %t &&
-// RUN: clang-driver -ccc-host-triple i386-unknown-unknown -ccc-print-bindings -ccc-no-clang -fsyntax-only %s 2> %t &&
+// RUN: clang -ccc-host-triple i386-unknown-unknown -ccc-print-bindings -ccc-no-clang -fsyntax-only %s 2> %t &&
 // RUN: grep 'bind - "gcc::Compile", inputs: \[".*bindings.c"\], output: (nothing)' %t &&
-// RUN: clang-driver -ccc-host-triple i386-unknown-unknown -ccc-print-bindings -ccc-no-clang-cxx -fsyntax-only -x c++ %s 2> %t &&
+// RUN: clang -ccc-host-triple i386-unknown-unknown -ccc-print-bindings -ccc-no-clang-cxx -fsyntax-only -x c++ %s 2> %t &&
 // RUN: grep 'bind - "gcc::Compile", inputs: \[".*bindings.c"\], output: (nothing)' %t &&
-// RUN: clang-driver -ccc-print-bindings -ccc-no-clang-cpp -fsyntax-only -no-integrated-cpp -x c++ %s 2> %t &&
+// RUN: clang -ccc-print-bindings -ccc-no-clang-cpp -fsyntax-only -no-integrated-cpp -x c++ %s 2> %t &&
 // RUN: grep 'bind - "gcc::Preprocess", inputs: \[".*bindings.c"\], output: ".*\.ii"' %t &&
 // RUN: grep 'bind - "clang", inputs: \[".*\.ii"\], output: (nothing)' %t &&
-// RUN: clang-driver -ccc-host-triple i386-unknown-unknown -ccc-host-triple i386-apple-darwin9 -ccc-print-bindings -ccc-clang-archs i386 %s -S -arch ppc 2> %t &&
+// RUN: clang -ccc-host-triple i386-unknown-unknown -ccc-host-triple i386-apple-darwin9 -ccc-print-bindings -ccc-clang-archs i386 %s -S -arch ppc 2> %t &&
 // RUN: grep 'bind - "gcc::Compile", inputs: \[".*bindings.c"\], output: "bindings.s"' %t &&
-// RUN: clang-driver -ccc-host-triple i386-unknown-unknown -ccc-host-triple i386-apple-darwin9 -ccc-print-bindings -ccc-clang-archs ppc %s -S -arch ppc 2> %t &&
+// RUN: clang -ccc-host-triple i386-unknown-unknown -ccc-host-triple i386-apple-darwin9 -ccc-print-bindings -ccc-clang-archs ppc %s -S -arch ppc 2> %t &&
 // RUN: grep 'bind - "clang", inputs: \[".*bindings.c"\], output: "bindings.s"' %t &&
 
 // Darwin bindings
-// RUN: clang-driver -ccc-host-triple i386-apple-darwin9 -ccc-print-bindings %s 2> %t &&
+// RUN: clang -ccc-host-triple i386-apple-darwin9 -ccc-print-bindings %s 2> %t &&
 // RUN: grep 'bind - "clang", inputs: \[".*bindings.c"\], output: ".*\.s"' %t &&
 // RUN: grep 'bind - "darwin::Assemble", inputs: \[".*\.s"\], output: ".*\.o"' %t &&
 // RUN: grep 'bind - "gcc::Link", inputs: \[".*\.o"\], output: "a.out"' %t &&
diff --git a/test/Driver/clang-translation.c b/test/Driver/clang-translation.c
index d4229c1..e81dcb9 100644
--- a/test/Driver/clang-translation.c
+++ b/test/Driver/clang-translation.c
@@ -1,4 +1,4 @@
-// RUN: clang-driver -ccc-host-triple i386-unknown-unknown -### -S -Os %s -o %t.s 2> %t.log
+// RUN: clang -ccc-host-triple i386-unknown-unknown -### -S -Os %s -o %t.s 2> %t.log
 // RUN: grep '"-S"' %t.log &&
 // RUN: grep '"-disable-free"' %t.log &&
 // RUN: grep '"--relocation-model" "static"' %t.log &&
diff --git a/test/Driver/hello.c b/test/Driver/hello.c
index 503c274..7dbe9c7 100644
--- a/test/Driver/hello.c
+++ b/test/Driver/hello.c
@@ -1,4 +1,4 @@
-// RUN: clang-driver -ccc-echo -o %t %s 2> %t.log &&
+// RUN: clang -ccc-echo -o %t %s 2> %t.log &&
 
 // Make sure we used clang.
 // RUN: grep 'clang-cc" .*hello.c' %t.log &&
diff --git a/test/Driver/parsing.c b/test/Driver/parsing.c
index 59004d6..ed70949 100644
--- a/test/Driver/parsing.c
+++ b/test/Driver/parsing.c
@@ -1,4 +1,4 @@
-// RUN: clang-driver -ccc-print-options input -Yunknown -m32 -arch ppc -djoined -A separate -Ajoined -Wp,one,two -Xarch_joined AndSeparate -sectalign 1 2 3 2> %t &&
+// RUN: clang -ccc-print-options input -Yunknown -m32 -arch ppc -djoined -A separate -Ajoined -Wp,one,two -Xarch_joined AndSeparate -sectalign 1 2 3 2> %t &&
 // RUN: grep 'Option 0 - Name: "<input>", Values: {"input"}' %t &&
 // RUN: grep 'Option 1 - Name: "<unknown>", Values: {"-Yunknown"}' %t &&
 // RUN: grep 'Option 2 - Name: "-m32", Values: {}' %t &&
@@ -10,9 +10,9 @@
 // RUN: grep 'Option 8 - Name: "-Xarch_", Values: {"joined", "AndSeparate"}' %t &&
 // RUN: grep 'Option 9 - Name: "-sectalign", Values: {"1", "2", "3"}' %t &&
 
-// RUN: not clang-driver -V 2> %t &&
+// RUN: not clang -V 2> %t &&
 // RUN: grep "error: argument to '-V' is missing (expected 1 value)" %t &&
-// RUN: not clang-driver -sectalign 1 2 2> %t &&
+// RUN: not clang -sectalign 1 2 2> %t &&
 // RUN: grep "error: argument to '-sectalign' is missing (expected 3 values)" %t &&
 
 // RUN: true
diff --git a/test/Driver/phases.c b/test/Driver/phases.c
index 9b80a53..0967d33 100644
--- a/test/Driver/phases.c
+++ b/test/Driver/phases.c
@@ -1,5 +1,5 @@
 // Basic compilation for various types of files.
-// RUN: clang-driver -ccc-host-triple i386-unknown-unknown -ccc-print-phases -x c %s -x objective-c %s -x c++ %s -x objective-c++ -x assembler %s -x assembler-with-cpp %s -x none %s 2> %t &&
+// RUN: clang -ccc-host-triple i386-unknown-unknown -ccc-print-phases -x c %s -x objective-c %s -x c++ %s -x objective-c++ -x assembler %s -x assembler-with-cpp %s -x none %s 2> %t &&
 // RUN: grep '0: input, ".*phases.c", c' %t &&
 // RUN: grep -F '1: preprocessor, {0}, cpp-output' %t &&
 // RUN: grep -F '2: compiler, {1}, assembler' %t &&
@@ -24,7 +24,7 @@
 // RUN: grep -F '21: linker, {3, 7, 11, 13, 16, 20}, image' %t &&
 
 // Universal linked image.
-// RUN: clang-driver -ccc-host-triple i386-apple-darwin9 -ccc-print-phases -x c %s -arch ppc -arch i386 2> %t &&
+// RUN: clang -ccc-host-triple i386-apple-darwin9 -ccc-print-phases -x c %s -arch ppc -arch i386 2> %t &&
 // RUN: grep '0: input, ".*phases.c", c' %t &&
 // RUN: grep -F '1: preprocessor, {0}, cpp-output' %t &&
 // RUN: grep -F '2: compiler, {1}, assembler' %t &&
@@ -35,7 +35,7 @@
 // RUN: grep -F '7: lipo, {5, 6}, image' %t &&
 
 // Universal object file.
-// RUN: clang-driver -ccc-host-triple i386-apple-darwin9 -ccc-print-phases -c -x c %s -arch ppc -arch i386 2> %t &&
+// RUN: clang -ccc-host-triple i386-apple-darwin9 -ccc-print-phases -c -x c %s -arch ppc -arch i386 2> %t &&
 // RUN: grep '0: input, ".*phases.c", c' %t &&
 // RUN: grep -F '1: preprocessor, {0}, cpp-output' %t &&
 // RUN: grep -F '2: compiler, {1}, assembler' %t &&
@@ -45,33 +45,33 @@
 // RUN: grep -F '6: lipo, {4, 5}, object' %t &&
 
 // Arch defaulting
-// RUN: clang-driver -ccc-host-triple i386-apple-darwin9 -ccc-print-phases -c -x assembler %s 2> %t &&
+// RUN: clang -ccc-host-triple i386-apple-darwin9 -ccc-print-phases -c -x assembler %s 2> %t &&
 // RUN: grep -F '2: bind-arch, "i386", {1}, object' %t &&
-// RUN: clang-driver -ccc-host-triple i386-apple-darwin9 -ccc-print-phases -c -x assembler %s -m32 -m64 2> %t &&
+// RUN: clang -ccc-host-triple i386-apple-darwin9 -ccc-print-phases -c -x assembler %s -m32 -m64 2> %t &&
 // RUN: grep -F '2: bind-arch, "x86_64", {1}, object' %t &&
-// RUN: clang-driver -ccc-host-triple x86_64-apple-darwin9 -ccc-print-phases -c -x assembler %s 2> %t &&
+// RUN: clang -ccc-host-triple x86_64-apple-darwin9 -ccc-print-phases -c -x assembler %s 2> %t &&
 // RUN: grep -F '2: bind-arch, "x86_64", {1}, object' %t &&
-// RUN: clang-driver -ccc-host-triple x86_64-apple-darwin9 -ccc-print-phases -c -x assembler %s -m64 -m32 2> %t &&
+// RUN: clang -ccc-host-triple x86_64-apple-darwin9 -ccc-print-phases -c -x assembler %s -m64 -m32 2> %t &&
 // RUN: grep -F '2: bind-arch, "i386", {1}, object' %t &&
 
 // Analyzer
-// RUN: clang-driver -ccc-host-triple i386-unknown-unknown -ccc-print-phases --analyze %s 2> %t &&
+// RUN: clang -ccc-host-triple i386-unknown-unknown -ccc-print-phases --analyze %s 2> %t &&
 // RUN: grep '0: input, ".*phases.c", c' %t &&
 // RUN: grep -F '1: preprocessor, {0}, cpp-output' %t &&
 // RUN: grep -F '2: analyzer, {1}, plist' %t &&
 
 // Precompiler
-// RUN: clang-driver -ccc-host-triple i386-unknown-unknown -ccc-print-phases -x c-header %s 2> %t &&
+// RUN: clang -ccc-host-triple i386-unknown-unknown -ccc-print-phases -x c-header %s 2> %t &&
 // RUN: grep '0: input, ".*phases.c", c-header' %t &&
 // RUN: grep -F '1: preprocessor, {0}, c-header-cpp-output' %t &&
 // RUN: grep -F '2: precompiler, {1}, precompiled-header' %t &&
 
 // Darwin overrides the handling for .s
 // RUN: touch %t.s &&
-// RUN: clang-driver -ccc-host-triple i386-unknown-unknown -ccc-print-phases -c %t.s 2> %t &&
+// RUN: clang -ccc-host-triple i386-unknown-unknown -ccc-print-phases -c %t.s 2> %t &&
 // RUN: grep '0: input, ".*\.s", assembler' %t &&
 // RUN: grep -F '1: assembler, {0}, object' %t &&
-// RUN: clang-driver -ccc-host-triple i386-apple-darwin9 -ccc-print-phases -c %t.s 2> %t &&
+// RUN: clang -ccc-host-triple i386-apple-darwin9 -ccc-print-phases -c %t.s 2> %t &&
 // RUN: grep '0: input, ".*\.s", assembler-with-cpp' %t &&
 // RUN: grep -F '1: preprocessor, {0}, assembler' %t &&
 // RUN: grep -F '2: assembler, {1}, object' %t &&
diff --git a/test/Driver/pth.c b/test/Driver/pth.c
index 3fdcb80..f84b2a2 100644
--- a/test/Driver/pth.c
+++ b/test/Driver/pth.c
@@ -1,8 +1,8 @@
 // Test transparent PTH support.
 
-// RUN: clang-driver -x c-header %s -o %t.h.pch -### 2> %t.log &&
+// RUN: clang -x c-header %s -o %t.h.pch -### 2> %t.log &&
 // RUN: grep '".*/clang-cc" .* "-o" ".*\.h\.pch" "-x" "c-header" ".*pth\.c"' %t.log &&
 
 // RUN: touch %t.h.pth &&
-// RUN: clang-driver -E -include %t.h %s -### 2> %t.log &&
+// RUN: clang -E -include %t.h %s -### 2> %t.log &&
 // RUN: grep '".*/clang-cc" .*"-include-pth" ".*\.h\.pth" .*"-x" "c" ".*pth\.c"' %t.log
diff --git a/tools/driver/CMakeLists.txt b/tools/driver/CMakeLists.txt
index a47581b..b2bc0bd 100644
--- a/tools/driver/CMakeLists.txt
+++ b/tools/driver/CMakeLists.txt
@@ -5,6 +5,6 @@
 
 set(LLVM_LINK_COMPONENTS system support bitreader bitwriter)
 
-add_clang_tool(clang-driver
+add_clang_tool(clang
   driver.cpp
   )
diff --git a/tools/driver/Makefile b/tools/driver/Makefile
index 8910001..8e9c291 100644
--- a/tools/driver/Makefile
+++ b/tools/driver/Makefile
@@ -8,7 +8,7 @@
 ##===----------------------------------------------------------------------===##
 LEVEL = ../../../..
 
-TOOLNAME = clang-driver
+TOOLNAME = clang
 CPPFLAGS += -I$(PROJ_SRC_DIR)/../../include -I$(PROJ_OBJ_DIR)/../../include
 CXXFLAGS = -fno-rtti
 
diff --git a/tools/driver/driver.cpp b/tools/driver/driver.cpp
index b227761..d968cc8 100644
--- a/tools/driver/driver.cpp
+++ b/tools/driver/driver.cpp
@@ -95,3 +95,4 @@
 
   return Res;
 }
+