solution fit for addonpack, implemented naming changes in addonpack too