Minor fixes and naming tweaks.