Minor fixes (functions names)