changed the names of a couple of attributes