Revert "Updated naming for classes"

This reverts commit b3883959fae51deb41f351a8787c727a7e750ec9.