make consistent_context take a theory instead

and rename it