-. small fix for domain model: simplified names for FK columns.