Rename RawValue to Raw