Fixed defunctionalization code comments.
Use frmsToNames everywhere.