Cleanup use of software names - use the friendly names instead