Make naming more explicit