Fixes function names