Renaming introduced in a8212d9ef458dd7ac64b021e6fa33fcf64b3cce0 This PR is to address comments in PR #970