This class has been renamed