Fix the title change and rename events to use the new model