Renamed a few variables and classes