Go whole hog & change Addon labels