Update to use cammelcase names