Changing class name
Updating vendors