Changed some property names