make the naming convention sensible
refs #1165