Update to new Camel Case