diff --git a/clang/bindings/python/README.txt b/clang/bindings/python/README.txt
index ccc2619ccf5b..742cf8fbb8fc 100644
--- a/clang/bindings/python/README.txt
+++ b/clang/bindings/python/README.txt
@@ -2,10 +2,9 @@
 // Clang Python Bindings
 //===----------------------------------------------------------------------===//
 
-This directory implements Python bindings for Clang. Currently, only bindings
-for the CIndex C API exist.
+This directory implements Python bindings for Clang.
 
-You may need to alter LD_LIBRARY_PATH so that the CIndex library can be
+You may need to alter LD_LIBRARY_PATH so that the Clang library can be
 found. The unit tests are designed to be run with 'nosetests'. For example:
 --
 $ env PYTHONPATH=$(echo ~/llvm/tools/clang/bindings/python/) \
diff --git a/clang/bindings/python/clang/cindex.py b/clang/bindings/python/clang/cindex.py
index f4409aec3325..f0f81b5d6948 100644
--- a/clang/bindings/python/clang/cindex.py
+++ b/clang/bindings/python/clang/cindex.py
@@ -71,11 +71,11 @@ def get_cindex_library():
     import platform
     name = platform.system()
     if name == 'Darwin':
-        return cdll.LoadLibrary('libCIndex.dylib')
+        return cdll.LoadLibrary('libclang.dylib')
     elif name == 'Windows':
-        return cdll.LoadLibrary('libCIndex.dll')
+        return cdll.LoadLibrary('libclang.dll')
     else:
-        return cdll.LoadLibrary('libCIndex.so')
+        return cdll.LoadLibrary('libclang.so')
 
 # ctypes doesn't implicitly convert c_void_p to the appropriate wrapper
 # object. This is a problem, because it means that from_parameter will see an
diff --git a/clang/tools/CMakeLists.txt b/clang/tools/CMakeLists.txt
index 64c3a213cd78..ae33b782d49d 100644
--- a/clang/tools/CMakeLists.txt
+++ b/clang/tools/CMakeLists.txt
@@ -1,3 +1,3 @@
-add_subdirectory(CIndex)
+add_subdirectory(libclang)
 add_subdirectory(c-index-test)
 add_subdirectory(driver)
diff --git a/clang/tools/Makefile b/clang/tools/Makefile
index bfd5ad12f93d..8407dfdedde7 100644
--- a/clang/tools/Makefile
+++ b/clang/tools/Makefile
@@ -8,12 +8,12 @@
 ##===----------------------------------------------------------------------===##
 
 LEVEL := ../../..
-DIRS := driver CIndex c-index-test
+DIRS := driver libclang c-index-test
 
 include $(LEVEL)/Makefile.config
 
 ifeq ($(OS), $(filter $(OS), Cygwin MingW))
-DIRS := $(filter-out CIndex c-index-test, $(DIRS))
+DIRS := $(filter-out libclang c-index-test, $(DIRS))
 endif
 
 include $(LEVEL)/Makefile.common
