Which of these terms is the name of a traditional Japanese sword?

A katana is a Japanese sword characterized by a curved, single-edged blade with a circular or squared guard and a long grip to accommodate two hands. Developed later than the tachi, it was used by samurai in feudal Japan and worn with the edge facing upward. Since the Muromachi period, many old tachi were cut from the root and shortened, and the blade at the root was crushed and converted into a katana.

Source: Wikipedia