Name refactoring, value object part