Updated docs and samples to eliminate old flavor references.