Fixed function renaming issue