organisation: Fix references to old model fields