Issue #2376635 by dsnopek: Fixed Minor class name inconsistencies.