Apollo 4299 domain model mapping tweaks

`...DateA`? What does this mean?