WIP: squash renaming