Rename stuff to better reflect usage