Fix incorrect property mappings between domain entities and data entities.