👷 cleanups and renamings