Fix minor issues due to renaming of classes