Updating names a little bit