Fixup all the names

More hate coming your way. ;)