Method and variable name re-factoring