rename, refactor and sweep all the things!