reorganized output names