Update configuration descriptions, labels, etc. with Christine's changes.