diff --git a/src/com/cyanogenmod/setupwizard/cmstats/SetupStats.java b/src/com/cyanogenmod/setupwizard/cmstats/SetupStats.java
index ba73076..ea881f9 100644
--- a/src/com/cyanogenmod/setupwizard/cmstats/SetupStats.java
+++ b/src/com/cyanogenmod/setupwizard/cmstats/SetupStats.java
@@ -28,8 +28,8 @@ public class SetupStats {
 
     private static final String TAG = SetupStats.class.getSimpleName();
 
-    private static final String ANALYTIC_INTENT = "com.cyngn.cmstats.action.SEND_ANALYTIC_EVENT";
-    private static final String ANALYTIC_PERMISSION = "com.cyngn.cmstats.RECEIVE_ANALYTICS";
+    private static final String ANALYTIC_INTENT = "com.cyngn.stats.action.SEND_ANALYTIC_EVENT";
+    private static final String ANALYTIC_PERMISSION = "com.cyngn.stats.SEND_ANALYTICS";
 
     public static final String TRACKING_ID = "tracking_id";
 
diff --git a/src/com/cyanogenmod/setupwizard/cmstats/StatsUtils.java b/src/com/cyanogenmod/setupwizard/cmstats/StatsUtils.java
index 8271e68..b8c58c1 100644
--- a/src/com/cyanogenmod/setupwizard/cmstats/StatsUtils.java
+++ b/src/com/cyanogenmod/setupwizard/cmstats/StatsUtils.java
@@ -18,12 +18,13 @@
 package com.cyanogenmod.setupwizard.cmstats;
 
 import android.content.Context;
+import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.provider.Settings;
 
 public class StatsUtils {
-    private static final String STATS_PACKAGE = "com.cyngn.cmstats";
+    private static final String STATS_PACKAGE = "com.cyngn.stats";
 
     public static boolean isStatsCollectionEnabled(Context context) {
         return Settings.Secure.getInt(context.getContentResolver(),
@@ -33,7 +34,8 @@ public class StatsUtils {
     public static boolean isStatsPackageInstalled(Context context) {
         try {
             PackageInfo pi = context.getPackageManager().getPackageInfo(STATS_PACKAGE, 0);
-            return pi.applicationInfo.enabled;
+            return pi.applicationInfo.enabled
+                    && ((pi.applicationInfo.flags & ApplicationInfo.FLAG_SYSTEM) != 0);
         } catch (PackageManager.NameNotFoundException e) {
             return false;
         }