more consistent camelcasing