Switch to using name instead of full name