Renamed the second instance of full name and short name