Renamed a few classes for easier merging with Develop.