Fix bonds and changed name