Fixed functions names