diff --git a/src/main/java/com/example/google/lint/MainActivityDetector.java b/src/main/java/com/example/google/lint/MainActivityDetector.java
index 72d1e7ba..c73fc891 100644
--- a/src/main/java/com/example/google/lint/MainActivityDetector.java
+++ b/src/main/java/com/example/google/lint/MainActivityDetector.java
@@ -63,7 +63,7 @@ public class MainActivityDetector extends ResourceXmlDetector implements Detecto
             Severity.ERROR,
             new Implementation(
                     MainActivityDetector.class,
-                    EnumSet.of(Scope.MANIFEST)));
+                    Scope.MANIFEST_SCOPE));
 
     /**
      * This will be <code>true</code> if the current file we're checking has at least one activity.
@@ -104,7 +104,7 @@ public void afterCheckProject(@NonNull Context context) {
                 && mManifestLocation != null) {
             if (!mHasActivity) {
                 context.report(ISSUE, mManifestLocation,
-                        "Expecting " + ANDROID_MANIFEST_XML + " to have an <" + TAG_APPLICATION +
+                        "Expecting " + ANDROID_MANIFEST_XML + " to have an <" + TAG_ACTIVITY +
                                 "> tag.");
             } else if (!mHasLauncherActivity) {
                 // Report the issue if the manifest file has no activity with a launcher intent.
diff --git a/src/test/java/com/example/google/lint/MainActivityDetectorTest.java b/src/test/java/com/example/google/lint/MainActivityDetectorTest.java
index d05f345e..f98d30a5 100644
--- a/src/test/java/com/example/google/lint/MainActivityDetectorTest.java
+++ b/src/test/java/com/example/google/lint/MainActivityDetectorTest.java
@@ -140,7 +140,7 @@ public void testMissingMainActivity() throws Exception {
     public void testMissingApplication() throws Exception {
         mEnabled = Collections.singleton(MainActivityDetector.ISSUE);
         String expected = "AndroidManifest.xml: Error: Expecting AndroidManifest.xml to have an " +
-                "<application> tag. [MainActivityDetector]\n" +
+                "<activity> tag. [MainActivityDetector]\n" +
                 "1 errors, 0 warnings\n";
         String result = lintProject(xml(FN_ANDROID_MANIFEST_XML, "" +
                 "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n" +