Change to camel case, not happy about it though