U.S. and Mexico reach trade deal; Trump wants to drop NAFTA name