Fix the short runtype names for circuit

And runtype names at server browser..

Also applies to demo names

And also change the urls so they too show triple/hot.. :)

Fixed some of these, will go over and do the rest some other time..

Demo names, short names for rankings should be fixed. Some other places still remain, and urls etc, but I cba right now.