diff --git a/maven-artifact-ant/pom.xml b/maven-artifact-ant/pom.xml
index db37292fa1..8c082370fd 100755
--- a/maven-artifact-ant/pom.xml
+++ b/maven-artifact-ant/pom.xml
@@ -13,13 +13,12 @@
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-artifact</artifactId>
-      <version>2.0-alpha-1</version>
+      <version>2.0-SNAPSHOT</version>
     </dependency>
-    <!-- for project loading... -->
     <dependency>
       <groupId>org.apache.maven</groupId>
-      <artifactId>maven-core</artifactId>
-      <version>2.0-alpha-1</version>
+      <artifactId>maven-project</artifactId>
+      <version>2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>junit</groupId>
diff --git a/maven-plugin-tools/maven-plugin-tools-api/pom.xml b/maven-plugin-tools/maven-plugin-tools-api/pom.xml
index 7e76622641..cdbcf11b31 100644
--- a/maven-plugin-tools/maven-plugin-tools-api/pom.xml
+++ b/maven-plugin-tools/maven-plugin-tools-api/pom.xml
@@ -9,15 +9,20 @@
   <name>Maven Plugin Tools APIs</name>
   <dependencies>
     <dependency>
-      <groupId>org.codehaus.modello</groupId>
-      <artifactId>modello-core</artifactId>
-      <version>1.0-alpha-1</version>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-plugin-descriptor</artifactId>
+      <version>2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
-      <artifactId>maven-core</artifactId>
+      <artifactId>maven-project</artifactId>
       <version>2.0-SNAPSHOT</version>
     </dependency>
+    <dependency>
+      <groupId>org.codehaus.modello</groupId>
+      <artifactId>modello-core</artifactId>
+      <version>1.0-alpha-1</version>
+    </dependency>
     <dependency>
       <groupId>plexus</groupId>
       <artifactId>plexus-utils</artifactId>
diff --git a/maven-plugin-tools/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/scanner/DefaultMojoScannerTest.java b/maven-plugin-tools/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/scanner/DefaultMojoScannerTest.java
index c659d4554c..7bed58de7e 100644
--- a/maven-plugin-tools/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/scanner/DefaultMojoScannerTest.java
+++ b/maven-plugin-tools/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/scanner/DefaultMojoScannerTest.java
@@ -1,8 +1,9 @@
 package org.apache.maven.tools.plugin.scanner;
 
+import junit.framework.TestCase;
 import org.apache.maven.model.Build;
 import org.apache.maven.model.Model;
-import org.apache.maven.plugin.MavenMojoDescriptor;
+import org.apache.maven.plugin.descriptor.MojoDescriptor;
 import org.apache.maven.project.MavenProject;
 
 import java.io.File;
@@ -10,8 +11,6 @@ import java.util.Collections;
 import java.util.Map;
 import java.util.Set;
 
-import junit.framework.TestCase;
-
 /**
  * @author jdcasey
  */
@@ -38,9 +37,9 @@ public class DefaultMojoScannerTest
 
         assertEquals( 1, descriptors.size() );
 
-        MavenMojoDescriptor mmDesc = (MavenMojoDescriptor) descriptors.iterator().next();
-        assertEquals( "testPluginId", mmDesc.getMojoDescriptor().getId() );
-        assertEquals( "testGoal", mmDesc.getMojoDescriptor().getGoal() );
+        MojoDescriptor desc = (MojoDescriptor) descriptors.iterator().next();
+        assertEquals( "testPluginId", desc.getId() );
+        assertEquals( "testGoal", desc.getGoal() );
     }
 
 }
\ No newline at end of file
diff --git a/maven-plugin-tools/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/scanner/TestExtractor.java b/maven-plugin-tools/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/scanner/TestExtractor.java
index b58aadf275..295e09945b 100644
--- a/maven-plugin-tools/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/scanner/TestExtractor.java
+++ b/maven-plugin-tools/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/scanner/TestExtractor.java
@@ -1,6 +1,5 @@
 package org.apache.maven.tools.plugin.scanner;
 
