Rename result_factory to result_class per code review