More general renaming commits