diff --git a/apps/blank/pom.xml b/apps/blank/pom.xml
index 4eca35e..0836bfb 100644
--- a/apps/blank/pom.xml
+++ b/apps/blank/pom.xml
@@ -39,14 +39,14 @@
 
    <dependencies>
       <dependency>
-         <groupId>${pom.groupId}</groupId>
+         <groupId>${project.groupId}</groupId>
          <artifactId>struts-taglib</artifactId>
-         <version>${pom.version}</version>
+         <version>${project.version}</version>
       </dependency>
       <dependency>
-         <groupId>${pom.groupId}</groupId>
+         <groupId>${project.groupId}</groupId>
          <artifactId>struts-tiles</artifactId>
-         <version>${pom.version}</version>
+         <version>${project.version}</version>
       </dependency>
       <dependency>
          <groupId>javax.servlet</groupId>
@@ -55,7 +55,7 @@
    </dependencies>
    
    <build>
-     <finalName>${pom.artifactId}</finalName>
+     <finalName>${project.artifactId}</finalName>
    </build>
 
 </project>
diff --git a/apps/cookbook/pom.xml b/apps/cookbook/pom.xml
index 85019c9..0255c78 100644
--- a/apps/cookbook/pom.xml
+++ b/apps/cookbook/pom.xml
@@ -39,14 +39,14 @@
 
    <dependencies>
       <dependency>
-         <groupId>${pom.groupId}</groupId>
+         <groupId>${project.groupId}</groupId>
          <artifactId>struts-core</artifactId>
-         <version>${pom.version}</version>
+         <version>${project.version}</version>
       </dependency>
       <dependency>
-         <groupId>${pom.groupId}</groupId>
+         <groupId>${project.groupId}</groupId>
          <artifactId>struts-taglib</artifactId>
-         <version>${pom.version}</version>
+         <version>${project.version}</version>
       </dependency>
       <dependency>
          <groupId>javax.servlet</groupId>
diff --git a/apps/el-example/pom.xml b/apps/el-example/pom.xml
index 32b2e21..edab3d0 100644
--- a/apps/el-example/pom.xml
+++ b/apps/el-example/pom.xml
@@ -39,9 +39,9 @@
 
    <dependencies>
       <dependency>
-         <groupId>${pom.groupId}</groupId>
+         <groupId>${project.groupId}</groupId>
          <artifactId>struts-el</artifactId>
-         <version>${pom.version}</version>
+         <version>${project.version}</version>
       </dependency>
       <dependency>
          <groupId>javax.servlet</groupId>
diff --git a/apps/examples/pom.xml b/apps/examples/pom.xml
index f7645a9..1f97854 100644
--- a/apps/examples/pom.xml
+++ b/apps/examples/pom.xml
@@ -39,14 +39,14 @@
 
    <dependencies>
       <dependency>
-         <groupId>${pom.groupId}</groupId>
+         <groupId>${project.groupId}</groupId>
          <artifactId>struts-taglib</artifactId>
-         <version>${pom.version}</version>
+         <version>${project.version}</version>
       </dependency>
       <dependency>
-         <groupId>${pom.groupId}</groupId>
+         <groupId>${project.groupId}</groupId>
          <artifactId>struts-extras</artifactId>
-         <version>${pom.version}</version>
+         <version>${project.version}</version>
       </dependency>
       <dependency>
          <groupId>commons-fileupload</groupId>
diff --git a/apps/faces-example1/pom.xml b/apps/faces-example1/pom.xml
index 787bf8e..39babef 100644
--- a/apps/faces-example1/pom.xml
+++ b/apps/faces-example1/pom.xml
@@ -39,9 +39,9 @@
 
    <dependencies>
       <dependency>
-         <groupId>${pom.groupId}</groupId>
+         <groupId>${project.groupId}</groupId>
          <artifactId>struts-faces</artifactId>
-         <version>${pom.version}</version>
+         <version>${project.version}</version>
       </dependency>
       <dependency>
          <groupId>javax.servlet</groupId>
@@ -88,7 +88,7 @@
             </includes>
          </resource>
       </resources>
