Revert "Class name changes"

This reverts commit 71f534b273c28d80f6f55a8aa2626f56d0ba82e3.