function names fixes