Rename callback and resolver name attribute to class