diff --git a/owlps-positioner/cfg/owlps-positioner.conf b/owlps-positioner/cfg/owlps-positioner.conf
index cab383c..d2c21a9 100644
--- a/owlps-positioner/cfg/owlps-positioner.conf
+++ b/owlps-positioner/cfg/owlps-positioner.conf
@@ -123,11 +123,14 @@ csv-file = /tmp/owlps-positioner.log
 # received.
 #generate-reference-points = false
 
-# With this option enabled, each generated reference point will contain
-# a single packet in a single calibration request. This is the default.
-# If disabled, the generated reference points will contain a series of
-# packets, better matching the real requests.
-#generate-single-packet-reference-points = true
+# With this option disabled, each generated reference point contains
+# a single packet in a single calibration request, computed from the
+# mean of the real measurements.
+# If enabled, the generated reference points will contain a series of
+# packets, better matching the real requests; if no packet ID from the
+# real requests match, a single packet reference point is generated
+# instead. Default is enabled.
+#generate-multi-packet-reference-points = true
 
 # When the above option is activated, the reference points are generated
 # with the specified distance (in meters) between one another, in the X
diff --git a/owlps-positioner/src/autocalibration.cc b/owlps-positioner/src/autocalibration.cc
index c29486a..851683c 100644
--- a/owlps-positioner/src/autocalibration.cc
+++ b/owlps-positioner/src/autocalibration.cc
@@ -234,10 +234,10 @@ void Autocalibration::weight_2_aps()
 void Autocalibration::compute_ss()
 {
   if (Configuration::
-      bool_value("positioning.generate-single-packet-reference-points"))
-    compute_single_packet_ss(0) ;
-  else
+      bool_value("positioning.generate-multi-packet-reference-points"))
     compute_multi_packet_ss() ;
+  else
+    compute_single_packet_ss(0) ;
 }
 
 
diff --git a/owlps-positioner/src/userinterface.cc b/owlps-positioner/src/userinterface.cc
index 0454433..daed267 100644
--- a/owlps-positioner/src/userinterface.cc
+++ b/owlps-positioner/src/userinterface.cc
@@ -247,10 +247,11 @@ void UserInterface::fill_positioning_options()
    po::value<bool>()->default_value(false),
    "Generate reference points from the (auto)calibration requests"
    " received.")
-  ("positioning.generate-single-packet-reference-points",
+  ("positioning.generate-multi-packet-reference-points",
    po::value<bool>()->default_value(true),
-   "Generate only one packet per reference point, instead of trying to"
-   " match the packets in the real requests.")
+   "Generate several packets per reference point by trying to match the"
+   " packets in the real requests. If false, the SS values of the"
+   " requests are averaged and only one packet is generated.")
   ("positioning.generated-meshing-grain-x",
    po::value<float>()->default_value(DEFAULT_MESHING_GRAIN),
    "When generating reference points, this distance (in meters) will"