Update to use camelcase properties