fix some naming issue.