More client code cleanup.

Renamed 'modal object' to 'domain entity'.