hlim10 lchen59 : name refactoring