Some naming clarity/consistency.