Use add-on names everywhere instead of repo names