Refactored artifact name generation