[TASK] Clean up the domain model.

Be consistent with usage of fully qualified identifiers.