Shorten name to fit on iOS label.
Drop commented out old state.