-      <finalName>${pom.artifactId}</finalName>
+      <finalName>${project.artifactId}</finalName>
    </build>
 
 </project>
diff --git a/apps/faces-example2/pom.xml b/apps/faces-example2/pom.xml
index 3a36c02..bd7621a 100644
--- a/apps/faces-example2/pom.xml
+++ b/apps/faces-example2/pom.xml
@@ -39,14 +39,14 @@
 
    <dependencies>
       <dependency>
-         <groupId>${pom.groupId}</groupId>
+         <groupId>${project.groupId}</groupId>
          <artifactId>struts-faces</artifactId>
-         <version>${pom.version}</version>
+         <version>${project.version}</version>
       </dependency>
       <dependency>
-         <groupId>${pom.groupId}</groupId>
+         <groupId>${project.groupId}</groupId>
          <artifactId>struts-tiles</artifactId>
-         <version>${pom.version}</version>
+         <version>${project.version}</version>
       </dependency>
       <dependency>
          <groupId>javax.servlet</groupId>
@@ -92,7 +92,7 @@
             </includes>
          </resource>
       </resources>
-      <finalName>${pom.artifactId}</finalName>
+      <finalName>${project.artifactId}</finalName>
    </build>
 
 </project>
diff --git a/apps/mailreader/pom.xml b/apps/mailreader/pom.xml
index 9b6a3c9..9ec10a3 100644
--- a/apps/mailreader/pom.xml
+++ b/apps/mailreader/pom.xml
@@ -39,19 +39,19 @@
 
    <dependencies>
       <dependency>
-         <groupId>${pom.groupId}</groupId>
+         <groupId>${project.groupId}</groupId>
          <artifactId>struts-taglib</artifactId>
-         <version>${pom.version}</version>
+         <version>${project.version}</version>
       </dependency>
       <dependency>
-         <groupId>${pom.groupId}</groupId>
+         <groupId>${project.groupId}</groupId>
          <artifactId>struts-extras</artifactId>
-         <version>${pom.version}</version>
+         <version>${project.version}</version>
       </dependency>
       <dependency>
-         <groupId>${pom.groupId}</groupId>
+         <groupId>${project.groupId}</groupId>
          <artifactId>struts-mailreader-dao</artifactId>
-         <version>${pom.version}</version>
+         <version>${project.version}</version>
       </dependency>
       <dependency>
          <groupId>javax.servlet</groupId>
diff --git a/apps/pom.xml b/apps/pom.xml
index 7e42f07..9c58310 100755
--- a/apps/pom.xml
+++ b/apps/pom.xml
@@ -95,7 +95,7 @@
                   <phase>process-sources</phase>
                   <configuration>
                      <tasks>
-                        <copy todir="${project.build.directory}/${pom.artifactId}/WEB-INF/src/java"
+                        <copy todir="${project.build.directory}/${project.artifactId}/WEB-INF/src/java"
                               failonerror="false">
                            <fileset dir="${basedir}/src/main/java"/>
                         </copy>
@@ -109,7 +109,7 @@
          </plugin>
       </plugins>
 
-      <finalName>${pom.artifactId}</finalName>
+      <finalName>${project.artifactId}</finalName>
 
    </build>
 
diff --git a/apps/scripting-mailreader/pom.xml b/apps/scripting-mailreader/pom.xml
index 8a7f952..34de0e0 100644
--- a/apps/scripting-mailreader/pom.xml
+++ b/apps/scripting-mailreader/pom.xml
@@ -39,24 +39,24 @@
 
    <dependencies>
       <dependency>
-         <groupId>${pom.groupId}</groupId>
+         <groupId>${project.groupId}</groupId>
          <artifactId>struts-scripting</artifactId>
-         <version>${pom.version}</version>
+         <version>${project.version}</version>
       </dependency>
       <dependency>
-         <groupId>${pom.groupId}</groupId>
+         <groupId>${project.groupId}</groupId>
          <artifactId>struts-taglib</artifactId>
-         <version>${pom.version}</version>
+         <version>${project.version}</version>
       </dependency>
       <dependency>
