fix functions names