Server side bug fix and sneaky name stuffs :P