diff --git a/httpclient-benchmark/pom.xml b/httpclient-benchmark/pom.xml
index 40ef14e09..bac3bbdb6 100644
--- a/httpclient-benchmark/pom.xml
+++ b/httpclient-benchmark/pom.xml
@@ -52,7 +52,7 @@
     <dependency>
       <groupId>org.apache.httpcomponents</groupId>
       <artifactId>httpclient</artifactId>
-      <version>${pom.version}</version>
+      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.httpcomponents</groupId>
diff --git a/httpclient-osgi/pom.xml b/httpclient-osgi/pom.xml
index 9e39cab20..f516ef5fe 100644
--- a/httpclient-osgi/pom.xml
+++ b/httpclient-osgi/pom.xml
@@ -53,7 +53,7 @@
     <dependency>
       <groupId>org.apache.httpcomponents</groupId>
       <artifactId>httpclient</artifactId>
-      <version>${pom.version}</version>
+      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>commons-codec</groupId>
@@ -63,7 +63,7 @@
     <dependency>
       <groupId>org.apache.httpcomponents</groupId>
       <artifactId>httpmime</artifactId>
-      <version>${pom.version}</version>
+      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.james</groupId>
@@ -87,8 +87,8 @@
         <extensions>true</extensions>
         <configuration>
           <instructions>
-            <Bundle-Name>Apache ${pom.name}</Bundle-Name>
-            <Bundle-SymbolicName>${pom.groupId}.httpclient</Bundle-SymbolicName>
+            <Bundle-Name>Apache ${project.name}</Bundle-Name>
+            <Bundle-SymbolicName>${project.groupId}.httpclient</Bundle-SymbolicName>
             <_exportcontents>
             org.apache.http.auth.*;version=${project.version},
             org.apache.http.cookie.*;version=${project.version},
@@ -122,7 +122,7 @@
         </configuration>
       </plugin>
     </plugins>
-    <finalName>org.apache.httpcomponents.httpclient_${pom.version}</finalName>
+    <finalName>org.apache.httpcomponents.httpclient_${project.version}</finalName>
   </build>
 
 </project>
diff --git a/httpclient/pom.xml b/httpclient/pom.xml
index 934db9160..58e38993e 100644
--- a/httpclient/pom.xml
+++ b/httpclient/pom.xml
@@ -133,13 +133,13 @@
           <archive>
             <manifestEntries>
               <Specification-Title>HttpComponents HttpClient</Specification-Title>
-              <Specification-Version>${pom.version}</Specification-Version>
+              <Specification-Version>${project.version}</Specification-Version>
               <Specification-Vendor>The Apache Software Foundation</Specification-Vendor>
               <Implementation-Title>HttpComponents HttpClient</Implementation-Title>
-              <Implementation-Version>${pom.version}</Implementation-Version>
+              <Implementation-Version>${project.version}</Implementation-Version>
               <Implementation-Vendor>The Apache Software Foundation</Implementation-Vendor>
               <Implementation-Vendor-Id>org.apache</Implementation-Vendor-Id>
-              <url>${pom.url}</url>
+              <url>${project.url}</url>
             </manifestEntries>
           </archive>
         </configuration>
diff --git a/httpmime/pom.xml b/httpmime/pom.xml
index 725556370..59b7092d2 100644
--- a/httpmime/pom.xml
+++ b/httpmime/pom.xml
@@ -128,13 +128,13 @@
           <archive>
             <manifestEntries>
               <Specification-Title>HttpComponents HttpMime</Specification-Title>
-              <Specification-Version>${pom.version}</Specification-Version>
+              <Specification-Version>${project.version}</Specification-Version>
               <Specification-Vendor>The Apache Software Foundation</Specification-Vendor>
               <Implementation-Title>HttpComponents HttpMime</Implementation-Title>
-              <Implementation-Version>${pom.version}</Implementation-Version>
+              <Implementation-Version>${project.version}</Implementation-Version>
               <Implementation-Vendor>The Apache Software Foundation</Implementation-Vendor>
               <Implementation-Vendor-Id>org.apache</Implementation-Vendor-Id>
-              <url>${pom.url}</url>
+              <url>${project.url}</url>
             </manifestEntries>
           </archive>
         </configuration>
diff --git a/pom.xml b/pom.xml
index 0409c4406..0d4fbafa6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -133,19 +133,19 @@
           <tasks>
             <ant antfile="src/main/assembly/build.xml">
               <property name="target" value="${project.build.directory}" />
-              <property name="package.name" value="${pom.artifactId}-${pom.version}-bin" />
+              <property name="package.name" value="${project.artifactId}-${project.version}-bin" />
             </ant>
             <ant antfile="src/main/assembly/build.xml">
               <property name="target" value="${project.build.directory}" />
-              <property name="package.name" value="${pom.artifactId}-${pom.version}-bin-with-dependencies" />
+              <property name="package.name" value="${project.artifactId}-${project.version}-bin-with-dependencies" />
             </ant>
             <ant antfile="src/main/assembly/build.xml">
               <property name="target" value="${project.build.directory}" />
-              <property name="package.name" value="${pom.artifactId}-${pom.version}-osgi-bin" />
+              <property name="package.name" value="${project.artifactId}-${project.version}-osgi-bin" />
             </ant>
             <ant antfile="src/main/assembly/build.xml">
               <property name="target" value="${project.build.directory}" />
-              <property name="package.name" value="${pom.artifactId}-${pom.version}-src" />
+              <property name="package.name" value="${project.artifactId}-${project.version}-src" />
             </ant>
           </tasks>
         </configuration>
@@ -171,7 +171,7 @@
           <entities>
             <entity>
               <name>version</name>
-              <value>${pom.version}</value>
+              <value>${project.version}</value>
             </entity>
           </entities>
           <postProcess>