diff --git a/clang/tools/c-index-test/CMakeLists.txt b/clang/tools/c-index-test/CMakeLists.txt
index f0a34a57987e..d965fd2b51e2 100644
--- a/clang/tools/c-index-test/CMakeLists.txt
+++ b/clang/tools/c-index-test/CMakeLists.txt
@@ -1,7 +1,7 @@
 set(LLVM_NO_RTTI 1)
 
 set( LLVM_USED_LIBS
-  CIndex
+  libclang
   clangIndex
   clangFrontend
   clangDriver
diff --git a/clang/tools/c-index-test/Makefile b/clang/tools/c-index-test/Makefile
index 141256361763..24fed16006dd 100644
--- a/clang/tools/c-index-test/Makefile
+++ b/clang/tools/c-index-test/Makefile
@@ -17,7 +17,7 @@ TOOL_NO_EXPORTS = 1
 include $(LEVEL)/Makefile.config
 
 LINK_COMPONENTS := bitreader mc core
-USEDLIBS = CIndex.a clangIndex.a clangFrontend.a clangDriver.a clangSema.a \
+USEDLIBS = clang.a clangIndex.a clangFrontend.a clangDriver.a clangSema.a \
 	   clangAnalysis.a clangAST.a clangParse.a clangLex.a clangBasic.a
 
 include $(LLVM_SRC_ROOT)/Makefile.rules
diff --git a/clang/tools/CIndex/CIndex.cpp b/clang/tools/libclang/CIndex.cpp
similarity index 100%
rename from clang/tools/CIndex/CIndex.cpp
rename to clang/tools/libclang/CIndex.cpp
diff --git a/clang/tools/CIndex/CIndexCodeCompletion.cpp b/clang/tools/libclang/CIndexCodeCompletion.cpp
similarity index 100%
rename from clang/tools/CIndex/CIndexCodeCompletion.cpp
rename to clang/tools/libclang/CIndexCodeCompletion.cpp
diff --git a/clang/tools/CIndex/CIndexDiagnostic.cpp b/clang/tools/libclang/CIndexDiagnostic.cpp
similarity index 100%
rename from clang/tools/CIndex/CIndexDiagnostic.cpp
rename to clang/tools/libclang/CIndexDiagnostic.cpp
diff --git a/clang/tools/CIndex/CIndexDiagnostic.h b/clang/tools/libclang/CIndexDiagnostic.h
similarity index 100%
rename from clang/tools/CIndex/CIndexDiagnostic.h
rename to clang/tools/libclang/CIndexDiagnostic.h
diff --git a/clang/tools/CIndex/CIndexInclusionStack.cpp b/clang/tools/libclang/CIndexInclusionStack.cpp
similarity index 100%
rename from clang/tools/CIndex/CIndexInclusionStack.cpp
rename to clang/tools/libclang/CIndexInclusionStack.cpp
diff --git a/clang/tools/CIndex/CIndexUSRs.cpp b/clang/tools/libclang/CIndexUSRs.cpp
similarity index 100%
rename from clang/tools/CIndex/CIndexUSRs.cpp
rename to clang/tools/libclang/CIndexUSRs.cpp
diff --git a/clang/tools/CIndex/CIndexer.cpp b/clang/tools/libclang/CIndexer.cpp
similarity index 100%
rename from clang/tools/CIndex/CIndexer.cpp
rename to clang/tools/libclang/CIndexer.cpp
diff --git a/clang/tools/CIndex/CIndexer.h b/clang/tools/libclang/CIndexer.h
similarity index 100%
rename from clang/tools/CIndex/CIndexer.h
rename to clang/tools/libclang/CIndexer.h
diff --git a/clang/tools/CIndex/CMakeLists.txt b/clang/tools/libclang/CMakeLists.txt
similarity index 77%
rename from clang/tools/CIndex/CMakeLists.txt
rename to clang/tools/libclang/CMakeLists.txt
index 609719e627fd..df4884be61d6 100644
--- a/clang/tools/CIndex/CMakeLists.txt
+++ b/clang/tools/libclang/CMakeLists.txt
@@ -18,7 +18,7 @@ set( LLVM_LINK_COMPONENTS
   core
   )
 
-add_clang_library(CIndex
+add_clang_library(libclang
   CIndex.cpp
   CIndexCodeCompletion.cpp
   CIndexDiagnostic.cpp
@@ -28,6 +28,7 @@ add_clang_library(CIndex
   CXCursor.cpp
   ../../include/clang-c/Index.h
 )
+set_target_properties(libclang PROPERTIES OUTPUT_NAME clang)
 
 if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
   # FIXME: Deal with LLVM_SUBMIT_VERSION?
@@ -36,9 +37,9 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
   # get underscore-prefixed names. It would be better to have build rules
   # which know how to produce a darwin-suitable exports file from the
   # regular exports file.
-  set_target_properties(CIndex
+  set_target_properties(libclang
     PROPERTIES
-    LINK_FLAGS "-avoid-version -Wl,-exported_symbols_list -Wl,${CMAKE_CURRENT_SOURCE_DIR}/CIndex.darwin.exports -Wl,-dead_strip -Wl,-seg1addr -Wl,0xE0000000"
+    LINK_FLAGS "-avoid-version -Wl,-exported_symbols_list -Wl,${CMAKE_CURRENT_SOURCE_DIR}/libclang.darwin.exports -Wl,-dead_strip -Wl,-seg1addr -Wl,0xE0000000"
     INSTALL_NAME_DIR "@executable_path/../lib"
     )
 endif()
@@ -47,10 +48,10 @@ if(MSVC)
   # windows.h doesn't compile with /Za
   get_target_property(NON_ANSI_COMPILE_FLAGS CIndex COMPILE_FLAGS)
   string(REPLACE /Za "" NON_ANSI_COMPILE_FLAGS ${NON_ANSI_COMPILE_FLAGS})
-  set_target_properties(CIndex PROPERTIES COMPILE_FLAGS ${NON_ANSI_COMPILE_FLAGS})
+  set_target_properties(libclang PROPERTIES COMPILE_FLAGS ${NON_ANSI_COMPILE_FLAGS})
 endif(MSVC)
 
-set_target_properties(CIndex
+set_target_properties(libclang
   PROPERTIES
   LINKER_LANGUAGE CXX
   DEFINE_SYMBOL _CINDEX_LIB_)
diff --git a/clang/tools/CIndex/CXCursor.cpp b/clang/tools/libclang/CXCursor.cpp
similarity index 100%
rename from clang/tools/CIndex/CXCursor.cpp
rename to clang/tools/libclang/CXCursor.cpp
diff --git a/clang/tools/CIndex/CXCursor.h b/clang/tools/libclang/CXCursor.h
similarity index 100%
rename from clang/tools/CIndex/CXCursor.h
rename to clang/tools/libclang/CXCursor.h
diff --git a/clang/tools/CIndex/CXSourceLocation.h b/clang/tools/libclang/CXSourceLocation.h
similarity index 100%
rename from clang/tools/CIndex/CXSourceLocation.h
rename to clang/tools/libclang/CXSourceLocation.h
diff --git a/clang/tools/CIndex/Makefile b/clang/tools/libclang/Makefile
similarity index 93%
rename from clang/tools/CIndex/Makefile
rename to clang/tools/libclang/Makefile
index 391746d4d4fd..a7877bf8e16b 100644
--- a/clang/tools/CIndex/Makefile
+++ b/clang/tools/libclang/Makefile
@@ -1,4 +1,4 @@
-##===- tools/CIndex/Makefile -------------------------------*- Makefile -*-===##
+##===- tools/libclang/Makefile -----------------------------*- Makefile -*-===##
 # 
 #                     The LLVM Compiler Infrastructure
 #
@@ -8,9 +8,9 @@
 ##===----------------------------------------------------------------------===##
 
 LEVEL = ../../../..
-LIBRARYNAME = CIndex
+LIBRARYNAME = clang
 
-EXPORTED_SYMBOL_FILE = $(PROJ_SRC_DIR)/CIndex.exports
+EXPORTED_SYMBOL_FILE = $(PROJ_SRC_DIR)/libclang.exports
 
 CPP.Flags += -I$(PROJ_SRC_DIR)/../../include -I$(PROJ_OBJ_DIR)/../../include
 
diff --git a/clang/tools/CIndex/CIndex.darwin.exports b/clang/tools/libclang/libclang.darwin.exports
similarity index 100%
rename from clang/tools/CIndex/CIndex.darwin.exports
rename to clang/tools/libclang/libclang.darwin.exports
diff --git a/clang/tools/CIndex/CIndex.exports b/clang/tools/libclang/libclang.exports
similarity index 100%
rename from clang/tools/CIndex/CIndex.exports
rename to clang/tools/libclang/libclang.exports