Fixes #8933 simple renaming
Merge pull request #8959 from vikram/8933

Fixes #8933 simple renaming