Remove camel case stuff
Re-add