Function names fixing