Back to original naming, this supports multiple addons