Values variable name refactoring