Change name of the class Goal to Clause