Further refacotoring of Session Variable Names