Fixing filenames and adjusting to new naming for event handler