-         <groupId>${pom.groupId}</groupId>
+         <groupId>${project.groupId}</groupId>
          <artifactId>struts-mailreader-dao</artifactId>
-         <version>${pom.version}</version>
+         <version>${project.version}</version>
       </dependency>
       <dependency>
-         <groupId>${pom.groupId}</groupId>
+         <groupId>${project.groupId}</groupId>
          <artifactId>struts-extras</artifactId>
-         <version>${pom.version}</version>
+         <version>${project.version}</version>
       </dependency>
       <dependency>
          <groupId>groovy</groupId>
diff --git a/assembly/pom.xml b/assembly/pom.xml
index 564c899..9a2e88e 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -58,49 +58,49 @@
                             <artifactItem>
                                 <groupId>org.apache.struts</groupId>
                                 <artifactId>struts-blank</artifactId>
-                                <version>${version}</version>
+                                <version>${project.version}</version>
                                 <type>war</type>
                             </artifactItem>
                             <artifactItem>
                                 <groupId>org.apache.struts</groupId>
                                 <artifactId>struts-cookbook</artifactId>
-                                <version>${version}</version>
+                                <version>${project.version}</version>
                                 <type>war</type>
                             </artifactItem>
                             <artifactItem>
                                 <groupId>org.apache.struts</groupId>
                                 <artifactId>struts-examples</artifactId>
-                                <version>${version}</version>
+                                <version>${project.version}</version>
                                 <type>war</type>
                             </artifactItem>
                             <artifactItem>
                                 <groupId>org.apache.struts</groupId>
                                 <artifactId>struts-faces-example1</artifactId>
-                                <version>${version}</version>
+                                <version>${project.version}</version>
                                 <type>war</type>
                             </artifactItem>
                             <artifactItem>
                                 <groupId>org.apache.struts</groupId>
                                 <artifactId>struts-faces-example2</artifactId>
-                                <version>${version}</version>
+                                <version>${project.version}</version>
                                 <type>war</type>
                             </artifactItem>
                             <artifactItem>
                                 <groupId>org.apache.struts</groupId>
                                 <artifactId>struts-mailreader</artifactId>
-                                <version>${version}</version>
+                                <version>${project.version}</version>
                                 <type>war</type>
                             </artifactItem>
                             <artifactItem>
                                 <groupId>org.apache.struts</groupId>
                                 <artifactId>struts-scripting-mailreader</artifactId>
-                                <version>${version}</version>
+                                <version>${project.version}</version>
                                 <type>war</type>
                             </artifactItem>
                             <artifactItem>
                                 <groupId>org.apache.struts</groupId>
                                 <artifactId>struts-el-example</artifactId>
-                                <version>${version}</version>
+                                <version>${project.version}</version>
                                 <type>war</type>
                             </artifactItem>
                         </artifactItems>
@@ -120,7 +120,7 @@
             <descriptor>src/main/assembly/src.xml</descriptor>
             <descriptor>src/main/assembly/docs.xml</descriptor>
           </descriptors>
-          <finalName>struts-${version}</finalName>
+          <finalName>struts-${project.version}</finalName>
           <outputDirectory>target/assembly/out</outputDirectory>
           <workDirectory>target/assembly/work</workDirectory>
         </configuration>
@@ -133,42 +133,42 @@
     <dependency>
       <groupId>org.apache.struts</groupId>
       <artifactId>struts-core</artifactId>
-      <version>${version}</version>
+      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.struts</groupId>
       <artifactId>struts-extras</artifactId>
-      <version>${version}</version>
+      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.struts</groupId>
       <artifactId>struts-el</artifactId>
-      <version>${version}</version>
+      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.struts</groupId>
       <artifactId>struts-faces</artifactId>
-      <version>${version}</version>
+      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.struts</groupId>
       <artifactId>struts-scripting</artifactId>
-      <version>${version}</version>
+      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.struts</groupId>
       <artifactId>struts-taglib</artifactId>
-      <version>${version}</version>
+      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.struts</groupId>
       <artifactId>struts-tiles</artifactId>
