rename for clarity, update descriptions