Dave Ross and Caleb Synan rename stuff

More ways to listen