We can change the class name (in a _different_ JIRA/PR), if that helps