Slight naming tweaks