Name everything associated w/ Router consistently

I renamed this class several times while developing it, and that showed
a bit. :)