Index: /main/eko-disco-specs/trunk/data.rst
===================================================================
--- /main/eko-disco-specs/trunk/data.rst	(revision 10751)
+++ /main/eko-disco-specs/trunk/data.rst	(revision 10752)
@@ -71,6 +71,6 @@
 ------------
 
-The data neccessary to contact some :ref:`label-customer`, staff
-person or similar entity. Contact data might contain several
+The data neccessary to contact some :ref:`label-customer`,
+:ref:`label-officer` or similar entity. Contact data might contain several
 addresses, phone numbers, emails, etc.
 
@@ -187,5 +187,5 @@
 
 Customers and their data can be managed by customers themselves (for
-instance when postal addresses change), and by staff members.
+instance when postal addresses change), and by officers.
 
 Connected to: :ref:`label-contract` (1:p),
@@ -260,5 +260,5 @@
 
 a) (push-method): by being fed with respective data by authorized
-   users (staff members)
+   users (officers)
 
 b) (pull-method): by polling dedicated hardware that provides the
@@ -371,5 +371,5 @@
 
 Users can have :ref:`label-user-role`\ s managed by the
-system. Real-world staff members and customers are different to the
+system. Real-world officers (staff members) and customers are different to the
 system as they will have different roles. Also anonymous users are
 accepted by the system to provide marketing pages, service offers,
