Renamed a lot of stupidly named functions

Fixed names of a lot of stupidly named functions