Changed name generation to avoid upload failures.