Make naming more consistent