Refactor: get rid of redundant names (I)