Resolve #3382165 "Rename settings"

Samit Khulverequested to merge
issue/redirect-3382165:3382165-rename-settings into 8.x-1.x

Closes #3382165

Merge request reports