Change property names and type name