diff --git a/plugin/src/main/groovy/com/novoda/staticanalysis/internal/findbugs/FindbugsConfigurator.groovy b/plugin/src/main/groovy/com/novoda/staticanalysis/internal/findbugs/FindbugsConfigurator.groovy
index ac3d9f8..74e736b 100644
--- a/plugin/src/main/groovy/com/novoda/staticanalysis/internal/findbugs/FindbugsConfigurator.groovy
+++ b/plugin/src/main/groovy/com/novoda/staticanalysis/internal/findbugs/FindbugsConfigurator.groovy
@@ -177,9 +177,8 @@ class FindbugsConfigurator extends CodeQualityConfigurator<FindBugs, FindBugsExt
     private void createHtmlReportTask(String taskName) {
         createTask(project, "generate${taskName.capitalize()}HtmlReport", GenerateFindBugsHtmlReport) { GenerateFindBugsHtmlReport task ->
             def findbugs = project.tasks[taskName] as FindBugs
-            def collectViolations = project.tasks["collect${taskName.capitalize()}Violations"] as CollectViolationsTask
-            task.xmlReportFile = collectViolations.xmlReportFile
-            task.htmlReportFile = collectViolations.htmlReportFile
+            task.xmlReportFile = findbugs.reports.xml.destination
+            task.htmlReportFile = new File(task.xmlReportFile.absolutePath - '.xml' + '.html')
             task.classpath = findbugs.findbugsClasspath
             task.dependsOn findbugs
         }
diff --git a/sample-multi-module/app/src/main/AndroidManifest.xml b/sample-multi-module/app/src/main/AndroidManifest.xml
index 1f6fb82..26d1b2e 100644
--- a/sample-multi-module/app/src/main/AndroidManifest.xml
+++ b/sample-multi-module/app/src/main/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:tools="http://schemas.android.com/tools"
-  package="com.novoda.buildpropertiesplugin.sample">
+  package="com.novoda.staticanalysisplugin.sample">
 
   <application
     android:allowBackup="false"
diff --git a/sample-multi-module/app/src/main/java/com/novoda/staticanalysisplugin/sample/MyActivity.kt b/sample-multi-module/app/src/main/java/com/novoda/staticanalysisplugin/sample/MyActivity.kt
index ba0e566..e1c8925 100644
--- a/sample-multi-module/app/src/main/java/com/novoda/staticanalysisplugin/sample/MyActivity.kt
+++ b/sample-multi-module/app/src/main/java/com/novoda/staticanalysisplugin/sample/MyActivity.kt
@@ -4,7 +4,6 @@ import android.content.Intent
 import android.os.Bundle
 import android.support.v7.app.AppCompatActivity
 import android.widget.Toast
-import com.novoda.buildpropertiesplugin.sample.R
 import kotlinx.android.synthetic.main.activity_my.*
 
 class MyActivity : AppCompatActivity() {
diff --git a/sample-multi-module/app/src/main/java/com/novoda/staticanalysisplugin/sample/SomeOtherActivity.java b/sample-multi-module/app/src/main/java/com/novoda/staticanalysisplugin/sample/SomeOtherActivity.java
index 6bdc84c..15f072c 100644
--- a/sample-multi-module/app/src/main/java/com/novoda/staticanalysisplugin/sample/SomeOtherActivity.java
+++ b/sample-multi-module/app/src/main/java/com/novoda/staticanalysisplugin/sample/SomeOtherActivity.java
@@ -6,8 +6,6 @@
 import android.util.Log;
 import android.widget.Toast;
 
-import com.novoda.buildpropertiesplugin.sample.R;
-
 public class SomeOtherActivity extends AppCompatActivity {
 
     @Override
diff --git a/sample-multi-module/app/src/test/java/com/novoda/buildpropertiesplugin/sample/MyClassTest.java b/sample-multi-module/app/src/test/java/com/novoda/staticanalysisplugin/sample/MyClassTest.java
similarity index 82%
rename from sample-multi-module/app/src/test/java/com/novoda/buildpropertiesplugin/sample/MyClassTest.java
rename to sample-multi-module/app/src/test/java/com/novoda/staticanalysisplugin/sample/MyClassTest.java
index 0f1ee6a..13866b6 100644
--- a/sample-multi-module/app/src/test/java/com/novoda/buildpropertiesplugin/sample/MyClassTest.java
+++ b/sample-multi-module/app/src/test/java/com/novoda/staticanalysisplugin/sample/MyClassTest.java
@@ -1,4 +1,4 @@
-package com.novoda.buildpropertiesplugin.sample;
+package com.novoda.staticanalysisplugin.sample;
 
 import org.junit.Test;
 
diff --git a/sample-multi-module/build.gradle b/sample-multi-module/build.gradle
index c96a719..0fa1c87 100644
--- a/sample-multi-module/build.gradle
+++ b/sample-multi-module/build.gradle
@@ -1,5 +1,5 @@
 buildscript {
-    ext.kotlin_version = '1.3.0'
+    ext.kotlin_version = '1.3.31'
 
     repositories {
         google()
@@ -7,10 +7,10 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:3.4.1'
         classpath 'com.novoda:gradle-static-analysis-plugin:local'
-        classpath 'io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.0.0-RC12'
-        classpath 'gradle.plugin.org.jlleitschuh.gradle:ktlint-gradle:5.1.0'
+        classpath 'io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.0.0-RC14'
+        classpath 'org.jlleitschuh.gradle:ktlint-gradle:8.0.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
diff --git a/sample/app/build.gradle b/sample/app/build.gradle
index d50209b..a4134b3 100755
--- a/sample/app/build.gradle
+++ b/sample/app/build.gradle
@@ -65,7 +65,7 @@ staticAnalysis {
     }
 
     ktlint {
-        android true
+        android.set(true)
         reporters = [ReporterType.CHECKSTYLE]
 
         includeVariants { variant -> variant.name.contains('debug') }
diff --git a/sample/app/src/main/AndroidManifest.xml b/sample/app/src/main/AndroidManifest.xml
index 1f6fb82..26d1b2e 100755
--- a/sample/app/src/main/AndroidManifest.xml
+++ b/sample/app/src/main/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:tools="http://schemas.android.com/tools"
-  package="com.novoda.buildpropertiesplugin.sample">
+  package="com.novoda.staticanalysisplugin.sample">
 
   <application
     android:allowBackup="false"
diff --git a/sample/app/src/main/java/com/novoda/staticanalysisplugin/sample/MyActivity.kt b/sample/app/src/main/java/com/novoda/staticanalysisplugin/sample/MyActivity.kt
index 334ad1e..b920378 100755
--- a/sample/app/src/main/java/com/novoda/staticanalysisplugin/sample/MyActivity.kt
+++ b/sample/app/src/main/java/com/novoda/staticanalysisplugin/sample/MyActivity.kt
@@ -4,7 +4,6 @@ import android.content.Intent
 import android.os.Bundle
 import android.support.v7.app.AppCompatActivity
 import android.widget.Toast
-import com.novoda.buildpropertiesplugin.sample.R
 import kotlinx.android.synthetic.main.activity_my.*
 
 class MyActivity : AppCompatActivity() {
diff --git a/sample/app/src/main/java/com/novoda/staticanalysisplugin/sample/SomeOtherActivity.java b/sample/app/src/main/java/com/novoda/staticanalysisplugin/sample/SomeOtherActivity.java
index 6bdc84c..15f072c 100755
--- a/sample/app/src/main/java/com/novoda/staticanalysisplugin/sample/SomeOtherActivity.java
+++ b/sample/app/src/main/java/com/novoda/staticanalysisplugin/sample/SomeOtherActivity.java
@@ -6,8 +6,6 @@
 import android.util.Log;
 import android.widget.Toast;
 
-import com.novoda.buildpropertiesplugin.sample.R;
-
 public class SomeOtherActivity extends AppCompatActivity {
 
     @Override
diff --git a/sample/app/src/test/java/com/novoda/buildpropertiesplugin/sample/MyClassTest.java b/sample/app/src/test/java/com/novoda/staticanalysisplugin/sample/MyClassTest.java
similarity index 82%
rename from sample/app/src/test/java/com/novoda/buildpropertiesplugin/sample/MyClassTest.java
rename to sample/app/src/test/java/com/novoda/staticanalysisplugin/sample/MyClassTest.java
index 0f1ee6a..13866b6 100755
--- a/sample/app/src/test/java/com/novoda/buildpropertiesplugin/sample/MyClassTest.java
+++ b/sample/app/src/test/java/com/novoda/staticanalysisplugin/sample/MyClassTest.java
@@ -1,4 +1,4 @@
-package com.novoda.buildpropertiesplugin.sample;
+package com.novoda.staticanalysisplugin.sample;
 
 import org.junit.Test;
 
diff --git a/sample/build.gradle b/sample/build.gradle
index b51cae3..7131e34 100755
--- a/sample/build.gradle
+++ b/sample/build.gradle
@@ -1,5 +1,5 @@
 buildscript {
-    ext.kotlin_version = '1.3.0'
+    ext.kotlin_version = '1.3.31'
 
     repositories {
         google()
@@ -7,10 +7,10 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:3.4.1'
         classpath 'com.novoda:gradle-static-analysis-plugin:local'
-        classpath 'io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.0.0-RC12'
-        classpath 'gradle.plugin.org.jlleitschuh.gradle:ktlint-gradle:5.1.0'
+        classpath 'io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.0.0-RC14'
+        classpath 'org.jlleitschuh.gradle:ktlint-gradle:8.0.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }