diff --git a/maven-artifact/src/main/java/org/apache/maven/artifact/handler/PluginHandler.java b/maven-artifact/src/main/java/org/apache/maven/artifact/handler/PluginHandler.java
index de8cb9ccca..ad49a685aa 100644
--- a/maven-artifact/src/main/java/org/apache/maven/artifact/handler/PluginHandler.java
+++ b/maven-artifact/src/main/java/org/apache/maven/artifact/handler/PluginHandler.java
@@ -30,6 +30,6 @@ public class PluginHandler
 
     public String directory()
     {
-        return "plugins";
+        return "maven-plugins";
     }
 }
diff --git a/maven-artifact/src/main/resources/META-INF/plexus/components.xml b/maven-artifact/src/main/resources/META-INF/plexus/components.xml
index 1d8cae876b..f2a046536e 100644
--- a/maven-artifact/src/main/resources/META-INF/plexus/components.xml
+++ b/maven-artifact/src/main/resources/META-INF/plexus/components.xml
@@ -103,7 +103,7 @@
 
     <component>
       <role>org.apache.maven.artifact.handler.ArtifactHandler</role>
-      <role-hint>plugin</role-hint>
+      <role-hint>maven-plugin</role-hint>
       <implementation>org.apache.maven.artifact.handler.PluginHandler</implementation>
     </component>
 
diff --git a/maven-core-it/it0013/pom.xml b/maven-core-it/it0013/pom.xml
index 5456d09dc3..52a6ea8fc2 100644
--- a/maven-core-it/it0013/pom.xml
+++ b/maven-core-it/it0013/pom.xml
@@ -2,7 +2,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>maven</groupId>
   <artifactId>maven-it0013-plugin</artifactId>
-  <packaging>plugin</packaging>
+  <packaging>maven-plugin</packaging>
   <version>1.0-SNAPSHOT</version>
   <dependencies>
     <dependency>
@@ -20,4 +20,4 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
-</model>
\ No newline at end of file
+</model>
diff --git a/maven-core-it/it0015/pom.xml b/maven-core-it/it0015/pom.xml
index d730ac18c1..c07744b450 100644
--- a/maven-core-it/it0015/pom.xml
+++ b/maven-core-it/it0015/pom.xml
@@ -2,7 +2,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>maven</groupId>
   <artifactId>maven-it0015-plugin</artifactId>
-  <packaging>plugin</packaging>
+  <packaging>maven-plugin</packaging>
   <version>1.0-SNAPSHOT</version>
   <dependencies>
     <dependency>
@@ -38,4 +38,4 @@
       </resource>
     </resources>
   </build>
-</model>
\ No newline at end of file
+</model>
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java b/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
index f3219d05b9..bf4ec29be7 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
@@ -83,9 +83,9 @@ public class DefaultPluginManager
     protected ArtifactFilter artifactFilter;
 
     protected PathTranslator pathTranslator;
-    
+
     protected ArtifactRepositoryFactory artifactRepositoryFactory;
-    
+
     protected UserModelBuilder userModelBuilder;
 
     public DefaultPluginManager()
@@ -135,7 +135,8 @@ public class DefaultPluginManager
 
     private Set pluginsInProcess = new HashSet();
 
