Cleanup: using proper vocabulary