Renamed classes to that of documentchecking branch