refactor of function, variable, session key name