refs #8951. Remove unnecessary naming code.