change some class names to match Civi v4.4