Fixed function naming inconsistencies