Revert "Revert "Rename classes""

This reverts commit 3898a5e29a032be49e88dc31e36c0e699e0676ac.