Refs #2356 - Reverts invalid name changes