ENG-5540 refactored method and variable names and changes some variable declarations