Fixed a few class name references, replaces #1600

Fixes #1587
Fixes #1588
Fixes #1589