Changed some property names :)