diff --git a/CHANGES.txt b/CHANGES.txt
index 4007ef4a825..4ba0862a73a 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1592,6 +1592,9 @@ Release 0.21.0 - Unreleased
     HADOOP-6723.  Unchecked exceptions thrown in IPC Connection should not
     orphan clients.  (Todd Lipcon via tomwhite)
 
+    HADOOP-6404. Rename the generated artifacts to common instead of core.
+    (tomwhite)
+
 Release 0.20.3 - Unreleased
 
   NEW FEATURES
diff --git a/build.xml b/build.xml
index 158df3e360d..2ba0ee4f73f 100644
--- a/build.xml
+++ b/build.xml
@@ -17,7 +17,7 @@
    limitations under the License.
 -->
 
-<project name="Hadoop-Core" default="compile" 
+<project name="Hadoop-Common" default="compile" 
    xmlns:ivy="antlib:org.apache.ivy.ant"
    xmlns:artifact="urn:maven-artifact-ant"> 
 
@@ -26,8 +26,8 @@
   <property file="${user.home}/build.properties" />
   <property file="${basedir}/build.properties" />
  
-  <property name="Name" value="Hadoop-core"/>
-  <property name="name" value="hadoop-core"/>
+  <property name="Name" value="Hadoop-common"/>
+  <property name="name" value="hadoop-common"/>
   <property name="version" value="0.22.0-SNAPSHOT"/>
   <property name="final.name" value="${name}-${version}"/>
   <property name="test.final.name" value="${name}-test-${version}"/>
@@ -149,21 +149,21 @@
   <property name="build.ivy.report.dir" location="${build.ivy.dir}/report"/>
   <property name="build.ivy.maven.dir" location="${build.ivy.dir}/maven"/>
   <property name="pom.xml" location="${build.ivy.maven.dir}/pom.xml"/>
-  <property name="hadoop-core.pom" location="${ivy.dir}/hadoop-core.xml"/>
-  <property name="build.ivy.maven.core.jar" location="${build.ivy.maven.dir}/hadoop-core-${version}.jar"/>
-  <property name="hadoop-core-test.pom" location="${ivy.dir}/hadoop-core-test.xml" />
-  <property name="build.ivy.maven.core-test.jar" location="${build.ivy.maven.dir}/hadoop-core-test-${version}.jar"/>
+  <property name="hadoop-common.pom" location="${ivy.dir}/hadoop-common.xml"/>
+  <property name="build.ivy.maven.common.jar" location="${build.ivy.maven.dir}/hadoop-common-${version}.jar"/>
+  <property name="hadoop-common-test.pom" location="${ivy.dir}/hadoop-common-test.xml" />
+  <property name="build.ivy.maven.common-test.jar" location="${build.ivy.maven.dir}/hadoop-common-test-${version}.jar"/>
 
   <!--this is the naming policy for artifacts we want pulled down-->
-  <property name="ivy.module" location="hadoop-core" />
+  <property name="ivy.module" location="hadoop-common" />
   <property name="ivy.artifact.retrieve.pattern" value="${ant.project.name}/[conf]/[artifact]-[revision].[ext]"/>
 
   <!--this is how artifacts that get built are named-->
   <property name="ivy.publish.pattern" value="[artifact]-[revision].[ext]"/>
-  <property name="hadoop-core.jar" location="${build.dir}/${final.name}.jar" />
-  <property name="hadoop-core-test.jar" location="${build.dir}/${test.final.name}.jar" />
-  <property name="hadoop-core-sources.jar" location="${build.dir}/${final.name}-sources.jar" />
-  <property name="hadoop-core-test-sources.jar" location="${build.dir}/${test.final.name}-sources.jar" />
+  <property name="hadoop-common.jar" location="${build.dir}/${final.name}.jar" />
+  <property name="hadoop-common-test.jar" location="${build.dir}/${test.final.name}.jar" />
+  <property name="hadoop-common-sources.jar" location="${build.dir}/${final.name}-sources.jar" />
+  <property name="hadoop-common-test-sources.jar" location="${build.dir}/${test.final.name}-sources.jar" />
 
   <!-- jdiff.home property set -->
   <property name="jdiff.home" value="${build.ivy.lib.dir}/${ant.project.name}/jdiff"/>
