Updated diagrams with correct names etc.