some of the built-in configuration was still using outdated terms. (cherry picked from commit ae8cfa4683)
ae8cfa4683