In that case you'd need to either force the next push because squashing rewrites history or use a separate branch to do the renames in the first place.