Fixed the first/last names order