updated references to class names

cf4g09 and sa10g10