Refactored output name