Lambda support simplified

There was no need to get the name, since the name gets changed internally later on anyways