Renamed some classes and methods in the /lib folder for better readability.