more consistent function names
more consistent columns names