Fix name and value name