Refactor key names