diff --git a/genapp/src/plugin-resources/complex/template-resources/components/ears/ear/project.xml b/genapp/src/plugin-resources/complex/template-resources/components/ears/ear/project.xml
index ae3ade60..6a45c1b1 100644
--- a/genapp/src/plugin-resources/complex/template-resources/components/ears/ear/project.xml
+++ b/genapp/src/plugin-resources/complex/template-resources/components/ears/ear/project.xml
@@ -6,12 +6,12 @@
   <id>ear</id>
   <name>Enterprise Application</name>
   <currentVersion>1.0</currentVersion>
-  <package>example.ear</package>
+  <package>@PACKAGE@.ear</package>
 
   <description>An enterprise application</description>
   <dependencies>
     <dependency>
-      <groupId>trajano</groupId>
+      <groupId>@ID@</groupId>
       <artifactId>ejb</artifactId>
       <type>ejb</type>
       <version>1.0</version>
@@ -21,7 +21,7 @@
     </dependency>
   	
     <dependency>
-      <groupId>trajano</groupId>
+      <groupId>@ID@</groupId>
       <artifactId>web</artifactId>
       <type>war</type>
       <version>1.0</version>
diff --git a/genapp/src/plugin-resources/complex/template-resources/components/ejbs/ejb/project.xml b/genapp/src/plugin-resources/complex/template-resources/components/ejbs/ejb/project.xml
index 4bc5df6b..2f021df8 100644
--- a/genapp/src/plugin-resources/complex/template-resources/components/ejbs/ejb/project.xml
+++ b/genapp/src/plugin-resources/complex/template-resources/components/ejbs/ejb/project.xml
@@ -6,17 +6,20 @@
   <id>ejb</id>
   <name>EJB</name>
   <currentVersion>1.0</currentVersion>
-  <package>example.ejb</package>
+  <package>@PACKAGE@.ejb</package>
   <description>An EJB</description>
   <dependencies>
     <dependency>
       <id>junit</id>
       <version>3.8.1</version>
     </dependency>
+    <!-- NOT AVAILABLE IN BIBLIO REPOSITORY -->
+    <!--
     <dependency>
       <id>ejb</id>
       <version>2.1</version>
     </dependency>
+    -->
     <dependency>
       <id>xdoclet</id>
       <version>1.2</version>
@@ -51,7 +54,14 @@
       <version>1.2</version>
       <url>http://xdoclet.sf.net/</url>
     </dependency>
-
+    <dependency>
+      <groupId>xdoclet</groupId>
+      <artifactId>maven-xdoclet-plugin</artifactId>
+      <version>1.2</version>
+      <type>plugin</type>
+      <url>http://xdoclet.sf.net/</url>
+    </dependency> 
+    
      <dependency>
       <groupId>jboss</groupId>
       <artifactId>jboss-j2ee</artifactId>
diff --git a/genapp/src/plugin-resources/complex/template-resources/components/wars/web/project.xml b/genapp/src/plugin-resources/complex/template-resources/components/wars/web/project.xml
index 439c7f58..c5f93ffa 100644
--- a/genapp/src/plugin-resources/complex/template-resources/components/wars/web/project.xml
+++ b/genapp/src/plugin-resources/complex/template-resources/components/wars/web/project.xml
@@ -5,13 +5,14 @@
   <pomVersion>3</pomVersion>
   <id>web</id>
   <name>Web Application</name>
-  <package>example.web</package>
+  <package>@PACKAGE@.web</package>
   <description>This is the web application.</description>
   <dependencies>
     <dependency>
-      <groupId>trajano</groupId>
-      <artifactId>ejb-client</artifactId>
+      <groupId>@ID@</groupId>
+      <artifactId>ejb</artifactId>
       <version>1.0</version>
+      <type>ejb</type>
       <properties>
         <war.bundle>true</war.bundle>
       </properties>
@@ -92,6 +93,14 @@
       <url>http://xdoclet.sf.net/</url>
     </dependency>
 
+    <dependency>
+      <groupId>xdoclet</groupId>
+      <artifactId>maven-xdoclet-plugin</artifactId>
+      <version>1.2</version>
+      <type>plugin</type>
+      <url>http://xdoclet.sf.net/</url>
+    </dependency> 
+    
     <!-- HttpUnit dependencies -->
    <dependency>
       <groupId>httpunit</groupId>
diff --git a/genapp/src/plugin-resources/complex/template-resources/maven.xml b/genapp/src/plugin-resources/complex/template-resources/maven.xml
index cf8a8248..649c55e5 100644
--- a/genapp/src/plugin-resources/complex/template-resources/maven.xml
+++ b/genapp/src/plugin-resources/complex/template-resources/maven.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns:j="jelly:core" xmlns:ant="jelly:ant" xmlns:maven="jelly:maven" default="multiproject">
-  <goal name="multiproject:build">
-    <attainGoal name="multiproject:war-install" />
-    <attainGoal name="multiproject:ejb-install" />
-    <attainGoal name="multiproject:ear" />
+<project xmlns:j="jelly:core" xmlns:ant="jelly:ant" xmlns:maven="jelly:maven" default="complex:build">
+  <goal name="complex:build">
+    <attainGoal name="complex:ejb-install" />
+    <attainGoal name="complex:war-install" />
+    <attainGoal name="complex:ear" />
   </goal>
-  <goal name="multiproject:war">
+  <goal name="complex:war">
     <maven:reactor
       basedir="."
       banner="Creating WAR files"
@@ -16,7 +16,7 @@
       ignoreFailures="${maven.multiproject.ignoreFailures}"
     />
   </goal>
-  <goal name="multiproject:ear">
+  <goal name="complex:ear">
     <maven:reactor
       basedir="."
       banner="Creating EAR files"
@@ -27,7 +27,7 @@
       ignoreFailures="${maven.multiproject.ignoreFailures}"
     />
   </goal>
-  <goal name="multiproject:ejb">
+  <goal name="complex:ejb">
     <maven:reactor
       basedir="."
       banner="Creating EJB files"
@@ -38,7 +38,7 @@
       ignoreFailures="${maven.multiproject.ignoreFailures}"
     />
   </goal>
-  <goal name="multiproject:war-install">
+  <goal name="complex:war-install">
     <maven:reactor
       basedir="."
       banner="Installing WAR files"
@@ -49,7 +49,7 @@
       ignoreFailures="${maven.multiproject.ignoreFailures}"
     />
   </goal>
-  <goal name="multiproject:ejb-install">
+  <goal name="complex:ejb-install">
     <maven:reactor
       basedir="."
       banner="Installing EJB files"
@@ -60,8 +60,8 @@
       ignoreFailures="${maven.multiproject.ignoreFailures}"
     />
   </goal>
-  <goal name="multiproject:cactus">
-<!--    <attainGoal name="multiproject:build" />-->
+  <goal name="complex:cactus">
+<!--    <attainGoal name="complex:build" />-->
 <!--    <maven:maven descriptor="components/ears/ear/project.xml" goals="cactus:test-ear" />-->
     <maven:reactor
       basedir="."
diff --git a/genapp/src/plugin-resources/complex/template.properties b/genapp/src/plugin-resources/complex/template.properties
index 22e546cb..2f05f4bd 100644
--- a/genapp/src/plugin-resources/complex/template.properties
+++ b/genapp/src/plugin-resources/complex/template.properties
@@ -15,6 +15,6 @@
 # -------------------------------------------------------------------
 
 maven.genapp.repackage=
-maven.genapp.filter=project.xml
+maven.genapp.filter=**/project.xml
 
 maven.genapp.default.package=example.app