Changed the names of a few classes to enhance readability