Revert "Fix project name"

This reverts commit 22ec438b4ca93b09e20d586dcb58c8882e1a8c0d.
Revert "Revert "Fix project name""

This reverts commit e9052b1ca94d7e9082d36153e30f299bfe3bb4a4.
Revert "Merge master"

This reverts commit 461176c55012dcfb030cb30471128b3b597ac5ac, reversing
changes made to 22ec438b4ca93b09e20d586dcb58c8882e1a8c0d.
Merge branch 'kpme-dev' into don-test2