Updating names for everything