Minor clarifications and name changes