@@ -406,11 +406,11 @@
   </target>
 
   <!-- ================================================================== -->
-  <!-- Make hadoop-core.jar                                               -->
+  <!-- Make hadoop-common.jar                                               -->
   <!-- ================================================================== -->
   <!--                                                                    -->
   <!-- ================================================================== -->
-  <target name="jar" depends="compile-core" description="Make hadoop-core.jar">
+  <target name="jar" depends="compile-core" description="Make hadoop-common.jar">
     <tar compression="gzip" destfile="${build.classes}/bin.tgz">
       <tarfileset dir="bin" mode="755"/>
     </tar>
@@ -428,7 +428,7 @@
       <fileset file="${jar.extra.properties.list}" />
     </jar>
 
-    <jar jarfile="${hadoop-core-sources.jar}">
+    <jar jarfile="${hadoop-common-sources.jar}">
       <fileset dir="${java.src.dir}" includes="org/apache/hadoop/**/*.java"/>
       <fileset dir="${build.src}" includes="org/apache/hadoop/**/*.java"/>
     </jar>
@@ -537,7 +537,7 @@
          </manifest>
     </jar>
 
-    <jar jarfile="${hadoop-core-test-sources.jar}">
+    <jar jarfile="${hadoop-common-test-sources.jar}">
       <fileset dir="${test.generated.dir}" includes="org/apache/hadoop/**/*.java"/>
       <fileset dir="${test.src.dir}/core" includes="org/apache/hadoop/**/*.java"/>
     </jar>
@@ -1202,55 +1202,54 @@
          classpathref="mvn-ant-task.classpath"/>
   </target>   
 
-  <target name="mvn-install" depends="mvn-taskdef,jar,jar-test,
-    -mvn-system-install,set-version"
-     description="To install hadoop core and test jars to local filesystem's m2 cache">
-     <artifact:pom file="${hadoop-core.pom}" id="hadoop.core"/>
-     <artifact:pom file="${hadoop-core-test.pom}" id="hadoop.core.test"/>
-     <artifact:install file="${hadoop-core.jar}">
+  <target name="mvn-install" depends="mvn-taskdef,jar,jar-test,set-version,-mvn-system-install"
+     description="To install hadoop common and test jars to local filesystem's m2 cache">
+     <artifact:pom file="${hadoop-common.pom}" id="hadoop.core"/>
+     <artifact:pom file="${hadoop-common-test.pom}" id="hadoop.core.test"/>
+     <artifact:install file="${hadoop-common.jar}">
         <pom refid="hadoop.core"/>
-	<attach file="${hadoop-core-sources.jar}" classifier="sources" />
+	<attach file="${hadoop-common-sources.jar}" classifier="sources" />
      </artifact:install>
-     <artifact:install file="${hadoop-core-test.jar}">
+     <artifact:install file="${hadoop-common-test.jar}">
         <pom refid="hadoop.core.test"/>
-	<attach file="${hadoop-core-test-sources.jar}" classifier="sources" />
+	<attach file="${hadoop-common-test-sources.jar}" classifier="sources" />
      </artifact:install>
   </target>
 
   <target name="mvn-deploy" depends="mvn-taskdef, jar, jar-test, set-version,
     -mvn-system-deploy"
-     description="To deploy hadoop core and test jar's to apache snapshot's repository">
-     <artifact:pom file="${hadoop-core.pom}" id="hadoop.core"/>
-     <artifact:pom file="${hadoop-core-test.pom}" id="hadoop.core.test"/>
+     description="To deploy hadoop common and test jar's to apache snapshot's repository">
+     <artifact:pom file="${hadoop-common.pom}" id="hadoop.core"/>
+     <artifact:pom file="${hadoop-common-test.pom}" id="hadoop.core.test"/>
 
      <artifact:install-provider artifactId="wagon-http" version="1.0-beta-2"/>
