diff --git a/maven-plugin-tools-api/pom.xml b/maven-plugin-tools-api/pom.xml
index 7197aa0..833da63 100644
--- a/maven-plugin-tools-api/pom.xml
+++ b/maven-plugin-tools-api/pom.xml
@@ -30,8 +30,8 @@
 
   <artifactId>maven-plugin-tools-api</artifactId>
 
-  <name>Maven Plugin Tools APIs</name>
-  <description>The Maven Plugin Tools API provides an API to extract descriptor information from Maven Plugins.</description>
+  <name>Maven Plugin Tools Extractor API</name>
+  <description>The Maven Plugin Tools Extractor API provides an API to extract descriptor information from Maven Plugins.</description>
 
   <dependencies>
     <!-- maven -->
diff --git a/maven-plugin-tools-java/pom.xml b/maven-plugin-tools-java/pom.xml
index 5e298d8..f9c5fc2 100644
--- a/maven-plugin-tools-java/pom.xml
+++ b/maven-plugin-tools-java/pom.xml
@@ -30,7 +30,7 @@
 
   <artifactId>maven-plugin-tools-java</artifactId>
 
-  <name>Maven Plugin Tool for Java with Mojo Javadoc Tags</name>
+  <name>Maven Plugin Tool for Java with Javadoc Tags</name>
   <description>Descriptor extractor for plugins written in Java annotated with Mojo Javadoc Tags.</description>
 
   <dependencies>
diff --git a/maven-plugin-tools-javadoc/pom.xml b/maven-plugin-tools-javadoc/pom.xml
index 8d15bbc..269b5aa 100644
--- a/maven-plugin-tools-javadoc/pom.xml
+++ b/maven-plugin-tools-javadoc/pom.xml
@@ -30,9 +30,9 @@
 
   <artifactId>maven-plugin-tools-javadoc</artifactId>
 
-  <name>Maven Plugin Tools Javadoc</name>
+  <name>Maven Plugin Tools Javadoc Taglets</name>
   <description>
-    The Maven Plugin Tools Javadoc provides several Javadoc taglets to be used when generating Javadoc from
+    The Maven Plugin Tools Javadoc Taglets provides several Javadoc taglets to be used when generating Javadoc from
     java sources annotated with Mojo Javadoc Tags.
   </description>
   <inceptionYear>2008</inceptionYear>
diff --git a/pom.xml b/pom.xml
index ed18232..2e84f82 100644
--- a/pom.xml
+++ b/pom.xml
@@ -63,17 +63,17 @@
   </prerequisites>
 
   <modules>
-    <module>maven-script</module>
+    <module>maven-plugin-plugin</module>
     <module>maven-plugin-tools-generators</module>
     <module>maven-plugin-tools-api</module>
     <module>maven-plugin-tools-java</module>
+    <module>maven-plugin-tools-annotations</module>
     <module>maven-plugin-tools-javadoc</module>
     <module>maven-plugin-annotations</module>
-    <module>maven-plugin-tools-annotations</module>
     <module>maven-plugin-tools-ant</module>
     <module>maven-plugin-tools-beanshell</module>
     <module>maven-plugin-tools-model</module>
-    <module>maven-plugin-plugin</module>
+    <module>maven-script</module>
   </modules>
 
   <scm>
diff --git a/src/site/xdoc/index.xml b/src/site/xdoc/index.xml
index 0613fd1..93e6d5a 100644
--- a/src/site/xdoc/index.xml
+++ b/src/site/xdoc/index.xml
@@ -33,8 +33,9 @@
 
     <section name="Maven Plugin Tools">
 
-      <p>The Maven Plugin Tools contains the necessary tools to be able to produce Maven Plugins in scripting languages
-    and to generate rebarbative content like descriptor, help and documentation.</p>
+      <p>The Maven Plugin Tools contains the necessary tools to generate rebarbative content like descriptor,
+      help and documentation. In addition, it provides tools to write Maven Plugins in scripting languages
+      like Ant or Beanshell.</p>
 
       <p>
         <img src="images/plugin-tools-deps.png" width="826" height="491" border="0" usemap="#PluginTools_dependencies" />
@@ -82,7 +83,7 @@
         </tr>      
         <tr>
           <td>&nbsp;&nbsp;&nbsp;&nbsp;<a href="./maven-plugin-tools-javadoc/index.html">maven-plugin-tools-javadoc</a></td>
-          <td>Provides the support of Mojo Javadoc Tags in the Javadoc Tool.</td>
+          <td>Provides doclets to support Mojo Javadoc Tags in the Javadoc Tool.</td>
         </tr>      
         <tr>
           <td>&nbsp;&nbsp;<a href="./maven-plugin-tools-annotations/index.html">maven-plugin-tools-annotations</a></td>