Refactor class to more useful name