-     <artifact:deploy file="${hadoop-core.jar}">
+     <artifact:deploy file="${hadoop-common.jar}">
          <remoteRepository id="apache.snapshots.https" url="${asfrepo}"/>
          <pom refid="hadoop.core"/>
-	<attach file="${hadoop-core-sources.jar}" classifier="sources" />
+	<attach file="${hadoop-common-sources.jar}" classifier="sources" />
      </artifact:deploy>
-     <artifact:deploy file="${hadoop-core-test.jar}">
+     <artifact:deploy file="${hadoop-common-test.jar}">
          <remoteRepository id="apache.snapshots.https" url="${asfrepo}"/>
          <pom refid="hadoop.core.test"/>
-	<attach file="${hadoop-core-test-sources.jar}" classifier="sources" />
+	<attach file="${hadoop-common-test-sources.jar}" classifier="sources" />
      </artifact:deploy>
   </target>
   
   <target name="set-version">
-    <delete file="${basedir}/ivy/hadoop-core.xml"/>
-    <delete file="${basedir}/ivy/hadoop-core-test.xml"/>
-    <delete file="${basedir}/ivy/hadoop-core-${herriot.suffix}.xml"/>
-    <copy file="${basedir}/ivy/hadoop-core-template.xml" tofile="${basedir}/ivy/hadoop-core.xml"/>
-    <copy file="${basedir}/ivy/hadoop-core-test-template.xml" tofile="${basedir}/ivy/hadoop-core-test.xml"/>
-    <copy file="${basedir}/ivy/hadoop-core-${herriot.suffix}-template.xml"
-      tofile="${basedir}/ivy/hadoop-core-${herriot.suffix}.xml"/>
+    <delete file="${basedir}/ivy/hadoop-common.xml"/>
+    <delete file="${basedir}/ivy/hadoop-common-test.xml"/>
+    <delete file="${basedir}/ivy/hadoop-common-${herriot.suffix}.xml"/>
+    <copy file="${basedir}/ivy/hadoop-common-template.xml" tofile="${basedir}/ivy/hadoop-common.xml"/>
+    <copy file="${basedir}/ivy/hadoop-common-test-template.xml" tofile="${basedir}/ivy/hadoop-common-test.xml"/>
+    <copy file="${basedir}/ivy/hadoop-common-${herriot.suffix}-template.xml"
+      tofile="${basedir}/ivy/hadoop-common-${herriot.suffix}.xml"/>
     <replaceregexp byline="true">
       <regexp pattern="@version"/>
       <substitution expression="${version}"/>
       <fileset dir="${basedir}/ivy">
-        <include name="hadoop-core.xml"/>
-        <include name="hadoop-core-test.xml"/>
-        <include name="hadoop-core-${herriot.suffix}.xml"/>
+        <include name="hadoop-common.xml"/>
+        <include name="hadoop-common-test.xml"/>
+        <include name="hadoop-common-${herriot.suffix}.xml"/>
       </fileset>
     </replaceregexp>
   </target>
@@ -1284,9 +1283,9 @@
   <!-- ================================================================== -->
   <target name="clean" depends="clean-contrib, clean-fi" description="Clean.  Delete the build files, and their directories">
     <delete dir="${build.dir}"/>
-    <delete file="${basedir}/ivy/hadoop-core.xml"/>
-    <delete file="${basedir}/ivy/hadoop-core-test.xml"/>
-    <delete file="${basedir}/ivy/hadoop-core-${herriot.suffix}.xml"/>
+    <delete file="${basedir}/ivy/hadoop-common.xml"/>
+    <delete file="${basedir}/ivy/hadoop-common-test.xml"/>
+    <delete file="${basedir}/ivy/hadoop-common-${herriot.suffix}.xml"/>
     <delete dir="${docs.src}/build"/>
     <delete dir="${src.docs.cn}/build"/>
   </target>
