Fix file and class to use correct naming convention