Make naming more consistent with the rest