Remove remaining underscore prefixes

Apparently I didn't save my final changes before the last commit.