diff --git a/parents/checkstyle/pom.xml b/build/checkstyle/pom.xml
similarity index 96%
rename from parents/checkstyle/pom.xml
rename to build/checkstyle/pom.xml
index 3e4a28b9802..5984802398c 100644
--- a/parents/checkstyle/pom.xml
+++ b/build/checkstyle/pom.xml
@@ -11,7 +11,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <name>Apache CloudStack Checkstyle Configuration</name>
-  <artifactId>checkstyle</artifactId>
+  <artifactId>build-checkstyle</artifactId>
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloud-maven-standard</artifactId>
diff --git a/parents/checkstyle/src/main/resources/tooling/checkstyle.xml b/build/checkstyle/src/main/resources/tooling/checkstyle.xml
similarity index 91%
rename from parents/checkstyle/src/main/resources/tooling/checkstyle.xml
rename to build/checkstyle/src/main/resources/tooling/checkstyle.xml
index 289ad6778e8..9b6502949d1 100644
--- a/parents/checkstyle/src/main/resources/tooling/checkstyle.xml
+++ b/build/checkstyle/src/main/resources/tooling/checkstyle.xml
@@ -28,11 +28,14 @@
 
     <module name="TreeWalker">
         <module name="LineLength">
-            <property name="max" value="180"/>
+            <property name="max" value="1024"/>
         </module>
 
         <module name="RedundantImport"/>
         <module name="UnusedImports"/>
+		<module name="MemberName">
+           <property name="format" value="^[a-zA-Z_][a-zA-Z0-9]*$"/>
+		</module>
 
         <module name="PackageName"/>
         <module name="ParameterName"/>
diff --git a/plugins/network-elements/nicira-nvp/pom.xml b/plugins/network-elements/nicira-nvp/pom.xml
index 1315e9ba841..3bc8d141093 100644
--- a/plugins/network-elements/nicira-nvp/pom.xml
+++ b/plugins/network-elements/nicira-nvp/pom.xml
@@ -26,7 +26,7 @@
     <version>4.4.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
-
+<!--
   <build>
     <plugins>
       <plugin>
@@ -60,5 +60,5 @@
       </plugin>
     </plugins>
   </build>
-
+-->
 </project>
diff --git a/pom.xml b/pom.xml
index 3ddaeb03d3c..d256b97cc19 100644
--- a/pom.xml
+++ b/pom.xml
@@ -175,7 +175,7 @@
     <module>services</module>
     <module>maven-standard</module>
     <module>quickcloud</module>
-    <module>parents/checkstyle</module>
+    <module>build/checkstyle</module>
   </modules>
 
   <dependencyManagement>
@@ -445,15 +445,13 @@
     <outputDirectory>${basedir}/${cs.target.dir}/classes</outputDirectory>
     <testOutputDirectory>${basedir}/${cs.target.dir}/test-classes</testOutputDirectory>
     <plugins>
-	<!--
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-checkstyle-plugin</artifactId>
-        <version>${cs.checkstyle.version}</version>
         <dependencies>
           <dependency>
             <groupId>org.apache.cloudstack</groupId>
-            <artifactId>checkstyle</artifactId>
+            <artifactId>build-checkstyle</artifactId>
             <version>${project.version}</version>
           </dependency>
         </dependencies>
@@ -475,7 +473,6 @@
           <excludes>**\/deps\/,**\/test\/,**\/target\/,**\/bin\/,**\/*.xml,**\/*.ini,**\/*.sh,**\/*.bat</excludes>
         </configuration>
       </plugin>
-	  -->
     </plugins>
     <pluginManagement>
       <plugins>
@@ -753,6 +750,20 @@
       </plugins>
     </pluginManagement>
   </build>
+  <!--
+  <reporting>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-checkstyle-plugin</artifactId>
+        <configuration>
+          <configLocation>tooling/checkstyle.xml</configLocation>
+          <headerLocation>tooling/LICENSE.txt</headerLocation>
+        </configuration>
+      </plugin>
+    </plugins>  
+  </reporting>
+  -->
 
   <profiles>
     <profile>