Final stuff to get the name change working (minus IRC bots)