-import org.apache.maven.plugin.MavenMojoDescriptor;
 import org.apache.maven.plugin.descriptor.MojoDescriptor;
 import org.apache.maven.project.MavenProject;
 import org.apache.maven.tools.plugin.extractor.MojoDescriptorExtractor;
@@ -22,9 +21,7 @@ public class TestExtractor
         desc.setId( "testPluginId" );
         desc.setGoal( "testGoal" );
 
-        MavenMojoDescriptor mmDesc = new MavenMojoDescriptor( desc );
-
-        return Collections.singleton( mmDesc );
+        return Collections.singleton( desc );
     }
 
 }
\ No newline at end of file
diff --git a/maven-plugin-tools/maven-plugin-tools-pluggy/pom.xml b/maven-plugin-tools/maven-plugin-tools-pluggy/pom.xml
index e002d4b804..f17c3895c8 100644
--- a/maven-plugin-tools/maven-plugin-tools-pluggy/pom.xml
+++ b/maven-plugin-tools/maven-plugin-tools-pluggy/pom.xml
@@ -8,11 +8,6 @@
   <artifactId>maven-plugin-tools-pluggy</artifactId>
   <name>Maven Pluggy Simplistic Plugin Generator</name>
   <dependencies>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-core</artifactId>
-      <version>2.0-SNAPSHOT</version>
-    </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-model</artifactId>
diff --git a/maven-plugins/maven-deploy-plugin/pom.xml b/maven-plugins/maven-deploy-plugin/pom.xml
index 7b6b5f62a1..2645a4b6b6 100644
--- a/maven-plugins/maven-deploy-plugin/pom.xml
+++ b/maven-plugins/maven-deploy-plugin/pom.xml
@@ -13,7 +13,7 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.maven</groupId>
-      <artifactId>maven-core</artifactId>
+      <artifactId>maven-project</artifactId>
       <version>2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
diff --git a/maven-plugins/maven-deploy-plugin/src/main/java/org/apache/maven/plugin/deploy/DeployMojo.java b/maven-plugins/maven-deploy-plugin/src/main/java/org/apache/maven/plugin/deploy/DeployMojo.java
index abab3d94f8..4cc1bb3d19 100644
--- a/maven-plugins/maven-deploy-plugin/src/main/java/org/apache/maven/plugin/deploy/DeployMojo.java
+++ b/maven-plugins/maven-deploy-plugin/src/main/java/org/apache/maven/plugin/deploy/DeployMojo.java
@@ -21,7 +21,7 @@ import org.apache.maven.artifact.DefaultArtifact;
 import org.apache.maven.artifact.deployer.ArtifactDeployer;
 import org.apache.maven.artifact.deployer.ArtifactDeploymentException;
 import org.apache.maven.artifact.metadata.ArtifactMetadata;
-import org.apache.maven.artifact.metadata.MavenMetadata;
+import org.apache.maven.artifact.metadata.ProjectArtifactMetadata;
 import org.apache.maven.artifact.repository.ArtifactRepository;
 import org.apache.maven.plugin.AbstractPlugin;
 import org.apache.maven.plugin.PluginExecutionException;
@@ -87,7 +87,7 @@ public class DeployMojo
         File pom = new File( project.getFile().getParentFile(), "pom.xml" );
         if ( !isPomArtifact )
         {
-            ArtifactMetadata metadata = new MavenMetadata( artifact, pom );
+            ArtifactMetadata metadata = new ProjectArtifactMetadata( artifact, pom );
             artifact.addMetadata( metadata );
         }
 
diff --git a/maven-plugins/maven-idea-plugin/pom.xml b/maven-plugins/maven-idea-plugin/pom.xml
index c6e8167b6c..a5f6078731 100755
--- a/maven-plugins/maven-idea-plugin/pom.xml
+++ b/maven-plugins/maven-idea-plugin/pom.xml
@@ -12,7 +12,7 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.maven</groupId>
-      <artifactId>maven-core</artifactId>
+      <artifactId>maven-project</artifactId>
       <version>2.0-SNAPSHOT</version>
     </dependency>
   </dependencies>
