Fixed references in UI to the old property, and adapted the backend code to work for the new options too.