Changed the names of some moethods for better readibility