Refactoring codes: improve key name