Update google_checks.xml and minor refactoring. #320
additional fix after name change