Refactor: get rid of redundant names (II)