fix various errors in class/interface names