Fix internal function names