Updated class name, so it can be extended as API with less confusion