Name changes and added all items except graphs