diff --git a/CMakeLists.txt b/CMakeLists.txt
index dfa35d7cb6..59dbf08948 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 2.8)
 
-project(uncrustify)
+project(uncrustify_vendor)
 
 if("${PROJECT_SOURCE_DIR}" STREQUAL "${PROJECT_BINARY_DIR}")
   message(FATAL_ERROR "
@@ -271,7 +271,7 @@ endif()
 #
 # Package
 #
-set(CPACK_PACKAGE_NAME "uncrustify")
+set(CPACK_PACKAGE_NAME "uncrustify_vendor")
 set(CPACK_PACKAGE_VERSION "${CURRENT_VERSION}")
 set(CPACK_PACKAGE_VENDOR "Ben Gardner")
 set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Code beautifier")
diff --git a/package.xml b/package.xml
index 21c3734291..265e442bfe 100644
--- a/package.xml
+++ b/package.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <?xml-model href="http://download.ros.org/schema/package_format2.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="2">
-  <name>uncrustify</name>
+  <name>uncrustify_vendor</name>
   <version>0.66.1</version>
   <description>
     Package a newer version of uncrustify (0.61+, b6593c1, April 14th 2015).
@@ -9,7 +9,7 @@
   <maintainer email="dthomas@osrfoundation.org">Dirk Thomas</maintainer>
   <license>GNU GENERAL PUBLIC LICENSE Version 3</license>
 
-  <url>https://github.com/bengardner/uncrustify</url>
+  <url>https://github.com/uncrustify/uncrustify</url>
 
   <build_depend>ament_cmake_core</build_depend>