Revision: add some clarifications and naming alternatives