bug fix and renaming of methods.
Authored by: agarwalamit 2014-10-24
Parent: [r30736]
Child: [r30738]