squash more renaming