-      <version>${version}</version>
+      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.struts</groupId>
       <artifactId>struts-tiles2</artifactId>
-      <version>${version}</version>
+      <version>${project.version}</version>
     </dependency>
     <dependency>
        <groupId>org.apache.tiles</groupId>
@@ -179,7 +179,7 @@
     <dependency>
       <groupId>org.apache.struts</groupId>
       <artifactId>struts-mailreader-dao</artifactId>
-      <version>${version}</version>
+      <version>${project.version}</version>
     </dependency>
     
     <!-- Include optional dependencies -->
diff --git a/assembly/src/main/assembly/all.xml b/assembly/src/main/assembly/all.xml
index a972ba6..7fdf4b7 100644
--- a/assembly/src/main/assembly/all.xml
+++ b/assembly/src/main/assembly/all.xml
@@ -32,7 +32,7 @@
       </excludes>
     </dependencySet>
     <dependencySet>
-      <outputFileNameMapping>${artifactId}-${version}-j4.${extension}</outputFileNameMapping>
+      <outputFileNameMapping>${project.artifactId}-${project.version}-j4.${extension}</outputFileNameMapping>
       <outputDirectory>lib</outputDirectory>
       <includes>
         <include>org.apache.tiles:tiles-api:jar:j4</include>
diff --git a/assembly/src/main/assembly/lib.xml b/assembly/src/main/assembly/lib.xml
index 121f3ee..393d460 100644
--- a/assembly/src/main/assembly/lib.xml
+++ b/assembly/src/main/assembly/lib.xml
@@ -33,7 +33,7 @@
       </excludes>
     </dependencySet>
     <dependencySet>
-      <outputFileNameMapping>${artifactId}-${version}-j4.${extension}</outputFileNameMapping>
+      <outputFileNameMapping>${project.artifactId}-${project.version}-j4.${extension}</outputFileNameMapping>
       <outputDirectory>lib</outputDirectory>
       <includes>
         <include>org.apache.tiles:tiles-api:jar:j4</include>
diff --git a/el/pom.xml b/el/pom.xml
index d5e8746..8ac8631 100644
--- a/el/pom.xml
+++ b/el/pom.xml
@@ -50,7 +50,7 @@
 
    <properties>
        <struts.osgi.symbolicName>org.apache.strutsel.taglib</struts.osgi.symbolicName>
-       <struts.osgi.export>org.apache.strutsel.*;version=${pom.version}</struts.osgi.export>
+       <struts.osgi.export>org.apache.strutsel.*;version=${project.version}</struts.osgi.export>
    </properties>
    
    <build>
@@ -63,19 +63,19 @@
 
    <dependencies>
       <dependency>
-         <groupId>${pom.groupId}</groupId>
+         <groupId>${project.groupId}</groupId>
          <artifactId>struts-core</artifactId>
-         <version>${pom.version}</version>
+         <version>${project.version}</version>
       </dependency>
       <dependency>
-         <groupId>${pom.groupId}</groupId>
+         <groupId>${project.groupId}</groupId>
          <artifactId>struts-taglib</artifactId>
-         <version>${pom.version}</version>
+         <version>${project.version}</version>
       </dependency>
       <dependency>
-         <groupId>${pom.groupId}</groupId>
+         <groupId>${project.groupId}</groupId>
          <artifactId>struts-tiles</artifactId>
-         <version>${pom.version}</version>
+         <version>${project.version}</version>
          <optional>true</optional>
       </dependency>
       <dependency>
diff --git a/extras/pom.xml b/extras/pom.xml
index 0b95ae4..951ce31 100644
--- a/extras/pom.xml
+++ b/extras/pom.xml
@@ -78,7 +78,7 @@
       <dependency>
          <groupId>org.apache.struts</groupId>
          <artifactId>struts-core</artifactId>
-         <version>${pom.version}</version>
+         <version>${project.version}</version>
       </dependency>
    </dependencies>
 
