Give class more sensible name