CA-161097: Rename some variables
CA-161097: Rename some variables

huizh/xenadmin,jijiang/xenadmin,letsboogey/xenadmin,kc284/xenadmin,cheng--zhang/xenadmin,Frezzle/xenadmin,agimofcarmen/xenadmin,qlw/xenadmin,MihaelaStoica/xenadmin,kc284/xenadmin,geosharath/xenadmin,robhoes/xenadmin,minli1/xenadmin,jijiang/xenadmin,jijiang/xenadmin,huizh/xenadmin,cheng-z/xenadmin,minli1/xenadmin,robhoes/xenadmin,stephen-turner/xenadmin,geosharath/xenadmin,robhoes/xenadmin,stephen-turner/xenadmin,robhoes/xenadmin,robhoes/xenadmin,cheng-z/xenadmin,cheng--zhang/xenadmin,letsboogey/xenadmin,stephen-turner/xenadmin,geosharath/xenadmin,MihaelaStoica/xenadmin,letsboogey/xenadmin,huizh/xenadmin,Frezzle/xenadmin,MihaelaStoica/xenadmin,cheng--zhang/xenadmin,agimofcarmen/xenadmin,cheng-z/xenadmin,qlw/xenadmin,huizh/xenadmin,ushamandya/xenadmin,MihaelaStoica/xenadmin,stephen-turner/xenadmin,ushamandya/xenadmin,cheng--zhang/xenadmin,letsboogey/xenadmin,GaborApatiNagy/xenadmin,Frezzle/xenadmin,minli1/xenadmin,jijiang/xenadmin,kc284/xenadmin,GaborApatiNagy/xenadmin,geosharath/xenadmin,Frezzle/xenadmin,GaborApatiNagy/xenadmin,GaborApatiNagy/xenadmin,ushamandya/xenadmin,letsboogey/xenadmin,MihaelaStoica/xenadmin,Frezzle/xenadmin,qlw/xenadmin,ushamandya/xenadmin,qlw/xenadmin,agimofcarmen/xenadmin,jijiang/xenadmin,stephen-turner/xenadmin,stephen-turner/xenadmin,ushamandya/xenadmin,qlw/xenadmin,robhoes/xenadmin,jijiang/xenadmin,cheng-z/xenadmin,xenserver/xenadmin,minli1/xenadmin,huizh/xenadmin,geosharath/xenadmin,cheng-z/xenadmin,MihaelaStoica/xenadmin,cheng-z/xenadmin,GaborApatiNagy/xenadmin,minli1/xenadmin,ushamandya/xenadmin,xenserver/xenadmin,minli1/xenadmin,kc284/xenadmin,agimofcarmen/xenadmin,GaborApatiNagy/xenadmin,cheng--zhang/xenadmin,xenserver/xenadmin,kc284/xenadmin,cheng--zhang/xenadmin,agimofcarmen/xenadmin,huizh/xenadmin,Frezzle/xenadmin,letsboogey/xenadmin,geosharath/xenadmin