Changed names, and edited pages after the code review.
Merge branch 'develop' of https://github.com/leerbedrijflisa/kiwi into develop