Cleanup: Update documentation to use Singular class names

[ci skip]