Moved software names into link descriptions

Move the software names into link descriptions to clean up a little.