Standarize on using compcode and compname
Removed the mentions to the 'old' API and make existing calls still first-class citizens