Refactor the short names