Renamed GenericGoal to GoalWithoutAttributes.