Updated outdated class names.

Updated outdated class names.