don't do validation if name still matches old name
Merge remote-tracking branch 'origin/proper-rewrite' into proper-rewrite