Updated NameSystem for CommandBook

Done, sorry about the bit of confusion