diff --git a/adapters/cas/project.xml b/adapters/cas/project.xml
index a725c69e99..b6e590b4c2 100644
--- a/adapters/cas/project.xml
+++ b/adapters/cas/project.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project>
   <extend>${basedir}/../project.xml</extend>
-  <pomVersion>1</pomVersion>
+  <pomVersion>3</pomVersion>
   <artifactId>acegi-security-cas</artifactId>
   <name>Acegi Security System for Spring - CAS adapter</name>
-  <groupId>acegi-security-cas</groupId>
+  <groupId>acegisecurity</groupId>
   <repository>
     <connection>scm:cvs:pserver:anonymous@cvs.sourceforge.net:/cvsroot/acegisecurity:acegisecurity</connection>
     <developerConnection>scm:cvs:ext:${maven.username}@cvs.sourceforge.net:/cvsroot/acegisecurity:acegisecurity</developerConnection>
diff --git a/adapters/catalina/project.xml b/adapters/catalina/project.xml
index fc2283aac5..f1f389bdbf 100644
--- a/adapters/catalina/project.xml
+++ b/adapters/catalina/project.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project>
   <extend>${basedir}/../project.xml</extend>
-  <pomVersion>1</pomVersion>
+  <pomVersion>3</pomVersion>
   <artifactId>acegi-security-catalina</artifactId>
   <name>Acegi Security System for Spring - Catalina adapter</name>
-  <groupId>acegi-security-catalina</groupId>
+  <groupId>acegisecurity</groupId>
   <repository>
     <connection>scm:cvs:pserver:anonymous@cvs.sourceforge.net:/cvsroot/acegisecurity:acegisecurity</connection>
     <developerConnection>scm:cvs:ext:${maven.username}@cvs.sourceforge.net:/cvsroot/acegisecurity:acegisecurity</developerConnection>
diff --git a/adapters/jboss/project.xml b/adapters/jboss/project.xml
index 72d08a59f3..69c56701c9 100644
--- a/adapters/jboss/project.xml
+++ b/adapters/jboss/project.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project>
   <extend>${basedir}/../project.xml</extend>
-  <pomVersion>1</pomVersion>
+  <pomVersion>3</pomVersion>
   <artifactId>acegi-security-jboss</artifactId>
   <name>Acegi Security System for Spring - JBoss adapter</name>
-  <groupId>acegi-security-jboss</groupId>
+  <groupId>acegisecurity</groupId>
   <repository>
     <connection>scm:cvs:pserver:anonymous@cvs.sourceforge.net:/cvsroot/acegisecurity:acegisecurity</connection>
     <developerConnection>scm:cvs:ext:${maven.username}@cvs.sourceforge.net:/cvsroot/acegisecurity:acegisecurity</developerConnection>
diff --git a/adapters/jetty/project.xml b/adapters/jetty/project.xml
index f19a814782..4396c13cb0 100644
--- a/adapters/jetty/project.xml
+++ b/adapters/jetty/project.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project>
   <extend>${basedir}/../project.xml</extend>
-  <pomVersion>1</pomVersion>
+  <pomVersion>3</pomVersion>
   <artifactId>acegi-security-jetty</artifactId>
   <name>Acegi Security System for Spring - Jetty adapter</name>
-  <groupId>acegi-security-jetty</groupId>
+  <groupId>acegisecurity</groupId>
   <repository>
     <connection>scm:cvs:pserver:anonymous@cvs.sourceforge.net:/cvsroot/acegisecurity:acegisecurity</connection>
     <developerConnection>scm:cvs:ext:${maven.username}@cvs.sourceforge.net:/cvsroot/acegisecurity:acegisecurity</developerConnection>
diff --git a/adapters/project.xml b/adapters/project.xml
index 53f11c4c98..139717483d 100644
--- a/adapters/project.xml
+++ b/adapters/project.xml
@@ -4,7 +4,7 @@
   <pomVersion>3</pomVersion>
   <artifactId>acegi-security-adapters</artifactId>
   <name>Acegi Security System for Spring - Adapters</name>
-  <groupId>acegi-security-adapters</groupId>
+  <groupId>acegisecurity</groupId>
   <repository>
     <connection>scm:cvs:pserver:anonymous@cvs.sourceforge.net:/cvsroot/acegisecurity:acegisecurity</connection>
     <developerConnection>scm:cvs:ext:${maven.username}@cvs.sourceforge.net:/cvsroot/acegisecurity:acegisecurity</developerConnection>
@@ -14,7 +14,8 @@
     <dependency>
       <groupId>acegisecurity</groupId>
       <artifactId>acegi-security</artifactId>
-      <version>0.7-SNAPSHOT</version>
+      <version>0.7.0-SNAPSHOT</version>
+      <type>jar</type>
       <url>http://acegisecurity.sourceforge.net</url>
       <properties>
         <war.bundle>true</war.bundle>
