Renamed the class as part of larger refactoring