diff --git a/doc/owlps-aggregatord.t2t b/doc/owlps-aggregatord.t2t
index bbda9ef..636dd4a 100644
--- a/doc/owlps-aggregatord.t2t
+++ b/doc/owlps-aggregatord.t2t
@@ -167,7 +167,7 @@ the **-K** option).
   (default: 35 s).
 : **-C** //ac_order_interval//
   Time (in milliseconds) between two transmissions of autocalibration
-  orders to the stored CPs (default: 1000 ms).
+  orders to the stored capture points (default: 1000 ms).
 
 
 
diff --git a/doc/owlps-positionerd.t2t b/doc/owlps-positionerd.t2t
index c0fe57a..49bcb71 100644
--- a/doc/owlps-positionerd.t2t
+++ b/doc/owlps-positionerd.t2t
@@ -140,13 +140,13 @@ below.
   declared in the mobiles' configuration file) to the mobiles' list.
   Default: false.
 : **--positioning.accept-new-cps** < //true// | //false// >
-  When receiving requests, add unknown CPs (CPs which are not declared
-  in the CPs' configuration file) to the CPs' list (default is false,
-  for security purposes).
+  When receiving requests, add unknown capture points (those which are
+  not declared in the configuration file) to the list of capture points
+  (default is false, for security purposes).
 : **--positioning.update-cp-coordinates-online** < //true// | //false// >
-  Allow CP's coordinates to be updated when a calibration request with
-  new coordinates is received from the CP (default is false, for
-  security purposes).
+  Allow capture points' coordinates to be updated when a calibration
+  request with new coordinates is received from the capture point
+  (default is false, for security purposes).
 : **--positioning.area-start** //3d_point//
   Coordinates of the first point of the deployment area; this is used to
   delimit the area in which the MinMax trilateration method tests points
@@ -193,8 +193,8 @@ below.
   Path of reference points to generate, if **generate-reference-points**
   includes “line”; the reference points are generated in straight lines
   between the given points, and one of the points must be the
-  coordinates of a CP (string format: “(X1;Y1;Z1);(X2;Y2;Z2);...” or
-  “X1;Y1;Z1;X2;Y2;Z2;...”).
+  coordinates of a capture point (string format:
+  “(X1;Y1;Z1);(X2;Y2;Z2);...” or “X1;Y1;Z1;X2;Y2;Z2;...”).
 : **--positioning.generated-line-step** //distance//
   When **generate-reference-points** includes “line”, two generated
   points will be separated approximately by this distance (in metres).
@@ -227,7 +227,7 @@ below.
   request is compared directly to each calibration request.
 : **--positioning.nss.ignore-cp-reference-points** < //true// | //false// >
   With the NSS algorithm, try to avoid selecting the reference points
-  which are coordinates of a CP. Default: false.
+  which are coordinates of a capture point. Default: false.
 : **--positioning.filter.max-speed** //max-speed//
   Maximal speed at which the mobile terminal can move, in km/h. This
   option also controls the activation of the filter. Default: 0