Fix filename convention rather than class name