Changed some names and properties