diff --git a/res/values/evolution_strings.xml b/res/values/evolution_strings.xml
index 27dd7c1..dab28fc 100644
--- a/res/values/evolution_strings.xml
+++ b/res/values/evolution_strings.xml
@@ -561,8 +561,6 @@
     <string name="spoofing_app_specific_category">App-Specific</string>
     <string name="spoofing_qsb_title">Google app</string>
     <string name="spoofing_qsb_summary">Spoof the Google app to the latest Pixel device to unlock exclusive features</string>
-    <string name="spoofing_vending_title">Play Store</string>
-    <string name="spoofing_vending_summary">Spoof the Play Store to the latest Pixel device</string>
     <string name="spoofing_photos_title">Google Photos</string>
     <string name="spoofing_photos_summary">Spoof the Google Photos app as a Pixel XL</string>
     <string name="spoofing_snap_title">Snapchat</string>
diff --git a/res/xml/spoofing.xml b/res/xml/spoofing.xml
index a57a047..dec9c9e 100644
--- a/res/xml/spoofing.xml
+++ b/res/xml/spoofing.xml
@@ -14,7 +14,7 @@
 
         <!-- GMS spoof -->
         <org.evolution.settings.preferences.SystemPropertySwitchPreference
-            android:key="persist.sys.pixelprops.gms"
+            android:key="persist.sys.pp.gms"
             android:title="@string/gms_spoof_title"
             android:summary="@string/gms_spoof_summary"
             android:defaultValue="true" />
@@ -26,7 +26,7 @@
 
         <!-- Block attestation even with Keybox Data -->
         <org.evolution.settings.preferences.SystemPropertySwitchPreference
-            android:key="persist.sys.pixelprops.gmscertchain"
+            android:key="persist.sys.pp.gmscertchain"
             android:title="@string/pi_gmscertchain_title"
             android:summary="@string/pi_gmscertchain_summary" />
 
@@ -34,30 +34,30 @@
             android:key="show_pif_properties"
             android:title="@string/show_pif_properties_title"
             android:summary="@string/show_pif_properties_summary"
-            android:dependency="persist.sys.pixelprops.gms" />
+            android:dependency="persist.sys.pp.gms" />
 
         <Preference
             android:key="update_pif_json"
             android:title="@string/update_pif_json_title"
             android:summary="@string/update_pif_json_summary"
-            android:dependency="persist.sys.pixelprops.gms" />
+            android:dependency="persist.sys.pp.gms" />
 
         <Preference
             android:key="pif_json_file_preference"
             android:title="@string/pif_spoofing_title"
             android:summary="@string/pif_spoofing_summary"
-            android:dependency="persist.sys.pixelprops.gms" />
+            android:dependency="persist.sys.pp.gms" />
 
         <!-- Pixel props -->
         <org.evolution.settings.preferences.SystemPropertySwitchPreference
-            android:key="persist.sys.pixelprops"
+            android:key="persist.sys.pp"
             android:title="@string/spoofing_pixel_props_title"
             android:summary="@string/spoofing_pixel_props_summary"
             android:defaultValue="true" />
 
         <!-- Tensor features -->
         <org.evolution.settings.preferences.SystemPropertySwitchPreference
-            android:key="persist.sys.features.tensor"
+            android:key="persist.sys.pp.tensor"
             android:title="@string/tensor_spoof_title"
             android:summary="@string/tensor_spoof_summary"
             android:defaultValue="false" />
@@ -69,35 +69,28 @@
 
         <!-- Google App -->
         <org.evolution.settings.preferences.SystemPropertySwitchPreference
-            android:key="persist.sys.pixelprops.qsb"
+            android:key="persist.sys.pp.qsb"
             android:title="@string/spoofing_qsb_title"
             android:summary="@string/spoofing_qsb_summary"
             android:defaultValue="false" />
 
