diff --git a/pom.xml b/pom.xml
index 52e85ee..30b7081 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>parent</artifactId>
     <groupId>org.codehaus.sonar-plugins</groupId>
-    <version>6</version>
+    <version>7</version>
     <relativePath>../parent</relativePath>
   </parent>
 
@@ -12,8 +12,20 @@
   <packaging>sonar-plugin</packaging>
 
   <name>Sonar Build Breaker Plugin</name>
+  <description>Break the analysis batch if at least one alert threshold is hit.</description>
   <url>http://docs.codehaus.org/display/SONAR/Build+Breaker</url>
   <inceptionYear>2009</inceptionYear>
+  <organization>
+    <name>SonarSource</name>
+    <url>http://www.sonarsource.com</url>
+  </organization>
+  <licenses>
+    <license>
+      <name>GNU LGPL 3</name>
+      <url>http://www.gnu.org/licenses/lgpl.txt</url>
+      <distribution>repo</distribution>
+    </license>
+  </licenses>
 
   <developers>
     <developer>
@@ -33,18 +45,8 @@
     <url>http://jira.codehaus.org/browse/SONARPLUGINS/component/14033</url>
   </issueManagement>
 
-  <licenses>
-    <license>
-      <name>GNU LGPL 3</name>
-      <url>http://www.gnu.org/licenses/lgpl.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-
   <properties>
-    <sonar.version>1.10</sonar.version>
-    <!-- TODO sonar-packaging-maven-plugin because of SONAR-1879 -->
-    <sonar.pluginKey>buildbreaker</sonar.pluginKey>
+    <sonar.version>1.12</sonar.version>
     <sonar.pluginName>Build Breaker</sonar.pluginName>
     <sonar.pluginClass>org.sonar.plugins.buildbreaker.BuildBreakerPlugin</sonar.pluginClass>
   </properties>
diff --git a/src/license-header.txt b/src/license-header.txt
deleted file mode 100644
index c39e5a3..0000000
--- a/src/license-header.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-Sonar, open source software quality management tool.
-Copyright (C) ${year} ${name}
-mailto:contact AT sonarsource DOT com
-
-Sonar is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 3 of the License, or (at your option) any later version.
-
-Sonar is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public
-License along with Sonar; if not, write to the Free Software
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02
diff --git a/src/main/java/org/sonar/plugins/buildbreaker/BuildBreakerPlugin.java b/src/main/java/org/sonar/plugins/buildbreaker/BuildBreakerPlugin.java
index 407ec7c..4426df0 100644
--- a/src/main/java/org/sonar/plugins/buildbreaker/BuildBreakerPlugin.java
+++ b/src/main/java/org/sonar/plugins/buildbreaker/BuildBreakerPlugin.java
@@ -28,7 +28,7 @@
 
 public class BuildBreakerPlugin implements Plugin {
   public String getKey() {
-    return "build-breaker";
+    return "buildbreaker";
   }
 
   public String getName() {
diff --git a/src/test/java/org/sonar/plugins/buildbreaker/BuildBreakerPluginTest.java b/src/test/java/org/sonar/plugins/buildbreaker/BuildBreakerPluginTest.java
index 29ab9f4..0e5ae86 100644
--- a/src/test/java/org/sonar/plugins/buildbreaker/BuildBreakerPluginTest.java
+++ b/src/test/java/org/sonar/plugins/buildbreaker/BuildBreakerPluginTest.java
@@ -36,7 +36,7 @@ public void oneExtensionIsRegistered() {
   @Test
   public void justToIncreaseCoverage() {
     assertThat(new BuildBreakerPlugin().getName(), not(nullValue()));
-    assertThat(new BuildBreakerPlugin().getKey(), is("build-breaker"));
+    assertThat(new BuildBreakerPlugin().getKey(), is("buildbreaker"));
     assertThat(new BuildBreakerPlugin().getDescription(), not(nullValue()));
   }
 }