Renamed various classes and methods for a more consistent and accurate reflection of their behaviour