Refactor long names