More underscore typos fixes

I've missed some in the previous pull request... :(