modify some code style

rename some properties.