Surely the American continent(s), and not the USA directly, were named for this Amerigo character; the US then taking its name from the continent.

Yes. I am anal-retentive, I know.