Psychosis had a dispute with AAA in Mexico which held the rights to his ring name, so he switched it to "Nicho El Millonario" and continued to work in Mexico, mostly in Tijuana with occasional dates in the United States and Consejo Mundial de Lucha Libre. Psicosis returned to Total Nonstop Action Wrestling in 2004, and wrestled at Victory Road 2004 as part of the 20 man international invitational. He was eliminated, and the tournament was won by fellow luchadore and former lWo member Héctor Garza. In 2005, he returned to AAA to feud with the wrestler who had assumed the name "Psicosis" in September 1997 when he originally left the promotion. The two had a "name vs. name" ladder match at Triplemania XIII, but Histeria ran in and took the name for himself. Consequently, the feud evolved into a three-way rivalry.