Updating names and output functions