small renaming
lambda shouldn't have a name location
simplify