-        <!-- Play Store -->
-        <!--<org.evolution.settings.preferences.SystemPropertySwitchPreference
-            android:key="persist.sys.pixelprops.vending"
-            android:title="@string/spoofing_vending_title"
-            android:summary="@string/spoofing_vending_summary"
-            android:defaultValue="false" />-->
-
         <!-- Google Photos -->
         <org.evolution.settings.preferences.SystemPropertySwitchPreference
-            android:key="persist.sys.pixelprops.gphotos"
+            android:key="persist.sys.pp.photos"
             android:title="@string/spoofing_photos_title"
             android:summary="@string/spoofing_photos_summary"
             android:defaultValue="true" />
 
         <!-- Games FPS -->
         <org.evolution.settings.preferences.SystemPropertySwitchPreference
-            android:key="persist.sys.pixelprops.games"
+            android:key="persist.sys.pp.games"
             android:title="@string/gameprops_title"
             android:summary="@string/gameprops_summary"
             android:defaultValue="true" />
 
         <!-- Snapchat -->
         <org.evolution.settings.preferences.SystemPropertySwitchPreference
-            android:key="persist.sys.pixelprops.snap"
+            android:key="persist.sys.pp.snapchat"
             android:title="@string/spoofing_snap_title"
             android:summary="@string/spoofing_snap_summary"
             android:defaultValue="false" />
diff --git a/src/org/evolution/settings/fragments/miscellaneous/Spoofing.java b/src/org/evolution/settings/fragments/miscellaneous/Spoofing.java
index 7f4e29f..afded1b 100644
--- a/src/org/evolution/settings/fragments/miscellaneous/Spoofing.java
+++ b/src/org/evolution/settings/fragments/miscellaneous/Spoofing.java
@@ -75,14 +75,14 @@ public class Spoofing extends SettingsPreferenceFragment implements
     private static final String KEY_PIF_JSON_FILE_PREFERENCE = "pif_json_file_preference";
     private static final String KEY_SYSTEM_WIDE_CATEGORY = "spoofing_system_wide_category";
     private static final String KEY_UPDATE_JSON_BUTTON = "update_pif_json";
-    private static final String SYS_GMS_SPOOF = "persist.sys.pixelprops.gms";
-    private static final String SYS_GMS_CERT_SPOOF = "persist.sys.pixelprops.gmscertchain";
-    private static final String SYS_GOOGLE_SPOOF = "persist.sys.pixelprops";
-    private static final String SYS_GAMEPROP_SPOOF = "persist.sys.pixelprops.games";
-    private static final String SYS_GPHOTOS_SPOOF = "persist.sys.pixelprops.gphotos";
-    private static final String SYS_QSB_SPOOF = "persist.sys.pixelprops.qsb";
-    private static final String SYS_SNAP_SPOOF = "persist.sys.pixelprops.snap";
-    private static final String SYS_TENSOR_SPOOF = "persist.sys.features.tensor";
+    private static final String SYS_GMS_SPOOF = "persist.sys.pp.gms";
+    private static final String SYS_GMS_CERT_SPOOF = "persist.sys.pp.gmscertchain";
+    private static final String SYS_GOOGLE_SPOOF = "persist.sys.pp";
+    private static final String SYS_GAMES_SPOOF = "persist.sys.pp.games";
+    private static final String SYS_PHOTOS_SPOOF = "persist.sys.pp.photos";
+    private static final String SYS_QSB_SPOOF = "persist.sys.pp.qsb";
+    private static final String SYS_SNAPCHAT_SPOOF = "persist.sys.pp.snapchat";
+    private static final String SYS_TENSOR_SPOOF = "persist.sys.pp.tensor";
     private static final String KEYBOX_DATA_KEY = "keybox_data_setting";
 
     private ActivityResultLauncher<Intent> mKeyboxFilePickerLauncher;
@@ -93,10 +93,10 @@ public class Spoofing extends SettingsPreferenceFragment implements
     private SystemPropertySwitchPreference mDisableForceIntegrity;
     private SystemPropertySwitchPreference mGmsSpoof;
     private SystemPropertySwitchPreference mGoogleSpoof;
