More function name loc fixes