diff --git a/adapters/resin/project.xml b/adapters/resin/project.xml
index 3b62898b07..c96b612b35 100644
--- a/adapters/resin/project.xml
+++ b/adapters/resin/project.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project>
   <extend>${basedir}/../project.xml</extend>
-  <pomVersion>1</pomVersion>
+  <pomVersion>3</pomVersion>
   <artifactId>acegi-security-resin</artifactId>
   <name>Acegi Security System for Spring - Resin adapter</name>
-  <groupId>acegi-security-resin</groupId>
+  <groupId>acegisecurity</groupId>
   <repository>
     <connection>scm:cvs:pserver:anonymous@cvs.sourceforge.net:/cvsroot/acegisecurity:acegisecurity</connection>
     <developerConnection>scm:cvs:ext:${maven.username}@cvs.sourceforge.net:/cvsroot/acegisecurity:acegisecurity</developerConnection>
diff --git a/core/project.xml b/core/project.xml
index 1d3dffbd3b..3515904104 100644
--- a/core/project.xml
+++ b/core/project.xml
@@ -4,7 +4,7 @@
   <pomVersion>3</pomVersion>
   <artifactId>acegi-security</artifactId>
   <name>Acegi Security System for Spring</name>
-  <groupId>acegi-security</groupId>
+  <groupId>acegisecurity</groupId>
   <repository>
     <connection>scm:cvs:pserver:anonymous@cvs.sourceforge.net:/cvsroot/acegisecurity:acegisecurity</connection>
     <developerConnection>scm:cvs:ext:${maven.username}@cvs.sourceforge.net:/cvsroot/acegisecurity:acegisecurity</developerConnection>
diff --git a/samples/attributes/project.xml b/samples/attributes/project.xml
index 55c6e4b8bd..d7684a7349 100644
--- a/samples/attributes/project.xml
+++ b/samples/attributes/project.xml
@@ -4,7 +4,7 @@
   <pomVersion>3</pomVersion>
   <artifactId>acegi-security-sample-attributes</artifactId>
   <name>Acegi Security System for Spring - Attributes sample</name>
-  <groupId>acegi-security-sample-attributes</groupId>
+  <groupId>acegisecurity</groupId>
   <repository>
     <connection>scm:cvs:pserver:anonymous@cvs.sourceforge.net:/cvsroot/acegisecurity:acegisecurity</connection>
     <developerConnection>scm:cvs:ext:${maven.username}@cvs.sourceforge.net:/cvsroot/acegisecurity:acegisecurity</developerConnection>
diff --git a/samples/contacts/maven.xml b/samples/contacts/maven.xml
index 37c14e23a7..2ad498b248 100644
--- a/samples/contacts/maven.xml
+++ b/samples/contacts/maven.xml
@@ -1,6 +1,7 @@
 <project
    xmlns:j="jelly:core"
    xmlns:ant="jelly:ant"
+   xmlns:artifact="artifact"
    xmlns:maven="jelly:maven">
 
     <goal name="war">
@@ -37,6 +38,11 @@
         <attainGoal name="war:war"/>
     </goal>
 
+    <goal name="multiwar:install">
+        <attainGoal name="multiwar:multiwar"/>
+        <echo>multiproject:install doesn't install Contacts Samples WARs to local repo</echo>
+    </goal>
+
     <postGoal name="war:war-resources">
         <maven:get plugin="maven-war-plugin"
             property="maven.war.webapp.dir"
diff --git a/samples/contacts/project.xml b/samples/contacts/project.xml
index 32b793be32..f8d6ae1cda 100644
--- a/samples/contacts/project.xml
+++ b/samples/contacts/project.xml
@@ -4,7 +4,7 @@
   <pomVersion>3</pomVersion>
   <artifactId>acegi-security-sample-contacts</artifactId>
   <name>Acegi Security System for Spring - Contacts sample</name>
-  <groupId>acegi-security-sample-contacts</groupId>
+  <groupId>acegisecurity</groupId>
   <repository>
     <connection>scm:cvs:pserver:anonymous@cvs.sourceforge.net:/cvsroot/acegisecurity:acegisecurity</connection>
     <developerConnection>scm:cvs:ext:${maven.username}@cvs.sourceforge.net:/cvsroot/acegisecurity:acegisecurity</developerConnection>
diff --git a/samples/project.xml b/samples/project.xml
index e761c5e295..b605687668 100644
--- a/samples/project.xml
+++ b/samples/project.xml
@@ -11,7 +11,8 @@
     <dependency>
       <groupId>acegisecurity</groupId>
       <artifactId>acegi-security</artifactId>
-      <version>0.7-SNAPSHOT</version>
+      <version>0.7.0-SNAPSHOT</version>
+      <type>jar</type>
       <url>http://acegisecurity.sourceforge.net</url>
       <properties>
         <war.bundle>true</war.bundle>