Changed the naming and ordering of a few attributes