Make naming consistent