Tweak diagnostic argument names
File rename