Revert "Updated class names."

This reverts commit fe38e207efbd5d5cec4ded2d3cbb6f697f197ca9.