diff --git a/ivy.xml b/ivy.xml
index 7db919d82c1..49b091b9221 100644
--- a/ivy.xml
+++ b/ivy.xml
@@ -20,7 +20,7 @@
     <license name="Apache 2.0"/>
     <ivyauthor name="Apache Hadoop Team" url="http://hadoop.apache.org"/>
     <description>
-        Hadoop Core
+        Hadoop Common
     </description>
   </info>
   <configurations defaultconfmapping="default">
diff --git a/ivy/hadoop-core-instrumented-template.xml b/ivy/hadoop-common-instrumented-template.xml
similarity index 98%
rename from ivy/hadoop-core-instrumented-template.xml
rename to ivy/hadoop-common-instrumented-template.xml
index 8e837e9ad02..dbc00d6e5c9 100644
--- a/ivy/hadoop-core-instrumented-template.xml
+++ b/ivy/hadoop-common-instrumented-template.xml
@@ -19,7 +19,7 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.hadoop</groupId>
-  <artifactId>hadoop-core-instrumented</artifactId>
+  <artifactId>hadoop-common-instrumented</artifactId>
   <packaging>jar</packaging>
   <version>@version</version>
   <dependencies>
diff --git a/ivy/hadoop-core-template.xml b/ivy/hadoop-common-template.xml
similarity index 99%
rename from ivy/hadoop-core-template.xml
rename to ivy/hadoop-common-template.xml
index d17596c7f7d..d86472a4af2 100644
--- a/ivy/hadoop-core-template.xml
+++ b/ivy/hadoop-common-template.xml
@@ -19,7 +19,7 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.hadoop</groupId>
-  <artifactId>hadoop-core</artifactId>
+  <artifactId>hadoop-common</artifactId>
   <packaging>jar</packaging>
   <version>@version</version>
   <dependencies>
diff --git a/ivy/hadoop-core-test-template.xml b/ivy/hadoop-common-test-template.xml
similarity index 95%
rename from ivy/hadoop-core-test-template.xml
rename to ivy/hadoop-common-test-template.xml
index ed1967f2944..f906843179d 100644
--- a/ivy/hadoop-core-test-template.xml
+++ b/ivy/hadoop-common-test-template.xml
@@ -20,13 +20,13 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.hadoop</groupId>
-  <artifactId>hadoop-core-test</artifactId>
+  <artifactId>hadoop-common-test</artifactId>
   <packaging>jar</packaging>
   <version>@version</version>
   <dependencies>
     <dependency>
       <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-core</artifactId>
+      <artifactId>hadoop-common</artifactId>
       <version>@version</version>
     </dependency>
     <dependency>
diff --git a/src/docs/cn/src/documentation/skinconf.xml b/src/docs/cn/src/documentation/skinconf.xml
index e40b8a09156..57021a94e8e 100644
--- a/src/docs/cn/src/documentation/skinconf.xml
+++ b/src/docs/cn/src/documentation/skinconf.xml
@@ -99,7 +99,7 @@ which will be used to configure the chosen Forrest skin.
   <trail>
     <link1 name="Apache" href="http://www.apache.org/"/>
     <link2 name="Hadoop" href="http://hadoop.apache.org/"/>
-    <link3 name="Core" href="http://hadoop.apache.org/core/"/>
+    <link3 name="Common" href="http://hadoop.apache.org/common/"/>
   </trail>
 
   <!-- Configure the TOC, i.e. the Table of Contents.
