I think we should use a better class name