diff --git a/faces/pom.xml b/faces/pom.xml
index ec285b6..0ac81de 100644
--- a/faces/pom.xml
+++ b/faces/pom.xml
@@ -76,19 +76,19 @@
 
    <dependencies>
       <dependency>
-         <groupId>${pom.groupId}</groupId>
+         <groupId>${project.groupId}</groupId>
          <artifactId>struts-core</artifactId>
-         <version>${pom.version}</version>
+         <version>${project.version}</version>
       </dependency>
       <dependency>
-         <groupId>${pom.groupId}</groupId>
+         <groupId>${project.groupId}</groupId>
          <artifactId>struts-taglib</artifactId>
-         <version>${pom.version}</version>
+         <version>${project.version}</version>
       </dependency>
       <dependency>
-         <groupId>${pom.groupId}</groupId>
+         <groupId>${project.groupId}</groupId>
          <artifactId>struts-tiles</artifactId>
-         <version>${pom.version}</version>  
+         <version>${project.version}</version>  
       </dependency>
       <dependency>
          <groupId>junit</groupId>
diff --git a/integration/apps-it/pom.xml b/integration/apps-it/pom.xml
index 7839d17..b95ea39 100644
--- a/integration/apps-it/pom.xml
+++ b/integration/apps-it/pom.xml
@@ -95,7 +95,7 @@
                         </property>
                         <property>
                            <name>version</name>
-                           <value>${version}</value>
+                           <value>${project.version}</value>
                         </property>
                      </systemProperties>
                   </configuration>
diff --git a/pom.xml b/pom.xml
index b1aed2c..8544b56 100644
--- a/pom.xml
+++ b/pom.xml
@@ -342,8 +342,8 @@
     
     <properties>
         <myfaces.version>1.0.9</myfaces.version>
-        <struts.osgi.symbolicName>org.apache.${artifactId}</struts.osgi.symbolicName>
-        <struts.osgi.export>org.apache.struts.*;version=${pom.version}</struts.osgi.export>
+        <struts.osgi.symbolicName>org.apache.${project.artifactId}</struts.osgi.symbolicName>
+        <struts.osgi.export>org.apache.struts.*;version=${project.version}</struts.osgi.export>
         <struts.osgi.import>*</struts.osgi.import>
         <struts.osgi.dynamicImport />
         <struts.osgi.private />
diff --git a/scripting/pom.xml b/scripting/pom.xml
index 2120dae..26094ff 100644
--- a/scripting/pom.xml
+++ b/scripting/pom.xml
@@ -62,9 +62,9 @@
    
     <dependencies>
         <dependency>
-            <groupId>${pom.groupId}</groupId>
+            <groupId>${project.groupId}</groupId>
             <artifactId>struts-core</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>bsf</groupId>
diff --git a/taglib/pom.xml b/taglib/pom.xml
index c09c102..f4e1e8b 100644
--- a/taglib/pom.xml
+++ b/taglib/pom.xml
@@ -78,9 +78,9 @@
 
     <dependencies>
         <dependency>
-            <groupId>${pom.groupId}</groupId>
+            <groupId>${project.groupId}</groupId>
             <artifactId>struts-core</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
diff --git a/tiles/pom.xml b/tiles/pom.xml
index 6c6d597..3b79b4b 100644
--- a/tiles/pom.xml
+++ b/tiles/pom.xml
@@ -71,9 +71,9 @@
 
     <dependencies>
         <dependency>
-            <groupId>${pom.groupId}</groupId>
+            <groupId>${project.groupId}</groupId>
             <artifactId>struts-core</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
diff --git a/tiles2/pom.xml b/tiles2/pom.xml
index 438d7cc..41343f2 100644
--- a/tiles2/pom.xml
+++ b/tiles2/pom.xml
@@ -71,9 +71,9 @@
 
    <dependencies>
       <dependency>
-         <groupId>${pom.groupId}</groupId>
+         <groupId>${project.groupId}</groupId>
          <artifactId>struts-core</artifactId>
-         <version>${pom.version}</version>
+         <version>${project.version}</version>
       </dependency>
       <dependency>
           <groupId>backport-util-concurrent</groupId>