Refs #10282. Renamed classes to fit diagram