rename stuff to appease purist