Bug 795579 - addressing comments 1.1
- one more rename