Ok. I read that @ddeboer is working on a PR to merge classes. That will also fix this and following naming problems. Let wait for it.