Fixed issues with class names not matching file names.