Changed a few names and tidied the guides up a bit.