Add names to some of the anonymous functions