Corrected pathnames and class names