Change stakeholders terms as suggested in #11