Slight naming tweaks.