change some property names. Fix null pointer bug