Renamed a few classes and resources to better reflect their behavior