Variable names refactor.