Functions named wrong fixed