Rename

Class rename to better fit with what it is doing.