More function name fixes