diff --git a/CHANGELOG.md b/CHANGELOG.md
index 97c3bc6bc..0568b59e4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -39,6 +39,7 @@ You can install XPrivacy 2.99.x by following these steps:
 * Make a full backup, preferable a [NANDroid](http://forum.xda-developers.com/wiki/NANDroid)
 * Update to the latest 2.2.x version
 * Enter the quirk *test* into the main settings
+* Changed quirk *noresolve* into *resolve*, since things should work out-of-the-box (no automatic update)
 * Use the menu *Check for updates*
 
 Version 2.99.x and version 3.x will be available with a [pro license](http://www.xprivacy.eu/) only for the time being.
diff --git a/res/layout/settings.xml b/res/layout/settings.xml
index 21cab1540..177397b2f 100644
--- a/res/layout/settings.xml
+++ b/res/layout/settings.xml
@@ -155,7 +155,7 @@
                     android:id="@+id/etQuirks"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:hint="freeze,noresolve"
+                    android:hint="freeze,resolve"
                     android:inputType="text"
                     tools:ignore="HardcodedText" />
             </LinearLayout>
diff --git a/src/biz/bokhorst/xprivacy/PrivacyManager.java b/src/biz/bokhorst/xprivacy/PrivacyManager.java
index fd0506bde..aab85fde3 100644
--- a/src/biz/bokhorst/xprivacy/PrivacyManager.java
+++ b/src/biz/bokhorst/xprivacy/PrivacyManager.java
@@ -124,7 +124,7 @@ public class PrivacyManager {
 	public final static String cSettingCid = "Cid";
 	public final static String cSettingLac = "Lac";
 	public final static String cSettingBlacklist = "Blacklist";
-	public final static String cSettingNoResolve = "NoResolve";
+	public final static String cSettingResolve = "Resolve";
 	public final static String cSettingFreeze = "Freeze";
 	public final static String cSettingPermMan = "PermMan";
 	public final static String cSettingIntentWall = "IntentWall";
diff --git a/src/biz/bokhorst/xprivacy/SettingsDialog.java b/src/biz/bokhorst/xprivacy/SettingsDialog.java
index 47a4dfcd6..c1e1677fb 100644
--- a/src/biz/bokhorst/xprivacy/SettingsDialog.java
+++ b/src/biz/bokhorst/xprivacy/SettingsDialog.java
@@ -240,7 +240,7 @@ public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
 
 		// Get quirks
 		boolean freeze = PrivacyManager.getSettingBool(-uid, PrivacyManager.cSettingFreeze, false);
-		boolean noresolve = PrivacyManager.getSettingBool(-uid, PrivacyManager.cSettingNoResolve, false);
+		boolean resolve = PrivacyManager.getSettingBool(-uid, PrivacyManager.cSettingResolve, false);
 		boolean permman = PrivacyManager.getSettingBool(-uid, PrivacyManager.cSettingPermMan, false);
 		boolean iwall = PrivacyManager.getSettingBool(-uid, PrivacyManager.cSettingIntentWall, false);
 		boolean safemode = PrivacyManager.getSettingBool(-uid, PrivacyManager.cSettingSafeMode, false);
@@ -249,8 +249,8 @@ public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
 		List<String> listQuirks = new ArrayList<String>();
 		if (freeze)
 			listQuirks.add("freeze");
-		if (noresolve)
-			listQuirks.add("noresolve");
+		if (resolve)
+			listQuirks.add("resolve");
 		if (permman)
 			listQuirks.add("permman");
 		if (iwall)
@@ -518,8 +518,8 @@ public void onClick(View view) {
 				List<String> listQuirks = Arrays.asList(etQuirks.getText().toString().split(","));
 				PrivacyManager.setSetting(uid, PrivacyManager.cSettingFreeze,
 						Boolean.toString(listQuirks.contains("freeze")));
-				PrivacyManager.setSetting(uid, PrivacyManager.cSettingNoResolve,
-						Boolean.toString(listQuirks.contains("noresolve")));
+				PrivacyManager.setSetting(uid, PrivacyManager.cSettingResolve,
+						Boolean.toString(listQuirks.contains("resolve")));
 				PrivacyManager.setSetting(uid, PrivacyManager.cSettingPermMan,
 						Boolean.toString(listQuirks.contains("permman")));
 				PrivacyManager.setSetting(uid, PrivacyManager.cSettingIntentWall,
diff --git a/src/biz/bokhorst/xprivacy/XIoBridge.java b/src/biz/bokhorst/xprivacy/XIoBridge.java
index 079857037..e070ee10a 100644
--- a/src/biz/bokhorst/xprivacy/XIoBridge.java
+++ b/src/biz/bokhorst/xprivacy/XIoBridge.java
@@ -71,8 +71,8 @@ protected void before(XParam param) throws Throwable {
 				int port = (Integer) param.args[2];
 
 				String hostName;
-				boolean resolve = !PrivacyManager.getSettingBool(Binder.getCallingUid(),
-						PrivacyManager.cSettingNoResolve, false);
+				boolean resolve = PrivacyManager.getSettingBool(Binder.getCallingUid(), PrivacyManager.cSettingResolve,
+						false);
 				if (resolve)
 					try {
 						hostName = address.getHostName();