diff --git a/maven-jflex-plugin-0.2/pom.xml b/maven-jflex-plugin-0.2/pom.xml
index 79bc301fc..17d35fd57 100644
--- a/maven-jflex-plugin-0.2/pom.xml
+++ b/maven-jflex-plugin-0.2/pom.xml
@@ -114,14 +114,14 @@
 	</scm>
 	<distributionManagement>
 		<repository>
-			<id>sourceforge_jflex</id>
+			<id>sourceforge</id>
 			<name>JFlex sourceforge repository</name>			
 			<url>
 				scp://shell.sf.net/home/groups/j/jf/jflex/htdocs/repo
 			</url>
 		</repository>
 		<site>
-			<id>sourceforge_jflex</id>
+			<id>sourceforge</id>
 			<name>JFlex sourceforge site</name>
 			<url>scp://shell.sf.net/home/groups/j/jf/jflex/htdocs/maven-jflex-plugin</url>
 		</site>
@@ -131,12 +131,12 @@
 			<id>localhost</id>
 			<distributionManagement>
 				<repository>
-					<id>repo_jflex_sf</id>
+					<id>sourceforge</id>
 					<name>JFlex sourceforge repository</name>
-					<url>scp://localhost/tmp/jflex/repo</url>
+					<url>scp://localhost/tmp/jflex/m2repo</url>
 				</repository>
 				<site>
-					<id>site_jflex_sf</id>
+					<id>sourceforge</id>
 					<name>JFlex sourceforge site</name>
 					<url>
 						scp://localhost/tmp/jflex/maven-jflex-plugin
diff --git a/maven-jflex-plugin-0.3/pom.xml b/maven-jflex-plugin-0.3/pom.xml
index 289484ec5..f31c33cdd 100644
--- a/maven-jflex-plugin-0.3/pom.xml
+++ b/maven-jflex-plugin-0.3/pom.xml
@@ -3,7 +3,7 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
-	<groupId>de.jflex.maven.plugin</groupId>
+	<groupId>de.jflex</groupId>
 	<artifactId>maven-jflex-plugin</artifactId>
 	<packaging>maven-plugin</packaging>
 	<name>Maven JFlex Plugin</name>
@@ -220,14 +220,14 @@
 	</scm>
 	<distributionManagement>
 		<repository>
-			<id>sourceforge_jflex</id>
+			<id>sourceforge</id>
 			<name>JFlex sourceforge repository</name>			
 			<url>
-				scp://shell.sf.net/home/groups/j/jf/jflex/htdocs/repo
+				scp://shell.sf.net/home/groups/j/jf/jflex/htdocs/m2repo
 			</url>
 		</repository>
 		<site>
-			<id>sourceforge_jflex</id>
+			<id>sourceforge</id>
 			<name>JFlex sourceforge site</name>
 			<url>scp://shell.sf.net/home/groups/j/jf/jflex/htdocs/maven-jflex-plugin</url>
 		</site>
@@ -237,12 +237,12 @@
 			<id>localhost</id>
 			<distributionManagement>
 				<repository>
-					<id>repo_jflex_sf</id>
+					<id>sourceforge</id>
 					<name>JFlex sourceforge repository</name>
-					<url>scp://localhost/tmp/jflex/repo</url>
+					<url>scp://localhost/tmp/jflex/m2repo</url>
 				</repository>
 				<site>
-					<id>site_jflex_sf</id>
+					<id>sourceforge</id>
 					<name>JFlex sourceforge site</name>
 					<url>
 						scp://localhost/tmp/jflex/maven-jflex-plugin
diff --git a/maven-jflex-plugin-1.0/pom.xml b/maven-jflex-plugin-1.0/pom.xml
index f43bb8d71..1fb903fa9 100644
--- a/maven-jflex-plugin-1.0/pom.xml
+++ b/maven-jflex-plugin-1.0/pom.xml
@@ -3,7 +3,7 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
-	<groupId>de.jflex.maven.plugin</groupId>
+	<groupId>de.jflex</groupId>
 	<artifactId>maven-jflex-plugin</artifactId>
 	<packaging>maven-plugin</packaging>
 	<name>Maven JFlex Plugin</name>
@@ -224,14 +224,14 @@
 			<id>release</id>
 			<distributionManagement>
 				<repository>
-					<id>sourceforge_jflex</id>
+					<id>sourceforge</id>
 					<name>JFlex sourceforge repository</name>
 					<url>
-						scp://shell.sf.net/home/groups/j/jf/jflex/htdocs/repo
+						scp://shell.sf.net/home/groups/j/jf/jflex/htdocs/m2repo
 					</url>
 				</repository>
 				<site>
-					<id>sourceforge_jflex</id>
+					<id>sourceforge</id>
 					<name>JFlex sourceforge site</name>
 					<url>
 						scp://shell.sf.net/home/groups/j/jf/jflex/htdocs/maven-jflex-plugin