modify some varibale names and property for compling with project style