refactor long psse names