Does springfield armory make smith and Wesson or are they two different companies?

No. They are two different companies. Smith and Wesson is in Springfield Massachusetts, as was the original US Springfield Armory. The modern company known as Springfield Armory is Springfield, Inc., located in Illinois.