diff --git a/src/docs/src/documentation/skinconf.xml b/src/docs/src/documentation/skinconf.xml
index 6c60a0ac992..3c93d7ff4e5 100644
--- a/src/docs/src/documentation/skinconf.xml
+++ b/src/docs/src/documentation/skinconf.xml
@@ -99,7 +99,7 @@ which will be used to configure the chosen Forrest skin.
   <trail>
     <link1 name="Apache" href="http://www.apache.org/"/>
     <link2 name="Hadoop" href="http://hadoop.apache.org/"/>
-    <link3 name="Core" href="http://hadoop.apache.org/core/"/>
+    <link3 name="Common" href="http://hadoop.apache.org/common/"/>
   </trail>
 
   <!-- Configure the TOC, i.e. the Table of Contents.
diff --git a/src/test/aop/build/aop.xml b/src/test/aop/build/aop.xml
index 4c62e03e259..a1b52cbe33a 100644
--- a/src/test/aop/build/aop.xml
+++ b/src/test/aop/build/aop.xml
@@ -29,11 +29,11 @@
   <!-- Properties specifically for system fault-injections and system tests -->
 
   <property name="herriot.suffix" value="instrumented"/>
-  <property name="hadoop-core-instrumented.pom"
-            location="${ivy.dir}/hadoop-core-${herriot.suffix}.xml" />
-  <property name="hadoop-core-instrumented.jar"
+  <property name="hadoop-common-instrumented.pom"
+            location="${ivy.dir}/hadoop-common-${herriot.suffix}.xml" />
+  <property name="hadoop-common-instrumented.jar"
             location="${system-test-build-dir}/${final.name}-${herriot.suffix}.jar" />
-  <property name="hadoop-core-instrumented-sources.jar"
+  <property name="hadoop-common-instrumented-sources.jar"
             location="${system-test-build-dir}/${final.name}-${herriot.suffix}-sources.jar" />
 
   <!--All Fault Injection (FI) related targets are located in this session -->
@@ -120,7 +120,7 @@
   </target>
 
   <!-- =============================================================== -->
-  <!-- Create hadoop-{version}-dev-core.jar required to be deployed on -->
+  <!-- Create hadoop-{version}-dev-common.jar required to be deployed on -->
   <!-- cluster for system tests                                        -->
   <!-- =============================================================== -->
   <target name="jar-system"
@@ -252,22 +252,22 @@
 
   <!-- Maven -->
   <target name="-mvn-system-install" depends="mvn-taskdef, jar-system">
-    <artifact:pom file="${hadoop-core-instrumented.pom}" id="hadoop.core.${herriot.suffix}"/>
-    <artifact:install file="${hadoop-core-instrumented.jar}">
+    <artifact:pom file="${hadoop-common-instrumented.pom}" id="hadoop.core.${herriot.suffix}"/>
+    <artifact:install file="${hadoop-common-instrumented.jar}">
        <pom refid="hadoop.core.${herriot.suffix}"/>
-       <attach file="${hadoop-core-instrumented-sources.jar}" classifier="sources" />
+       <attach file="${hadoop-common-instrumented-sources.jar}" classifier="sources" />
     </artifact:install>
   </target>
 
   <target name="-mvn-system-deploy" depends="mvn-taskdef, jar-system">
-     <artifact:pom file="${hadoop-core-instrumented.pom}" 
+     <artifact:pom file="${hadoop-common-instrumented.pom}" 
                    id="hadoop.core.${herriot.suffix}"/>
 
      <artifact:install-provider artifactId="wagon-http" version="1.0-beta-2"/>
-     <artifact:deploy file="${hadoop-core-instrumented.jar}">
+     <artifact:deploy file="${hadoop-common-instrumented.jar}">
          <remoteRepository id="apache.snapshots.https" url="${asfrepo}"/>
          <pom refid="hadoop.core.${herriot.suffix}"/>
-	       <attach file="${hadoop-core-instrumented-sources.jar}" classifier="sources"/> 
+	       <attach file="${hadoop-common-instrumented-sources.jar}" classifier="sources"/> 
      </artifact:deploy>
   </target>
   <!-- End of Maven -->