Custom search issue after 4.7.22 upgrade - Civi looks for wrong file name

A custom search related to events had been working fine for several years. After upgrading from 4.7.1x (I think last time it was known to work was 4.7.19) to 4.7.22, trying to do the search results in an error saying the .php file for the search does not exist, with nothing having been changed in configuration and the file still existing. Another custom search with a php file in the same directory still works correctly.

The error given is this:

Custom search file: CRM/Contact/Form/Search/Custom/Event.php does not exist.

However, that's not the correct file path, the file is named CustomEventReport.php, it has never been named Event.php

If I go into an old 4.7.1x (using 4.7.13) version of the site and change the file name of that file to something else so it gives an error, I get this error message with it looking for the file in the correct location:

Custom search file: CRM\Contact\Form\Search\Custom\CustomEventReport.php does not exist.

The configuration of both sites is identical in the custom search settings, and in the database row for the custom search in civicrm_options:

I see that the 'name' field is not the same as what is in the Custom Search Path in the admin/the name of the PHP file, whereas the other custom search that still works it is.

I was able to fix the issue by changing the 'name' field in the database manually to match the filename. No other methods worked, changing the file name to what Civi seemed to be looking for which I tried first resulted in a 500 error.