Renamed incorrectly named functions.