diff --git a/client/pom.xml b/client/pom.xml
index 4ceaf588646..d523bedd9de 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -447,13 +447,13 @@
             </configuration>
           </execution>
           <execution>
-            <id>process-nonoss</id>
+            <id>process-noredist</id>
             <phase>process-resources</phase>
             <goals>
               <goal>run</goal>
             </goals>
             <configuration>
-              <target if="${nonoss}">
+              <target if="${noredist}">
                 <echo>test</echo>
                 <replaceregexp
                   file="${basedir}/target/generated-webapp/WEB-INF/classes/environment.properties"
@@ -479,13 +479,13 @@
             </configuration>
           </execution>
           <execution>
-            <id>process-nonoss-spring-context</id>
+            <id>process-noredist-spring-context</id>
             <phase>process-resources</phase>
             <goals>
               <goal>run</goal>
             </goals>
             <configuration>
-              <target if="${nonoss}">
+              <target if="${noredist}">
                 <replaceregexp file="${basedir}/target/generated-webapp/WEB-INF/web.xml"
                   match="classpath:componentContext.xml"
                   replace="classpath:nonossComponentContext.xml" byline="true"/>
@@ -645,7 +645,7 @@
       <id>netapp</id>
       <activation>
         <property>
-          <name>nonoss</name>
+          <name>noredist</name>
         </property>
       </activation>
       <dependencies>
@@ -660,7 +660,7 @@
       <id>f5</id>
       <activation>
         <property>
-          <name>nonoss</name>
+          <name>noredist</name>
         </property>
       </activation>
       <dependencies>
@@ -675,7 +675,7 @@
       <id>netscaler</id>
       <activation>
         <property>
-          <name>nonoss</name>
+          <name>noredist</name>
         </property>
       </activation>
       <dependencies>
@@ -690,7 +690,7 @@
       <id>srx</id>
       <activation>
         <property>
-          <name>nonoss</name>
+          <name>noredist</name>
         </property>
       </activation>
       <dependencies>
@@ -705,7 +705,7 @@
       <id>vmware</id>
       <activation>
         <property>
-          <name>nonoss</name>
+          <name>noredist</name>
         </property>
       </activation>
       <dependencies>
diff --git a/plugins/pom.xml b/plugins/pom.xml
index 0812642b7c0..ff18e837714 100755
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@ -99,7 +99,7 @@
       <id>netapp</id>
       <activation>
         <property>
-          <name>nonoss</name>
+          <name>noredist</name>
         </property>
       </activation>
       <modules>
@@ -110,7 +110,7 @@
       <id>kvm</id>
       <activation>
         <property>
-          <name>nonoss</name>
+          <name>noredist</name>
         </property>
       </activation>
       <modules>
@@ -121,7 +121,7 @@
       <id>f5</id>
       <activation>
         <property>
-          <name>nonoss</name>
+          <name>noredist</name>
         </property>
       </activation>
       <modules>
@@ -132,7 +132,7 @@
       <id>netscaler</id>
       <activation>
         <property>
-          <name>nonoss</name>
+          <name>noredist</name>
         </property>
       </activation>
       <modules>
@@ -143,7 +143,7 @@
       <id>srx</id>
       <activation>
         <property>
-          <name>nonoss</name>
+          <name>noredist</name>
         </property>
       </activation>
       <modules>
@@ -154,7 +154,7 @@
       <id>vmware</id>
       <activation>
         <property>
-          <name>nonoss</name>
+          <name>noredist</name>
         </property>
       </activation>
       <modules>
diff --git a/pom.xml b/pom.xml
index bdd474f91af..35eeedfef90 100644
--- a/pom.xml
+++ b/pom.xml
@@ -727,7 +727,7 @@
       <id>vmware</id>
       <activation>
         <property>
-          <name>nonoss</name>
+          <name>noredist</name>
         </property>
       </activation>
       <modules>