Make separate commits of big refactors. If a rename of something causes 1000 changes, pull it out as a separate thing.