Add: Dict for CmdNames

Put all CmdNames in a dict, pass through ServerCmdNames