Rename name attribute on Value and clean up extraneous string casting