rename some stuff to better reflect the functionality