refactor: rename remaining done functions to something more meaningful