change functions to simple names