Was it called the Vietnam Conflict or the Vietnam War