CLEANUP: more consistent, and obvious/explicit names