diff --git a/checks/src/main/java/com/android/apifinder/ApiFinderDetector.kt b/checks/src/main/java/com/android/apifinder/ApiFinderDetector.kt
index 5132fcf..3d68727 100644
--- a/checks/src/main/java/com/android/apifinder/ApiFinderDetector.kt
+++ b/checks/src/main/java/com/android/apifinder/ApiFinderDetector.kt
@@ -1,4 +1,4 @@
-package com.android.apifinder
+package com.google.android.apifinder
 
 import com.android.tools.lint.client.api.UElementHandler
 import com.android.tools.lint.detector.api.*
diff --git a/checks/src/main/java/com/android/apifinder/ApiFinderIssueRegistry.kt b/checks/src/main/java/com/android/apifinder/ApiFinderIssueRegistry.kt
index f2f91e2..0bd1b3a 100644
--- a/checks/src/main/java/com/android/apifinder/ApiFinderIssueRegistry.kt
+++ b/checks/src/main/java/com/android/apifinder/ApiFinderIssueRegistry.kt
@@ -1,12 +1,13 @@
-package com.android.apifinder
+package com.google.android.apifinder
 
 import com.android.tools.lint.client.api.IssueRegistry
+import com.android.tools.lint.detector.api.CURRENT_API
 import com.google.auto.service.AutoService
 
 @AutoService(IssueRegistry::class)
 @Suppress("UnstableApiUsage")
 class ApiFinderIssueRegistry : IssueRegistry() {
     override val api: Int
-        get() = 7
+        get() = CURRENT_API
     override val issues = listOf(ApiFinderDetector.ISSUE)
 }
diff --git a/checks/src/test/java/com/android/apifinder/ApiFinderDetectorTest.kt b/checks/src/test/java/com/android/apifinder/ApiFinderDetectorTest.kt
index 397fe07..f9dd466 100644
--- a/checks/src/test/java/com/android/apifinder/ApiFinderDetectorTest.kt
+++ b/checks/src/test/java/com/android/apifinder/ApiFinderDetectorTest.kt
@@ -1,4 +1,4 @@
-package com.android.apifinder
+package com.google.android.apifinder
 
 import com.android.tools.lint.checks.infrastructure.LintDetectorTest
 import com.android.tools.lint.detector.api.Detector