Some name cleanup and visibility reductions.