Make naming consistent.