Fixed file and class names