Addons func name refactoring