Remkonoteboom/4.3

Camel case needed