Fix issues with artifact names