diff --git a/CHANGELOG b/CHANGELOG
deleted file mode 100644
index 03cc55e..0000000
--- a/CHANGELOG
+++ /dev/null
@@ -1,39 +0,0 @@
-CHANGELOG
-=========
-
-0.4.1
------
-
-* Bump kemitix-parent from 5.1.1 to 5.2.0 (#10)
-
-0.4.0
------
-
-* Requires PMD 6.7.0
-* The new Java rule FieldNamingConventions (java-codestyle)
-* The new Java rule LinguisticNaming (java-codestyle)
-* Remove deprecated rule VariableNamingConventions
-* Remove deprecated rule SuspiciousConstantFieldName
-
-0.3.0
------
-
-* Upgrade `kemitix-parent` to 5.1.1
-* Remove unused tiles
-* Disable PMD check `LawOfDemeter` due to Java Streams giving false positives
-
-0.2.1
------
-
-* Upgrade `kemitix-parent` to 5.1.0
-
-0.2.0
------
-
-* Disable `CommentSize` - didn't agree with MIT License headers
-* Relaxed `AvoidDuplicateLiterals.maxDuplicateLiterals` - value is when to fail, not the max allowed
-
-0.1.0
------
-
-* Initial release
diff --git a/CHANGELOG.org b/CHANGELOG.org
new file mode 100644
index 0000000..e097fce
--- /dev/null
+++ b/CHANGELOG.org
@@ -0,0 +1,51 @@
+* CHANGELOG
+
+  All notable changes to this project will be documented in this file.
+  
+  The format is based on [Keep a
+  Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to
+  [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+** 1.0.0 - 2018-11-11
+
+*** Removed
+
+    The following rules are marked as deprecated in PMD and will be removed in
+    PMD 7.0:
+
+   * AbstractNaming
+   * ForLoopsMustUseBraces
+   * IfElseStmtsMustUseBraces
+   * IfStmtsMustUseBraces
+   * WhileLoopsMustUseBraces
+
+*** Dependencies
+
+    * Bump kemitix-parent from 5.1.1 to 5.2.0
+
+** 0.4.0
+
+   * Requires PMD 6.7.0
+   * The new Java rule FieldNamingConventions (java-codestyle)
+   * The new Java rule LinguisticNaming (java-codestyle)
+   * Remove deprecated rule VariableNamingConventions
+   * Remove deprecated rule SuspiciousConstantFieldName
+
+** 0.3.0
+
+   * Upgrade `kemitix-parent` to 5.1.1
+   * Remove unused tiles
+   * Disable PMD check `LawOfDemeter` due to Java Streams giving false positives
+
+** 0.2.1
+
+   * Upgrade `kemitix-parent` to 5.1.0
+
+** 0.2.0
+
+   * Disable `CommentSize` - didn't agree with MIT License headers
+   * Relaxed `AvoidDuplicateLiterals.maxDuplicateLiterals` - value is when to fail, not the max allowed
+
+** 0.1.0
+
+   * Initial release
diff --git a/src/main/resources/net/kemitix/pmd/java.xml b/src/main/resources/net/kemitix/pmd/java.xml
index c0cb36a..65e0a31 100644
--- a/src/main/resources/net/kemitix/pmd/java.xml
+++ b/src/main/resources/net/kemitix/pmd/java.xml
@@ -69,11 +69,6 @@ http://pmd.sourceforge.net/ruleset/2.0.0 ">
     <rule ref="category/java/bestpractices.xml/UseVarargs"/>
 
     <!-- Code Style -->
-    <rule ref="category/java/codestyle.xml/AbstractNaming">
-        <properties>
-            <property name="strict" value="true"/>
-        </properties>
-    </rule>
     <rule ref="category/java/codestyle.xml/AvoidDollarSigns"/>
     <rule ref="category/java/codestyle.xml/AvoidProtectedFieldInFinalClass"/>
     <rule ref="category/java/codestyle.xml/AvoidProtectedMethodInFinalClassNotExtending"/>
@@ -100,10 +95,7 @@ http://pmd.sourceforge.net/ruleset/2.0.0 ">
     </rule>
     <rule ref="category/java/codestyle.xml/FieldNamingConventions" />
     <rule ref="category/java/codestyle.xml/ForLoopShouldBeWhileLoop"/>
-    <rule ref="category/java/codestyle.xml/ForLoopsMustUseBraces"/>
     <rule ref="category/java/codestyle.xml/GenericsNaming"/>
-    <rule ref="category/java/codestyle.xml/IfElseStmtsMustUseBraces"/>
-    <rule ref="category/java/codestyle.xml/IfStmtsMustUseBraces"/>
     <rule ref="category/java/codestyle.xml/LinguisticNaming" />
     <rule ref="category/java/codestyle.xml/LocalVariableCouldBeFinal"/>
     <rule ref="category/java/codestyle.xml/LongVariable"/>
@@ -124,7 +116,6 @@ http://pmd.sourceforge.net/ruleset/2.0.0 ">
     <rule ref="category/java/codestyle.xml/UnnecessaryReturn"/>
     <rule ref="category/java/codestyle.xml/UselessParentheses"/>
     <rule ref="category/java/codestyle.xml/UselessQualifiedThis"/>
-    <rule ref="category/java/codestyle.xml/WhileLoopsMustUseBraces"/>
 
     <!-- Design -->
     <rule ref="category/java/design.xml/AbstractClassWithoutAnyMethod"/>