diff --git a/src/com/cyanogenmod/setupwizard/util/SetupWizardUtils.java b/src/com/cyanogenmod/setupwizard/util/SetupWizardUtils.java
index a6eb029..6a37ef6 100644
--- a/src/com/cyanogenmod/setupwizard/util/SetupWizardUtils.java
+++ b/src/com/cyanogenmod/setupwizard/util/SetupWizardUtils.java
@@ -73,6 +73,9 @@ public class SetupWizardUtils {

     private static final String TAG = SetupWizardUtils.class.getSimpleName();

+    private static final String GMS_PACKAGE = "com.google.android.gms";
+    private statuc final String GMS_SUW_PACKAGE = "com.google.android.setupwizard";
+
     private SetupWizardUtils(){}

     public static SharedPreferences getPrefs(Context context) {
@@ -166,15 +169,15 @@ public class SetupWizardUtils {
     }

     public static boolean hasGMS(Context context) {
-        if (PackageManagerUtils.isAppInstalled(context, "com.google.android.gms") &&
-            PackageManagerUtils.isAppInstalled(context, "com.google.android.setupwizard")) {
+        if (PackageManagerUtils.isAppInstalled(context, GMS_PACKAGE) &&
+                    PackageManagerUtils.isAppInstalled(context, GMS_SUW_PACKAGE)) {
             PackageManager packageManager = context.getPackageManager();
             if (LOGV) {
                 Log.v(TAG, "com.google.android.setupwizard state =" + packageManager
-                        .getApplicationEnabledSetting("com.google.android.setupwizard"));
+                        .getApplicationEnabledSetting(GMS_SUW_PACKAGE));
             }
             return packageManager
-                    .getApplicationEnabledSetting("com.google.android.setupwizard") !=
+                    .getApplicationEnabledSetting(GMS_SUW_PACKAGE) !=
                     COMPONENT_ENABLED_STATE_DISABLED;
         }
         return false;