- Fixed references to changed rest-model entities