Additional fixes given class name change.