diff --git a/maven-plugins/maven-install-plugin/pom.xml b/maven-plugins/maven-install-plugin/pom.xml
index 25276f4644..dd7886236c 100644
--- a/maven-plugins/maven-install-plugin/pom.xml
+++ b/maven-plugins/maven-install-plugin/pom.xml
@@ -13,7 +13,7 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.maven</groupId>
-      <artifactId>maven-core</artifactId>
+      <artifactId>maven-project</artifactId>
       <version>2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
diff --git a/maven-plugins/maven-install-plugin/src/main/java/org/apache/maven/plugin/install/InstallMojo.java b/maven-plugins/maven-install-plugin/src/main/java/org/apache/maven/plugin/install/InstallMojo.java
index c5634af054..e7d562a087 100644
--- a/maven-plugins/maven-install-plugin/src/main/java/org/apache/maven/plugin/install/InstallMojo.java
+++ b/maven-plugins/maven-install-plugin/src/main/java/org/apache/maven/plugin/install/InstallMojo.java
@@ -21,7 +21,7 @@ import org.apache.maven.artifact.DefaultArtifact;
 import org.apache.maven.artifact.installer.ArtifactInstallationException;
 import org.apache.maven.artifact.installer.ArtifactInstaller;
 import org.apache.maven.artifact.metadata.ArtifactMetadata;
-import org.apache.maven.artifact.metadata.MavenMetadata;
+import org.apache.maven.artifact.metadata.ProjectArtifactMetadata;
 import org.apache.maven.artifact.repository.ArtifactRepository;
 import org.apache.maven.plugin.AbstractPlugin;
 import org.apache.maven.plugin.PluginExecutionException;
@@ -72,7 +72,7 @@ public class InstallMojo
         File pom = new File( project.getFile().getParentFile(), "pom.xml" );
         if ( !isPomArtifact )
         {
-            ArtifactMetadata metadata = new MavenMetadata( artifact, pom );
+            ArtifactMetadata metadata = new ProjectArtifactMetadata( artifact, pom );
             artifact.addMetadata( metadata );
         }
 
diff --git a/maven-plugins/maven-site-plugin/pom.xml b/maven-plugins/maven-site-plugin/pom.xml
index 441b01c6df..c63eb2b8d1 100644
--- a/maven-plugins/maven-site-plugin/pom.xml
+++ b/maven-plugins/maven-site-plugin/pom.xml
@@ -12,7 +12,7 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.maven</groupId>
-      <artifactId>maven-core</artifactId>
+      <artifactId>maven-project</artifactId>
       <version>2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
diff --git a/maven-core/src/main/java/org/apache/maven/artifact/metadata/MavenMetadata.java b/maven-project/src/main/java/org/apache/maven/project/artifact/ProjectArtifactMetadata.java
similarity index 97%
rename from maven-core/src/main/java/org/apache/maven/artifact/metadata/MavenMetadata.java
rename to maven-project/src/main/java/org/apache/maven/project/artifact/ProjectArtifactMetadata.java
index 6486423557..27c88b61f5 100644
--- a/maven-core/src/main/java/org/apache/maven/artifact/metadata/MavenMetadata.java
+++ b/maven-project/src/main/java/org/apache/maven/project/artifact/ProjectArtifactMetadata.java
@@ -38,12 +38,12 @@ import java.io.IOException;
  * @author <a href="mailto:brett@apache.org">Brett Porter</a>
  * @version $Id$
  */
-public class MavenMetadata
+public class ProjectArtifactMetadata
     extends AbstractArtifactMetadata
 {
     private final File file;
 
-    public MavenMetadata( Artifact artifact, File file )
+    public ProjectArtifactMetadata( Artifact artifact, File file )
     {
         super( artifact, null );
         this.file = file;
diff --git a/maven-site/pom.xml b/maven-site/pom.xml
index 4e3e37bed2..956954d75d 100644
--- a/maven-site/pom.xml
+++ b/maven-site/pom.xml
@@ -5,7 +5,7 @@
     <version>2.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
-  <artifactId>maven-core</artifactId>
+  <artifactId>maven-site</artifactId>
   <name>Maven</name>
   <version>2.0-SNAPSHOT</version>
   <inceptionYear>2001</inceptionYear>