Correct class paths