Switch artifact names to ugly but conventional format - fix