Refactoring value name and mistake.