AbstractValueObject name fixes