Update and rename Class to Event