diff --git a/libcxxabi/src/CMakeLists.txt b/libcxxabi/src/CMakeLists.txt
index b6fca8215a2c..d951292a6eb5 100644
--- a/libcxxabi/src/CMakeLists.txt
+++ b/libcxxabi/src/CMakeLists.txt
@@ -134,14 +134,17 @@ endif()
 add_custom_target(cxxabi DEPENDS ${LIBCXXABI_TARGETS})
 
 install(TARGETS ${LIBCXXABI_TARGETS}
-  LIBRARY DESTINATION lib${LIBCXXABI_LIBDIR_SUFFIX} COMPONENT libcxxabi
-  ARCHIVE DESTINATION lib${LIBCXXABI_LIBDIR_SUFFIX} COMPONENT libcxxabi
+  LIBRARY DESTINATION lib${LIBCXXABI_LIBDIR_SUFFIX} COMPONENT cxxabi
+  ARCHIVE DESTINATION lib${LIBCXXABI_LIBDIR_SUFFIX} COMPONENT cxxabi
   )
 
 if (NOT CMAKE_CONFIGURATION_TYPES)
-  add_custom_target(install-libcxxabi
+  add_custom_target(install-cxxabi
     DEPENDS cxxabi
     COMMAND "${CMAKE_COMMAND}"
-            -DCMAKE_INSTALL_COMPONENT=libcxxabi
+            -DCMAKE_INSTALL_COMPONENT=cxxabi
             -P "${LIBCXXABI_BINARY_DIR}/cmake_install.cmake")
+
+  # TODO: This is a legacy target name and should be removed at some point.
+  add_custom_target(install-libcxxabi DEPENDS install-cxxabi)
 endif()
diff --git a/libcxxabi/test/CMakeLists.txt b/libcxxabi/test/CMakeLists.txt
index e31b5255ea08..7277cbb1af24 100644
--- a/libcxxabi/test/CMakeLists.txt
+++ b/libcxxabi/test/CMakeLists.txt
@@ -42,7 +42,10 @@ if (NOT LIBCXXABI_STANDALONE_BUILD)
   endif()
 endif()
 
-add_lit_testsuite(check-libcxxabi "Running libcxxabi tests"
+add_lit_testsuite(check-cxxabi "Running libcxxabi tests"
   ${CMAKE_CURRENT_BINARY_DIR}
   DEPENDS ${LIBCXXABI_TEST_DEPS}
   )
+
+# TODO: This is a legacy target name and should be removed at some point.
+add_custom_target(check-libcxxabi DEPENDS check-cxxabi)
diff --git a/libcxxabi/www/index.html b/libcxxabi/www/index.html
index b86306e7c56d..66bbb64824ec 100644
--- a/libcxxabi/www/index.html
+++ b/libcxxabi/www/index.html
@@ -112,7 +112,7 @@
 
   <p>To run the tests:</p>
   <ul>
-  <li><code>make check-libcxxabi</code></li>
+  <li><code>make check-cxxabi</code></li>
   </ul>
   <p>Note: in a standalone build, the system's libc++ will be used for tests. If
   the system's libc++ was statically linked against libc++abi (or linked against