renamed some fileds, properties, variables and methods.