Update all attribute-based event calls to use correct paraameters