Remove "Value"-suffix, is not used anywhere else in the codebase