Fixes the function names