More minor naming tweaks.