diff --git a/README.md b/README.md
index dbb5bae6..333007ae 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-The maven-scala-plugin is used for compiling/testing/running/documenting scala code in maven
+The scala-maven-plugin (previously maven-scala-plugin) is used for compiling/testing/running/documenting scala code in maven
 
 # Links
 
diff --git a/pom.xml b/pom.xml
index d576532e..2860fffe 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,11 +7,11 @@
   </parent>
 
   <groupId>net.alchim31.maven</groupId>
-  <artifactId>maven-scala-plugin</artifactId>
+  <artifactId>scala-maven-plugin</artifactId>
   <version>2.16.0-SNAPSHOT</version>
   <packaging>maven-plugin</packaging>
 
-  <name>maven-scala-plugin</name>
+  <name>scala-maven-plugin</name>
   <url>http://github.com/davidB/${project.artifactId}</url>
   <inceptionYear>2012</inceptionYear>
   <description>The maven-scala-plugin is used for compiling/testing/running/documenting scala code in maven.</description>
@@ -25,9 +25,9 @@
   </licenses>
 
   <scm>
-    <connection>scm:git:git://github.com/davidB/${project.artifactId}.git</connection>
-    <developerConnection>scm:git:git@github.com:davidB/${project.artifactId}.git</developerConnection>
-    <url>http://github.com/davidB/${project.artifactId}/</url>
+    <connection>scm:git:git://github.com/davidB/maven-scala-plugin.git</connection>
+    <developerConnection>scm:git:git@github.com:davidB/maven-scala-plugin.git</developerConnection>
+    <url>http://github.com/davidB/maven-scala-plugin/</url>
   </scm>
 
   <issueManagement>
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index ab560022..953e6f03 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -14,6 +14,7 @@
       <action dev="David Bernard" type="update">fix #57 : every lines of an scalac' error or warnings (including guilty source code) should be log with [ERROR] or [WARNING], not only the first one</action>
       <action dev="David Bernard" type="fix">fix #60 : scala:doc no longer remove elements from the classpath</action>
       <action dev="David Bernard" type="update">move from org.scala-tools to net.alchim31.maven (repo hosted by oss.sonatype)</action>
+      <action dev="David Bernard" type="update">rename artifactId from maven-scala-plugin to scala-maven-plugin (follow maven rules and warning)</action>
     </release>
     <release version="2.15.2" date="2011-02-06" description="">
       <action dev="David Bernard" type="add">archive generated by scala:genjson into $HOME/.config/vscaladoc2/apis can be intalled/deployed like regular artifact</action>