Changed the naming convention back. Refs #9933.