fix up class filename to match
Merge branch 'develop'