fixing function names