diff --git a/dev/codesniffer/ruleset.xml b/dev/codesniffer/ruleset.xml
index b5b3d90d4b2..13fa58777b9 100755
--- a/dev/codesniffer/ruleset.xml
+++ b/dev/codesniffer/ruleset.xml
@@ -33,7 +33,7 @@
 	<!-- Lines can be 85 chars long, but never show errors -->
 	<rule ref="Generic.Files.LineLength">
 		<properties>
-			<property name="lineLimit" value="1000" />
+			<property name="lineLimit" value="320" />
 			<property name="absoluteLineLimit" value="0" />
 		</properties>
 	</rule>
@@ -169,14 +169,8 @@
 	<rule ref="PEAR.Functions.ValidDefaultValue" />
 
 	<rule ref="PEAR.NamingConventions.ValidClassName" />
-	<rule ref="PEAR.NamingConventions.ValidClassName.StartWithCaptial">
-        <severity>0</severity>
-	</rule>
 
 	<rule ref="PEAR.NamingConventions.ValidFunctionName" />
-	<rule ref="PEAR.NamingConventions.ValidFunctionName.NotCamelCaps">
-        <severity>0</severity>
-	</rule>
 
 	<rule ref="PEAR.NamingConventions.ValidFunctionName.FunctionNoCaptial">
         <severity>0</severity>