diff --git a/lib/core/option.py b/lib/core/option.py
index 1651c9cde..88237d16e 100644
--- a/lib/core/option.py
+++ b/lib/core/option.py
@@ -979,7 +979,7 @@ def __cleanupOptions():
         conf.multipleTargets = True
 
     if conf.optimize:
-        conf.commonPrediction = conf.keepAlive = True
+        conf.predictOutput = conf.keepAlive = True
         conf.nullConnection = not conf.textOnly
 
 def __setConfAttributes():
diff --git a/lib/core/optiondict.py b/lib/core/optiondict.py
index 702b2f610..8291e2f48 100644
--- a/lib/core/optiondict.py
+++ b/lib/core/optiondict.py
@@ -47,7 +47,7 @@ optDict = {
 
             "Optimization":  {
                                "optimize":          "boolean",
-                               "commonPrediction":  "boolean",
+                               "predictOutput":     "boolean",
                                "keepAlive":         "boolean",
                                "nullConnection":    "boolean",
                                "threads":           "integer"
diff --git a/lib/parse/cmdline.py b/lib/parse/cmdline.py
index a2a3966dc..efe16481f 100644
--- a/lib/parse/cmdline.py
+++ b/lib/parse/cmdline.py
@@ -137,8 +137,8 @@ def cmdLineParser():
                                  action="store_true", default=False,
                                  help="Use all optimization options")
 
-        optimization.add_option("--common-prediction", dest="commonPrediction", action="store_true",
-                          default=False, help="Use 'Good samaritan' feature")
+        optimization.add_option("--predict-output", dest="predictOutput", action="store_true",
+                          default=False, help="Predict common queries output")
 
         optimization.add_option("--keep-alive", dest="keepAlive", action="store_true",
                            default=False, help="Use persistent HTTP(s) connections")
diff --git a/lib/techniques/blind/inference.py b/lib/techniques/blind/inference.py
index 55f8eb2ef..cce3d2be3 100644
--- a/lib/techniques/blind/inference.py
+++ b/lib/techniques/blind/inference.py
@@ -45,7 +45,7 @@ def bisection(payload, expression, length=None, charsetType=None, firstChar=None
 
     # Set kb.partRun in case "common prediction" feature (a.k.a. "good
     # samaritan") is used
-    kb.partRun = getPartRun() if conf.commonPrediction else None
+    kb.partRun = getPartRun() if conf.predictOutput else None
 
     if "LENGTH(" in expression or "LEN(" in expression:
         firstChar = 0
@@ -427,7 +427,7 @@ def bisection(payload, expression, length=None, charsetType=None, firstChar=None
             # Common prediction feature (a.k.a. "good samaritan")
             # NOTE: to be used only when multi-threading is not set for
             # the moment
-            if conf.commonPrediction and len(finalValue) > 0 and kb.partRun is not None:
+            if conf.predictOutput and len(finalValue) > 0 and kb.partRun is not None:
                 val = None
                 commonValue, commonPattern, commonCharset, otherCharset = goGoodSamaritan(finalValue, asciiTbl)