Renaming badly named functions