FP-153: fixed terminology issues