-    private SystemPropertySwitchPreference mGamePropsSpoof;
-    private SystemPropertySwitchPreference mGphotosSpoof;
+    private SystemPropertySwitchPreference mGamesSpoof;
+    private SystemPropertySwitchPreference mPhotosSpoof;
     private SystemPropertySwitchPreference mQsbSpoof;
-    private SystemPropertySwitchPreference mSnapSpoof;
+    private SystemPropertySwitchPreference mSnapchatSpoof;
     private SystemPropertySwitchPreference mTensorSpoof;
 
     private Handler mHandler;
@@ -113,13 +113,13 @@ public class Spoofing extends SettingsPreferenceFragment implements
         final Resources resources = context.getResources();
 
         mSystemWideCategory = (PreferenceCategory) findPreference(KEY_SYSTEM_WIDE_CATEGORY);
-        mGamePropsSpoof = (SystemPropertySwitchPreference) findPreference(SYS_GAMEPROP_SPOOF);
-        mGphotosSpoof = (SystemPropertySwitchPreference) findPreference(SYS_GPHOTOS_SPOOF);
+        mGamesSpoof = (SystemPropertySwitchPreference) findPreference(SYS_GAMES_SPOOF);
+        mPhotosSpoof = (SystemPropertySwitchPreference) findPreference(SYS_PHOTOS_SPOOF);
         mGmsSpoof = (SystemPropertySwitchPreference) findPreference(SYS_GMS_SPOOF);
         mGoogleSpoof = (SystemPropertySwitchPreference) findPreference(SYS_GOOGLE_SPOOF);
         mPifJsonFilePreference = findPreference(KEY_PIF_JSON_FILE_PREFERENCE);
         mQsbSpoof = (SystemPropertySwitchPreference) findPreference(SYS_QSB_SPOOF);
-        mSnapSpoof = (SystemPropertySwitchPreference) findPreference(SYS_SNAP_SPOOF);
+        mSnapchatSpoof = (SystemPropertySwitchPreference) findPreference(SYS_SNAPCHAT_SPOOF);
         mTensorSpoof = (SystemPropertySwitchPreference) findPreference(SYS_TENSOR_SPOOF);
         mUpdateJsonButton = findPreference(KEY_UPDATE_JSON_BUTTON);
 
@@ -140,10 +140,10 @@ public class Spoofing extends SettingsPreferenceFragment implements
 
         mGmsSpoof.setOnPreferenceChangeListener(this);
         mGoogleSpoof.setOnPreferenceChangeListener(this);
-        mGphotosSpoof.setOnPreferenceChangeListener(this);
-        mGamePropsSpoof.setOnPreferenceChangeListener(this);
+        mPhotosSpoof.setOnPreferenceChangeListener(this);
+        mGamesSpoof.setOnPreferenceChangeListener(this);
         mQsbSpoof.setOnPreferenceChangeListener(this);
-        mSnapSpoof.setOnPreferenceChangeListener(this);
+        mSnapchatSpoof.setOnPreferenceChangeListener(this);
         mTensorSpoof.setOnPreferenceChangeListener(this);
 
         mDisableForceIntegrity = findPreference(SYS_GMS_CERT_SPOOF);
@@ -339,14 +339,14 @@ public class Spoofing extends SettingsPreferenceFragment implements
         final Context context = getContext();
         final ContentResolver resolver = context.getContentResolver();
         if (preference == mGmsSpoof
-            || preference == mGphotosSpoof
+            || preference == mPhotosSpoof
             || preference == mQsbSpoof
-            || preference == mSnapSpoof) {
+            || preference == mSnapchatSpoof) {
             killGMSPackages();
             return true;
         }
         if (preference == mGoogleSpoof
-            || preference == mGamePropsSpoof) {
+            || preference == mGamesSpoof) {
             SystemRestartUtils.showSystemRestartDialog(getContext());
             return true;
         }