-    public void processPluginDescriptor( MavenPluginDescriptor mavenPluginDescriptor ) throws CycleDetectedException
+    public void processPluginDescriptor( MavenPluginDescriptor mavenPluginDescriptor )
+        throws CycleDetectedException
     {
         if ( pluginsInProcess.contains( mavenPluginDescriptor.getPluginId() ) )
         {
@@ -206,7 +207,8 @@ public class DefaultPluginManager
     }
 
     // TODO: don't throw Exception
-    public void verifyPluginForGoal( String goalName, MavenSession session ) throws Exception
+    public void verifyPluginForGoal( String goalName, MavenSession session )
+        throws Exception
     {
         String pluginId = getPluginId( goalName );
 
@@ -215,7 +217,8 @@ public class DefaultPluginManager
     }
 
     // TODO: don't throw Exception
-    public void verifyPlugin( String groupId, String artifactId, MavenSession session ) throws Exception
+    public void verifyPlugin( String groupId, String artifactId, MavenSession session )
+        throws Exception
     {
         if ( !isPluginInstalled( groupId, artifactId ) )
         {
@@ -260,8 +263,9 @@ public class DefaultPluginManager
 
                 artifactFactory = (ArtifactFactory) container.lookup( ArtifactFactory.ROLE );
 
-                Artifact pluginArtifact = artifactFactory.createArtifact( "maven", artifactId, version, null, "plugin",
-                                                                          "jar", null );
+                // TODO: more hard coding here...
+                Artifact pluginArtifact = artifactFactory.createArtifact( "maven", artifactId, version, null,
+                                                                          "maven-plugin", "jar", null );
 
                 addPlugin( pluginArtifact, session );
             }
@@ -276,7 +280,8 @@ public class DefaultPluginManager
     }
 
     // TODO: don't throw Exception
-    protected void addPlugin( Artifact pluginArtifact, MavenSession session ) throws Exception
+    protected void addPlugin( Artifact pluginArtifact, MavenSession session )
+        throws Exception
     {
         ArtifactResolver artifactResolver = null;
         MavenProjectBuilder mavenProjectBuilder = null;
@@ -424,7 +429,8 @@ public class DefaultPluginManager
     }
 
     // TODO: don't throw Exception
-    private void releaseComponents( MojoDescriptor goal, PluginExecutionRequest request ) throws Exception
+    private void releaseComponents( MojoDescriptor goal, PluginExecutionRequest request )
+        throws Exception
     {
         if ( request != null && request.getParameters() != null )
         {
@@ -470,8 +476,8 @@ public class DefaultPluginManager
                 String expression = parameter.getExpression();
 
                 Object value = PluginParameterExpressionEvaluator.evaluate( expression, session );
-                
-                getLogger().debug("Evaluated mojo parameter expression: \'" + expression + "\' to: " + value);
+
+                getLogger().debug( "Evaluated mojo parameter expression: \'" + expression + "\' to: " + value );
 
                 if ( value == null )
                 {
@@ -485,7 +491,7 @@ public class DefaultPluginManager
 
                 if ( type != null && ( type.equals( "File" ) || type.equals( "java.io.File" ) ) )
                 {
-                    value = pathTranslator.alignToBaseDirectory( (String)value,
+                    value = pathTranslator.alignToBaseDirectory( (String) value,
                                                                  session.getProject().getFile().getParentFile() );
                 }
 
@@ -555,8 +561,8 @@ public class DefaultPluginManager
     {
         StringBuffer message = new StringBuffer();
 
-        message.append( "The '" + parameter.getName() ).append( "' parameter is required for the execution of the " )
-               .append( mojo.getId() ).append( " mojo and cannot be null." );
+        message.append( "The '" + parameter.getName() ).append( "' parameter is required for the execution of the " ).append(
+            mojo.getId() ).append( " mojo and cannot be null." );
 
         return message.toString();
     }
@@ -565,7 +571,8 @@ public class DefaultPluginManager
     // Lifecycle
     // ----------------------------------------------------------------------
 
-    public void contextualize( Context context ) throws ContextException
+    public void contextualize( Context context )
+        throws ContextException
     {
         container = (PlexusContainer) context.get( PlexusConstants.PLEXUS_KEY );
     }
@@ -573,18 +580,11 @@ public class DefaultPluginManager
     public void initialize()
     {
         // TODO: configure this from bootstrap or scan lib
-        artifactFilter = new ExclusionSetFilter( new String[] {
-            "maven-core",
-            "maven-artifact",
-            "maven-model",
-            "maven-user-model",
-            "maven-monitor",
-            "maven-plugin",
-            "plexus-container-api",
-            "plexus-container-default",
-            "plexus-artifact-container",
-            "wagon-provider-api",
-            "classworlds" } );
+        artifactFilter = new ExclusionSetFilter( new String[]{"maven-core", "maven-artifact", "maven-model",
+                                                              "maven-user-model", "maven-monitor", "maven-plugin",
+                                                              "plexus-container-api", "plexus-container-default",
+                                                              "plexus-artifact-container", "wagon-provider-api",
+                                                              "classworlds"} );
 
         // TODO: move this to be configurable from the Maven component
         remotePluginRepositories = new ArrayList();
@@ -601,13 +601,14 @@ public class DefaultPluginManager
             // TODO: Warn about this failure.
             userModel = new UserModel();
         }
-        
+
         Repository pluginRepo = new Repository();
         pluginRepo.setId( "plugin-repository" );
         pluginRepo.setUrl( "http://repo1.maven.org" );
-        
-        ArtifactRepository pluginRepository = artifactRepositoryFactory.createArtifactRepository( pluginRepo, userModel );
-        
+
+        ArtifactRepository pluginRepository = artifactRepositoryFactory.createArtifactRepository( pluginRepo,
+                                                                                                  userModel );
+
         remotePluginRepositories.add( pluginRepository );
     }
 
@@ -616,7 +617,7 @@ public class DefaultPluginManager
     // ----------------------------------------------------------------------
 
     private void resolveTransitiveDependencies( MavenSession context, ArtifactResolver artifactResolver,
-                                               MavenProjectBuilder mavenProjectBuilder )
+                                                MavenProjectBuilder mavenProjectBuilder )
         throws ArtifactResolutionException
     {
         MavenProject project = context.getProject();
diff --git a/maven-plugins/maven-assemble-plugin/pom.xml b/maven-plugins/maven-assemble-plugin/pom.xml
index ab741e403b..e4b04f345d 100644
--- a/maven-plugins/maven-assemble-plugin/pom.xml
+++ b/maven-plugins/maven-assemble-plugin/pom.xml
@@ -7,7 +7,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>maven</groupId>
   <artifactId>maven-assemble-plugin</artifactId>
-  <packaging>plugin</packaging>
+  <packaging>maven-plugin</packaging>
   <name>Maven Assemble Plugin</name>
   <version>1.0-SNAPSHOT</version>
   <dependencies>
diff --git a/maven-plugins/maven-clean-plugin/pom.xml b/maven-plugins/maven-clean-plugin/pom.xml
index 71f558652b..934c19957f 100644
--- a/maven-plugins/maven-clean-plugin/pom.xml
+++ b/maven-plugins/maven-clean-plugin/pom.xml
@@ -7,7 +7,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>maven</groupId>
   <artifactId>maven-clean-plugin</artifactId>
-  <packaging>plugin</packaging>
+  <packaging>maven-plugin</packaging>
   <name>Maven Clean Plugin</name>
   <version>1.0-SNAPSHOT</version>
   <inceptionYear>2001</inceptionYear>
@@ -20,4 +20,4 @@
       <scope>compile</scope>
     </dependency>
   </dependencies>
-</model>
\ No newline at end of file
+</model>
diff --git a/maven-plugins/maven-compiler-plugin/pom.xml b/maven-plugins/maven-compiler-plugin/pom.xml
index a01c9a8002..18fc2dd61e 100644
--- a/maven-plugins/maven-compiler-plugin/pom.xml
+++ b/maven-plugins/maven-compiler-plugin/pom.xml
@@ -7,7 +7,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>maven</groupId>
   <artifactId>maven-compiler-plugin</artifactId>
-  <packaging>plugin</packaging>
+  <packaging>maven-plugin</packaging>
   <name>Maven Compiler Plugin</name>
   <version>1.0-SNAPSHOT</version>
   <inceptionYear>2001</inceptionYear>
@@ -41,4 +41,4 @@
       <scope>compile</scope>
     </dependency>
   </dependencies>
-</model>
\ No newline at end of file
+</model>
diff --git a/maven-plugins/maven-deploy-plugin/pom.xml b/maven-plugins/maven-deploy-plugin/pom.xml
index 0c3addee4d..44da86728a 100644
--- a/maven-plugins/maven-deploy-plugin/pom.xml
+++ b/maven-plugins/maven-deploy-plugin/pom.xml
@@ -7,7 +7,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>maven</groupId>
   <artifactId>maven-deploy-plugin</artifactId>
-  <packaging>plugin</packaging>
+  <packaging>maven-plugin</packaging>
   <name>Maven Deploy Plugin</name>
   <version>1.0-SNAPSHOT</version>
   <inceptionYear>2004</inceptionYear>
@@ -55,4 +55,4 @@
       <scope>runtime</scope>
     </dependency>
   </dependencies>
-</model>
\ No newline at end of file
+</model>
diff --git a/maven-plugins/maven-ejb-plugin/pom.xml b/maven-plugins/maven-ejb-plugin/pom.xml
index c90afa6d56..6d83c944e8 100644
--- a/maven-plugins/maven-ejb-plugin/pom.xml
+++ b/maven-plugins/maven-ejb-plugin/pom.xml
@@ -7,7 +7,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>maven</groupId>
   <artifactId>maven-ejb-plugin</artifactId>
-  <packaging>plugin</packaging>
+  <packaging>maven-plugin</packaging>
   <name>Maven EJB Plugin</name>
   <version>1.0-SNAPSHOT</version>
   <dependencies>
@@ -54,4 +54,4 @@
       <scope>compile</scope>
     </dependency>
   </dependencies>
-</model>
\ No newline at end of file
+</model>
diff --git a/maven-plugins/maven-install-plugin/pom.xml b/maven-plugins/maven-install-plugin/pom.xml
index 44472b0887..6fad97b90d 100644
--- a/maven-plugins/maven-install-plugin/pom.xml
+++ b/maven-plugins/maven-install-plugin/pom.xml
@@ -7,7 +7,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>maven</groupId>
   <artifactId>maven-install-plugin</artifactId>
-  <packaging>plugin</packaging>
+  <packaging>maven-plugin</packaging>
   <name>Maven Install Plugin</name>
   <version>1.0-SNAPSHOT</version>
   <inceptionYear>2004</inceptionYear>
@@ -41,4 +41,4 @@
       <scope>compile</scope>
     </dependency>
   </dependencies>
-</model>
\ No newline at end of file
+</model>
diff --git a/maven-plugins/maven-jar-plugin/pom.xml b/maven-plugins/maven-jar-plugin/pom.xml
index c72df511f9..c8946480ff 100644
--- a/maven-plugins/maven-jar-plugin/pom.xml
+++ b/maven-plugins/maven-jar-plugin/pom.xml
@@ -7,7 +7,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>maven</groupId>
   <artifactId>maven-jar-plugin</artifactId>
-  <packaging>plugin</packaging>
+  <packaging>maven-plugin</packaging>
   <name>Maven Jar Plugin</name>
   <version>1.0-SNAPSHOT</version>
   <dependencies>
@@ -61,4 +61,4 @@
       <scope>compile</scope>
     </dependency>
   </dependencies>
-</model>
\ No newline at end of file
+</model>
diff --git a/maven-plugins/maven-plugin-plugin/pom.xml b/maven-plugins/maven-plugin-plugin/pom.xml
index fa5da15f1e..21a0a9761f 100644
--- a/maven-plugins/maven-plugin-plugin/pom.xml
+++ b/maven-plugins/maven-plugin-plugin/pom.xml
@@ -7,7 +7,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>maven</groupId>
   <artifactId>maven-plugin-plugin</artifactId>
-  <packaging>plugin</packaging>
+  <packaging>maven-plugin</packaging>
   <name>Maven</name>
   <version>1.0-SNAPSHOT</version>
   <inceptionYear>2001</inceptionYear>
@@ -62,4 +62,4 @@
       <scope>compile</scope>
     </dependency>
   </dependencies>
-</model>
\ No newline at end of file
+</model>
diff --git a/maven-plugins/maven-pom-plugin/pom.xml b/maven-plugins/maven-pom-plugin/pom.xml
index 6a0662b204..b3204c1250 100644
--- a/maven-plugins/maven-pom-plugin/pom.xml
+++ b/maven-plugins/maven-pom-plugin/pom.xml
@@ -6,7 +6,7 @@
   </parent>
   <groupId>maven</groupId>
   <artifactId>maven-pom-plugin</artifactId>
-  <packaging>plugin</packaging>
+  <packaging>maven-plugin</packaging>
   <name>Maven POM Plugin</name>
   <version>1.0-SNAPSHOT</version>
   <dependencies>
@@ -46,4 +46,4 @@
       <scope>runtime</scope>
     </dependency>
   </dependencies>
-</model>
\ No newline at end of file
+</model>
diff --git a/maven-plugins/maven-resources-plugin/pom.xml b/maven-plugins/maven-resources-plugin/pom.xml
index e4f72ad2aa..13247e878d 100644
--- a/maven-plugins/maven-resources-plugin/pom.xml
+++ b/maven-plugins/maven-resources-plugin/pom.xml
@@ -7,7 +7,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>maven</groupId>
   <artifactId>maven-resources-plugin</artifactId>
-  <packaging>plugin</packaging>
+  <packaging>maven-plugin</packaging>
   <name>Maven Resources Plugin</name>
   <version>1.0-SNAPSHOT</version>
   <dependencies>
@@ -26,4 +26,4 @@
       <scope>compile</scope>
     </dependency>
   </dependencies>
-</model>
\ No newline at end of file
+</model>
diff --git a/maven-plugins/maven-surefire-plugin/pom.xml b/maven-plugins/maven-surefire-plugin/pom.xml
index d2d5c24d75..348e48b342 100644
--- a/maven-plugins/maven-surefire-plugin/pom.xml
+++ b/maven-plugins/maven-surefire-plugin/pom.xml
@@ -7,7 +7,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>maven</groupId>
   <artifactId>maven-surefire-plugin</artifactId>
-  <packaging>plugin</packaging>
+  <packaging>maven-plugin</packaging>
   <name>Maven Surefire Plugin</name>
   <version>1.0-SNAPSHOT</version>
   <dependencies>
@@ -26,4 +26,4 @@
       <scope>compile</scope>
     </dependency>
   </dependencies>
-</model>
\ No newline at end of file
+</model>
diff --git a/maven-plugins/maven-war-plugin/pom.xml b/maven-plugins/maven-war-plugin/pom.xml
index c0455fb58a..457be7f97c 100644
--- a/maven-plugins/maven-war-plugin/pom.xml
+++ b/maven-plugins/maven-war-plugin/pom.xml
@@ -7,7 +7,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>maven</groupId>
   <artifactId>maven-war-plugin</artifactId>
-  <packaging>plugin</packaging>
+  <packaging>maven-plugin</packaging>
   <name>Maven War Plugin</name>
   <version>1.0-SNAPSHOT</version>
   <dependencies>
@@ -68,4 +68,4 @@
       <scope>compile</scope>
     </dependency>
   </dependencies>
-</model>
\ No newline at end of file
+</model>