Fixed some name discrepencies and failure to quote in update function