Uses more sensible object names