Name checks and related edits, for review