Changed name on functions