tiny refactor: rename, move