Naming of class has changed, since the previous was not appropriate for the class