Updating references to use entities from care-mcts-common-entites