This should match the renaming of the containing class.