diff --git a/tests/builtins/oracle_equalities/alloc_weak.res.oracle b/tests/builtins/oracle_equality/alloc_weak.res.oracle
similarity index 100%
rename from tests/builtins/oracle_equalities/alloc_weak.res.oracle
rename to tests/builtins/oracle_equality/alloc_weak.res.oracle
diff --git a/tests/builtins/oracle_equalities/allocated.1.res.oracle b/tests/builtins/oracle_equality/allocated.1.res.oracle
similarity index 100%
rename from tests/builtins/oracle_equalities/allocated.1.res.oracle
rename to tests/builtins/oracle_equality/allocated.1.res.oracle
diff --git a/tests/builtins/oracle_equalities/imprecise.res.oracle b/tests/builtins/oracle_equality/imprecise.res.oracle
similarity index 100%
rename from tests/builtins/oracle_equalities/imprecise.res.oracle
rename to tests/builtins/oracle_equality/imprecise.res.oracle
diff --git a/tests/builtins/oracle_equalities/linked_list.1.res.oracle b/tests/builtins/oracle_equality/linked_list.1.res.oracle
similarity index 100%
rename from tests/builtins/oracle_equalities/linked_list.1.res.oracle
rename to tests/builtins/oracle_equality/linked_list.1.res.oracle
diff --git a/tests/builtins/oracle_equalities/malloc-optimistic.res.oracle b/tests/builtins/oracle_equality/malloc-optimistic.res.oracle
similarity index 100%
rename from tests/builtins/oracle_equalities/malloc-optimistic.res.oracle
rename to tests/builtins/oracle_equality/malloc-optimistic.res.oracle
diff --git a/tests/builtins/oracle_equalities/write-const.res.oracle b/tests/builtins/oracle_equality/write-const.res.oracle
similarity index 100%
rename from tests/builtins/oracle_equalities/write-const.res.oracle
rename to tests/builtins/oracle_equality/write-const.res.oracle
diff --git a/tests/builtins/oracle_octagons/allocated.0.res.oracle b/tests/builtins/oracle_octagon/allocated.0.res.oracle
similarity index 100%
rename from tests/builtins/oracle_octagons/allocated.0.res.oracle
rename to tests/builtins/oracle_octagon/allocated.0.res.oracle
diff --git a/tests/builtins/oracle_octagons/allocated.1.res.oracle b/tests/builtins/oracle_octagon/allocated.1.res.oracle
similarity index 100%
rename from tests/builtins/oracle_octagons/allocated.1.res.oracle
rename to tests/builtins/oracle_octagon/allocated.1.res.oracle
diff --git a/tests/builtins/oracle_octagons/imprecise.res.oracle b/tests/builtins/oracle_octagon/imprecise.res.oracle
similarity index 100%
rename from tests/builtins/oracle_octagons/imprecise.res.oracle
rename to tests/builtins/oracle_octagon/imprecise.res.oracle
diff --git a/tests/builtins/oracle_octagons/linked_list.1.res.oracle b/tests/builtins/oracle_octagon/linked_list.1.res.oracle
similarity index 100%
rename from tests/builtins/oracle_octagons/linked_list.1.res.oracle
rename to tests/builtins/oracle_octagon/linked_list.1.res.oracle
diff --git a/tests/builtins/oracle_octagons/malloc-optimistic.res.oracle b/tests/builtins/oracle_octagon/malloc-optimistic.res.oracle
similarity index 100%
rename from tests/builtins/oracle_octagons/malloc-optimistic.res.oracle
rename to tests/builtins/oracle_octagon/malloc-optimistic.res.oracle
diff --git a/tests/builtins/test_config_equalities b/tests/builtins/test_config_equality
similarity index 100%
rename from tests/builtins/test_config_equalities
rename to tests/builtins/test_config_equality
diff --git a/tests/builtins/test_config_octagons b/tests/builtins/test_config_octagon
similarity index 100%
rename from tests/builtins/test_config_octagons
rename to tests/builtins/test_config_octagon
diff --git a/tests/float/oracle_equalities/alarms.0.res.oracle b/tests/float/oracle_equality/alarms.0.res.oracle
similarity index 100%
rename from tests/float/oracle_equalities/alarms.0.res.oracle
rename to tests/float/oracle_equality/alarms.0.res.oracle
diff --git a/tests/float/oracle_equalities/alarms.1.res.oracle b/tests/float/oracle_equality/alarms.1.res.oracle
similarity index 100%
rename from tests/float/oracle_equalities/alarms.1.res.oracle
rename to tests/float/oracle_equality/alarms.1.res.oracle
diff --git a/tests/float/oracle_equalities/cond.res.oracle b/tests/float/oracle_equality/cond.res.oracle
similarity index 100%
rename from tests/float/oracle_equalities/cond.res.oracle
rename to tests/float/oracle_equality/cond.res.oracle
diff --git a/tests/float/oracle_equalities/const3.1.res.oracle b/tests/float/oracle_equality/const3.1.res.oracle
similarity index 100%
rename from tests/float/oracle_equalities/const3.1.res.oracle
rename to tests/float/oracle_equality/const3.1.res.oracle
diff --git a/tests/float/oracle_equalities/dr.2.res.oracle b/tests/float/oracle_equality/dr.2.res.oracle
similarity index 100%
rename from tests/float/oracle_equalities/dr.2.res.oracle
rename to tests/float/oracle_equality/dr.2.res.oracle
diff --git a/tests/float/oracle_equalities/nonlin.1.res.oracle b/tests/float/oracle_equality/nonlin.1.res.oracle
similarity index 100%
rename from tests/float/oracle_equalities/nonlin.1.res.oracle
rename to tests/float/oracle_equality/nonlin.1.res.oracle
diff --git a/tests/float/oracle_equalities/nonlin.2.res.oracle b/tests/float/oracle_equality/nonlin.2.res.oracle
similarity index 100%
rename from tests/float/oracle_equalities/nonlin.2.res.oracle
rename to tests/float/oracle_equality/nonlin.2.res.oracle
diff --git a/tests/float/oracle_equalities/nonlin.4.res.oracle b/tests/float/oracle_equality/nonlin.4.res.oracle
similarity index 100%
rename from tests/float/oracle_equalities/nonlin.4.res.oracle
rename to tests/float/oracle_equality/nonlin.4.res.oracle
diff --git a/tests/float/oracle_equalities/nonlin.5.res.oracle b/tests/float/oracle_equality/nonlin.5.res.oracle
similarity index 100%
rename from tests/float/oracle_equalities/nonlin.5.res.oracle
rename to tests/float/oracle_equality/nonlin.5.res.oracle
diff --git a/tests/float/oracle_equalities/parse.res.oracle b/tests/float/oracle_equality/parse.res.oracle
similarity index 100%
rename from tests/float/oracle_equalities/parse.res.oracle
rename to tests/float/oracle_equality/parse.res.oracle
diff --git a/tests/float/oracle_octagons/nonlin.1.res.oracle b/tests/float/oracle_octagon/nonlin.1.res.oracle
similarity index 100%
rename from tests/float/oracle_octagons/nonlin.1.res.oracle
rename to tests/float/oracle_octagon/nonlin.1.res.oracle
diff --git a/tests/float/oracle_octagons/nonlin.2.res.oracle b/tests/float/oracle_octagon/nonlin.2.res.oracle
similarity index 100%
rename from tests/float/oracle_octagons/nonlin.2.res.oracle
rename to tests/float/oracle_octagon/nonlin.2.res.oracle
diff --git a/tests/float/oracle_octagons/nonlin.4.res.oracle b/tests/float/oracle_octagon/nonlin.4.res.oracle
similarity index 100%
rename from tests/float/oracle_octagons/nonlin.4.res.oracle
rename to tests/float/oracle_octagon/nonlin.4.res.oracle
diff --git a/tests/float/oracle_octagons/nonlin.5.res.oracle b/tests/float/oracle_octagon/nonlin.5.res.oracle
similarity index 100%
rename from tests/float/oracle_octagons/nonlin.5.res.oracle
rename to tests/float/oracle_octagon/nonlin.5.res.oracle
diff --git a/tests/idct/oracle_equalities/ieee_1180_1990.res.oracle b/tests/idct/oracle_equality/ieee_1180_1990.res.oracle
similarity index 100%
rename from tests/idct/oracle_equalities/ieee_1180_1990.res.oracle
rename to tests/idct/oracle_equality/ieee_1180_1990.res.oracle
diff --git a/tests/idct/oracle_octagons/ieee_1180_1990.res.oracle b/tests/idct/oracle_octagon/ieee_1180_1990.res.oracle
similarity index 100%
rename from tests/idct/oracle_octagons/ieee_1180_1990.res.oracle
rename to tests/idct/oracle_octagon/ieee_1180_1990.res.oracle
diff --git a/tests/test_config_equalities b/tests/test_config_equality
similarity index 100%
rename from tests/test_config_equalities
rename to tests/test_config_equality
diff --git a/tests/test_config_octagons b/tests/test_config_octagon
similarity index 100%
rename from tests/test_config_octagons
rename to tests/test_config_octagon
diff --git a/tests/value/oracle_equalities/CruiseControl.res.oracle b/tests/value/oracle_equality/CruiseControl.res.oracle
similarity index 100%
rename from tests/value/oracle_equalities/CruiseControl.res.oracle
rename to tests/value/oracle_equality/CruiseControl.res.oracle
diff --git a/tests/value/oracle_equalities/addition.res.oracle b/tests/value/oracle_equality/addition.res.oracle
similarity index 100%
rename from tests/value/oracle_equalities/addition.res.oracle
rename to tests/value/oracle_equality/addition.res.oracle
diff --git a/tests/value/oracle_equalities/alias.0.res.oracle b/tests/value/oracle_equality/alias.0.res.oracle
similarity index 100%
rename from tests/value/oracle_equalities/alias.0.res.oracle
rename to tests/value/oracle_equality/alias.0.res.oracle
diff --git a/tests/value/oracle_equalities/alias.1.res.oracle b/tests/value/oracle_equality/alias.1.res.oracle
similarity index 100%
rename from tests/value/oracle_equalities/alias.1.res.oracle
rename to tests/value/oracle_equality/alias.1.res.oracle
diff --git a/tests/value/oracle_equalities/alias.2.res.oracle b/tests/value/oracle_equality/alias.2.res.oracle
similarity index 100%
rename from tests/value/oracle_equalities/alias.2.res.oracle
rename to tests/value/oracle_equality/alias.2.res.oracle
diff --git a/tests/value/oracle_equalities/alias.3.res.oracle b/tests/value/oracle_equality/alias.3.res.oracle
similarity index 100%
rename from tests/value/oracle_equalities/alias.3.res.oracle
rename to tests/value/oracle_equality/alias.3.res.oracle
diff --git a/tests/value/oracle_equalities/alias.4.res.oracle b/tests/value/oracle_equality/alias.4.res.oracle
similarity index 100%
rename from tests/value/oracle_equalities/alias.4.res.oracle
rename to tests/value/oracle_equality/alias.4.res.oracle
diff --git a/tests/value/oracle_equalities/alias.5.res.oracle b/tests/value/oracle_equality/alias.5.res.oracle
similarity index 100%
rename from tests/value/oracle_equalities/alias.5.res.oracle
rename to tests/value/oracle_equality/alias.5.res.oracle
diff --git a/tests/value/oracle_equalities/alias.6.res.oracle b/tests/value/oracle_equality/alias.6.res.oracle
similarity index 100%
rename from tests/value/oracle_equalities/alias.6.res.oracle
rename to tests/value/oracle_equality/alias.6.res.oracle
diff --git a/tests/value/oracle_equalities/auto_loop_unroll.0.res.oracle b/tests/value/oracle_equality/auto_loop_unroll.0.res.oracle
similarity index 100%
rename from tests/value/oracle_equalities/auto_loop_unroll.0.res.oracle
rename to tests/value/oracle_equality/auto_loop_unroll.0.res.oracle
diff --git a/tests/value/oracle_equalities/backward_add_ptr.res.oracle b/tests/value/oracle_equality/backward_add_ptr.res.oracle
similarity index 100%
rename from tests/value/oracle_equalities/backward_add_ptr.res.oracle
rename to tests/value/oracle_equality/backward_add_ptr.res.oracle
diff --git a/tests/value/oracle_equalities/bitfield.res.oracle b/tests/value/oracle_equality/bitfield.res.oracle
similarity index 100%
rename from tests/value/oracle_equalities/bitfield.res.oracle
rename to tests/value/oracle_equality/bitfield.res.oracle
diff --git a/tests/value/oracle_equalities/bitwise_pointer.res.oracle b/tests/value/oracle_equality/bitwise_pointer.res.oracle
similarity index 100%
rename from tests/value/oracle_equalities/bitwise_pointer.res.oracle
rename to tests/value/oracle_equality/bitwise_pointer.res.oracle
diff --git a/tests/value/oracle_equalities/call_simple.res.oracle b/tests/value/oracle_equality/call_simple.res.oracle
similarity index 100%
rename from tests/value/oracle_equalities/call_simple.res.oracle
rename to tests/value/oracle_equality/call_simple.res.oracle
diff --git a/tests/value/oracle_equalities/case_analysis.res.oracle b/tests/value/oracle_equality/case_analysis.res.oracle
similarity index 100%
rename from tests/value/oracle_equalities/case_analysis.res.oracle
rename to tests/value/oracle_equality/case_analysis.res.oracle
diff --git a/tests/value/oracle_equalities/descending.res.oracle b/tests/value/oracle_equality/descending.res.oracle
similarity index 100%
rename from tests/value/oracle_equalities/descending.res.oracle
rename to tests/value/oracle_equality/descending.res.oracle
diff --git a/tests/value/oracle_equalities/domains_function.res.oracle b/tests/value/oracle_equality/domains_function.res.oracle
similarity index 100%
rename from tests/value/oracle_equalities/domains_function.res.oracle
rename to tests/value/oracle_equality/domains_function.res.oracle
diff --git a/tests/value/oracle_equalities/downcast.2.res.oracle b/tests/value/oracle_equality/downcast.2.res.oracle
similarity index 100%
rename from tests/value/oracle_equalities/downcast.2.res.oracle
rename to tests/value/oracle_equality/downcast.2.res.oracle
diff --git a/tests/value/oracle_equalities/fptr.1.res.oracle b/tests/value/oracle_equality/fptr.1.res.oracle
similarity index 100%
rename from tests/value/oracle_equalities/fptr.1.res.oracle
rename to tests/value/oracle_equality/fptr.1.res.oracle
diff --git a/tests/value/oracle_equalities/from_call.0.res.oracle b/tests/value/oracle_equality/from_call.0.res.oracle
similarity index 100%
rename from tests/value/oracle_equalities/from_call.0.res.oracle
rename to tests/value/oracle_equality/from_call.0.res.oracle
diff --git a/tests/value/oracle_equalities/from_call.1.res.oracle b/tests/value/oracle_equality/from_call.1.res.oracle
similarity index 100%
rename from tests/value/oracle_equalities/from_call.1.res.oracle
rename to tests/value/oracle_equality/from_call.1.res.oracle
diff --git a/tests/value/oracle_equalities/from_termin.res.oracle b/tests/value/oracle_equality/from_termin.res.oracle
similarity index 100%
rename from tests/value/oracle_equalities/from_termin.res.oracle
rename to tests/value/oracle_equality/from_termin.res.oracle
diff --git a/tests/value/oracle_equalities/imprecise_invalid_write.res.oracle b/tests/value/oracle_equality/imprecise_invalid_write.res.oracle
similarity index 100%
rename from tests/value/oracle_equalities/imprecise_invalid_write.res.oracle
rename to tests/value/oracle_equality/imprecise_invalid_write.res.oracle
diff --git a/tests/value/oracle_equalities/incompatible_states.res.oracle b/tests/value/oracle_equality/incompatible_states.res.oracle
similarity index 100%
rename from tests/value/oracle_equalities/incompatible_states.res.oracle
rename to tests/value/oracle_equality/incompatible_states.res.oracle
diff --git a/tests/value/oracle_equalities/library.res.oracle b/tests/value/oracle_equality/library.res.oracle
similarity index 100%
rename from tests/value/oracle_equalities/library.res.oracle
rename to tests/value/oracle_equality/library.res.oracle
diff --git a/tests/value/oracle_equalities/long_const.0.res.oracle b/tests/value/oracle_equality/long_const.0.res.oracle
similarity index 100%
rename from tests/value/oracle_equalities/long_const.0.res.oracle
rename to tests/value/oracle_equality/long_const.0.res.oracle
diff --git a/tests/value/oracle_equalities/long_const.1.res.oracle b/tests/value/oracle_equality/long_const.1.res.oracle
similarity index 100%
rename from tests/value/oracle_equalities/long_const.1.res.oracle
rename to tests/value/oracle_equality/long_const.1.res.oracle
diff --git a/tests/value/oracle_equalities/modulo.res.oracle b/tests/value/oracle_equality/modulo.res.oracle
similarity index 100%
rename from tests/value/oracle_equalities/modulo.res.oracle
rename to tests/value/oracle_equality/modulo.res.oracle
diff --git a/tests/value/oracle_equalities/non_natural.res.oracle b/tests/value/oracle_equality/non_natural.res.oracle
similarity index 100%
rename from tests/value/oracle_equalities/non_natural.res.oracle
rename to tests/value/oracle_equality/non_natural.res.oracle
diff --git a/tests/value/oracle_equalities/nonlin.res.oracle b/tests/value/oracle_equality/nonlin.res.oracle
similarity index 100%
rename from tests/value/oracle_equalities/nonlin.res.oracle
rename to tests/value/oracle_equality/nonlin.res.oracle
diff --git a/tests/value/oracle_equalities/octagons.res.oracle b/tests/value/oracle_equality/octagons.res.oracle
similarity index 100%
rename from tests/value/oracle_equalities/octagons.res.oracle
rename to tests/value/oracle_equality/octagons.res.oracle
diff --git a/tests/value/oracle_equalities/offsetmap.0.res.oracle b/tests/value/oracle_equality/offsetmap.0.res.oracle
similarity index 100%
rename from tests/value/oracle_equalities/offsetmap.0.res.oracle
rename to tests/value/oracle_equality/offsetmap.0.res.oracle
diff --git a/tests/value/oracle_equalities/offsetmap.1.res.oracle b/tests/value/oracle_equality/offsetmap.1.res.oracle
similarity index 100%
rename from tests/value/oracle_equalities/offsetmap.1.res.oracle
rename to tests/value/oracle_equality/offsetmap.1.res.oracle
diff --git a/tests/value/oracle_equalities/origin.0.res.oracle b/tests/value/oracle_equality/origin.0.res.oracle
similarity index 100%
rename from tests/value/oracle_equalities/origin.0.res.oracle
rename to tests/value/oracle_equality/origin.0.res.oracle
diff --git a/tests/value/oracle_equalities/period.res.oracle b/tests/value/oracle_equality/period.res.oracle
similarity index 100%
rename from tests/value/oracle_equalities/period.res.oracle
rename to tests/value/oracle_equality/period.res.oracle
diff --git a/tests/value/oracle_equalities/plevel.res.oracle b/tests/value/oracle_equality/plevel.res.oracle
similarity index 100%
rename from tests/value/oracle_equalities/plevel.res.oracle
rename to tests/value/oracle_equality/plevel.res.oracle
diff --git a/tests/value/oracle_equalities/pointer_comp.res.oracle b/tests/value/oracle_equality/pointer_comp.res.oracle
similarity index 100%
rename from tests/value/oracle_equalities/pointer_comp.res.oracle
rename to tests/value/oracle_equality/pointer_comp.res.oracle
diff --git a/tests/value/oracle_equalities/ptr_relation.0.res.oracle b/tests/value/oracle_equality/ptr_relation.0.res.oracle
similarity index 100%
rename from tests/value/oracle_equalities/ptr_relation.0.res.oracle
rename to tests/value/oracle_equality/ptr_relation.0.res.oracle
diff --git a/tests/value/oracle_equalities/redundant_alarms.res.oracle b/tests/value/oracle_equality/redundant_alarms.res.oracle
similarity index 100%
rename from tests/value/oracle_equalities/redundant_alarms.res.oracle
rename to tests/value/oracle_equality/redundant_alarms.res.oracle
diff --git a/tests/value/oracle_equalities/relation_reduction.res.oracle b/tests/value/oracle_equality/relation_reduction.res.oracle
similarity index 100%
rename from tests/value/oracle_equalities/relation_reduction.res.oracle
rename to tests/value/oracle_equality/relation_reduction.res.oracle
diff --git a/tests/value/oracle_equalities/relation_shift.res.oracle b/tests/value/oracle_equality/relation_shift.res.oracle
similarity index 100%
rename from tests/value/oracle_equalities/relation_shift.res.oracle
rename to tests/value/oracle_equality/relation_shift.res.oracle
diff --git a/tests/value/oracle_equalities/relations.res.oracle b/tests/value/oracle_equality/relations.res.oracle
similarity index 100%
rename from tests/value/oracle_equalities/relations.res.oracle
rename to tests/value/oracle_equality/relations.res.oracle
diff --git a/tests/value/oracle_equalities/relations2.res.oracle b/tests/value/oracle_equality/relations2.res.oracle
similarity index 100%
rename from tests/value/oracle_equalities/relations2.res.oracle
rename to tests/value/oracle_equality/relations2.res.oracle
diff --git a/tests/value/oracle_equalities/struct2.res.oracle b/tests/value/oracle_equality/struct2.res.oracle
similarity index 100%
rename from tests/value/oracle_equalities/struct2.res.oracle
rename to tests/value/oracle_equality/struct2.res.oracle
diff --git a/tests/value/oracle_octagons/alias.1.res.oracle b/tests/value/oracle_octagon/alias.1.res.oracle
similarity index 100%
rename from tests/value/oracle_octagons/alias.1.res.oracle
rename to tests/value/oracle_octagon/alias.1.res.oracle
diff --git a/tests/value/oracle_octagons/alias.2.res.oracle b/tests/value/oracle_octagon/alias.2.res.oracle
similarity index 100%
rename from tests/value/oracle_octagons/alias.2.res.oracle
rename to tests/value/oracle_octagon/alias.2.res.oracle
diff --git a/tests/value/oracle_octagons/alias.3.res.oracle b/tests/value/oracle_octagon/alias.3.res.oracle
similarity index 100%
rename from tests/value/oracle_octagons/alias.3.res.oracle
rename to tests/value/oracle_octagon/alias.3.res.oracle
diff --git a/tests/value/oracle_octagons/alias.5.res.oracle b/tests/value/oracle_octagon/alias.5.res.oracle
similarity index 100%
rename from tests/value/oracle_octagons/alias.5.res.oracle
rename to tests/value/oracle_octagon/alias.5.res.oracle
diff --git a/tests/value/oracle_octagons/alias.6.res.oracle b/tests/value/oracle_octagon/alias.6.res.oracle
similarity index 100%
rename from tests/value/oracle_octagons/alias.6.res.oracle
rename to tests/value/oracle_octagon/alias.6.res.oracle
diff --git a/tests/value/oracle_octagons/auto_loop_unroll.0.res.oracle b/tests/value/oracle_octagon/auto_loop_unroll.0.res.oracle
similarity index 100%
rename from tests/value/oracle_octagons/auto_loop_unroll.0.res.oracle
rename to tests/value/oracle_octagon/auto_loop_unroll.0.res.oracle
diff --git a/tests/value/oracle_octagons/auto_loop_unroll.1.res.oracle b/tests/value/oracle_octagon/auto_loop_unroll.1.res.oracle
similarity index 100%
rename from tests/value/oracle_octagons/auto_loop_unroll.1.res.oracle
rename to tests/value/oracle_octagon/auto_loop_unroll.1.res.oracle
diff --git a/tests/value/oracle_octagons/bitfield.res.oracle b/tests/value/oracle_octagon/bitfield.res.oracle
similarity index 100%
rename from tests/value/oracle_octagons/bitfield.res.oracle
rename to tests/value/oracle_octagon/bitfield.res.oracle
diff --git a/tests/value/oracle_octagons/builtins_split.res.oracle b/tests/value/oracle_octagon/builtins_split.res.oracle
similarity index 100%
rename from tests/value/oracle_octagons/builtins_split.res.oracle
rename to tests/value/oracle_octagon/builtins_split.res.oracle
diff --git a/tests/value/oracle_octagons/call_simple.res.oracle b/tests/value/oracle_octagon/call_simple.res.oracle
similarity index 100%
rename from tests/value/oracle_octagons/call_simple.res.oracle
rename to tests/value/oracle_octagon/call_simple.res.oracle
diff --git a/tests/value/oracle_octagons/descending.res.oracle b/tests/value/oracle_octagon/descending.res.oracle
similarity index 100%
rename from tests/value/oracle_octagons/descending.res.oracle
rename to tests/value/oracle_octagon/descending.res.oracle
diff --git a/tests/value/oracle_octagons/downcast.1.res.oracle b/tests/value/oracle_octagon/downcast.1.res.oracle
similarity index 100%
rename from tests/value/oracle_octagons/downcast.1.res.oracle
rename to tests/value/oracle_octagon/downcast.1.res.oracle
diff --git a/tests/value/oracle_octagons/equality.res.oracle b/tests/value/oracle_octagon/equality.res.oracle
similarity index 100%
rename from tests/value/oracle_octagons/equality.res.oracle
rename to tests/value/oracle_octagon/equality.res.oracle
diff --git a/tests/value/oracle_octagons/find_ivaltop.res.oracle b/tests/value/oracle_octagon/find_ivaltop.res.oracle
similarity index 100%
rename from tests/value/oracle_octagons/find_ivaltop.res.oracle
rename to tests/value/oracle_octagon/find_ivaltop.res.oracle
diff --git a/tests/value/oracle_octagons/for_loops.3.res.oracle b/tests/value/oracle_octagon/for_loops.3.res.oracle
similarity index 100%
rename from tests/value/oracle_octagons/for_loops.3.res.oracle
rename to tests/value/oracle_octagon/for_loops.3.res.oracle
diff --git a/tests/value/oracle_octagons/gauges.res.oracle b/tests/value/oracle_octagon/gauges.res.oracle
similarity index 100%
rename from tests/value/oracle_octagons/gauges.res.oracle
rename to tests/value/oracle_octagon/gauges.res.oracle
diff --git a/tests/value/oracle_octagons/loop.res.oracle b/tests/value/oracle_octagon/loop.res.oracle
similarity index 100%
rename from tests/value/oracle_octagons/loop.res.oracle
rename to tests/value/oracle_octagon/loop.res.oracle
diff --git a/tests/value/oracle_octagons/loop_wvar.1.res.oracle b/tests/value/oracle_octagon/loop_wvar.1.res.oracle
similarity index 100%
rename from tests/value/oracle_octagons/loop_wvar.1.res.oracle
rename to tests/value/oracle_octagon/loop_wvar.1.res.oracle
diff --git a/tests/value/oracle_octagons/modulo.res.oracle b/tests/value/oracle_octagon/modulo.res.oracle
similarity index 100%
rename from tests/value/oracle_octagons/modulo.res.oracle
rename to tests/value/oracle_octagon/modulo.res.oracle
diff --git a/tests/value/oracle_octagons/non_natural.res.oracle b/tests/value/oracle_octagon/non_natural.res.oracle
similarity index 100%
rename from tests/value/oracle_octagons/non_natural.res.oracle
rename to tests/value/oracle_octagon/non_natural.res.oracle
diff --git a/tests/value/oracle_octagons/nonlin.res.oracle b/tests/value/oracle_octagon/nonlin.res.oracle
similarity index 100%
rename from tests/value/oracle_octagons/nonlin.res.oracle
rename to tests/value/oracle_octagon/nonlin.res.oracle
diff --git a/tests/value/oracle_octagons/plevel.res.oracle b/tests/value/oracle_octagon/plevel.res.oracle
similarity index 100%
rename from tests/value/oracle_octagons/plevel.res.oracle
rename to tests/value/oracle_octagon/plevel.res.oracle
diff --git a/tests/value/oracle_octagons/ptr_relation.1.res.oracle b/tests/value/oracle_octagon/ptr_relation.1.res.oracle
similarity index 100%
rename from tests/value/oracle_octagons/ptr_relation.1.res.oracle
rename to tests/value/oracle_octagon/ptr_relation.1.res.oracle
diff --git a/tests/value/oracle_octagons/relation_reduction.res.oracle b/tests/value/oracle_octagon/relation_reduction.res.oracle
similarity index 100%
rename from tests/value/oracle_octagons/relation_reduction.res.oracle
rename to tests/value/oracle_octagon/relation_reduction.res.oracle
diff --git a/tests/value/oracle_octagons/relation_shift.res.oracle b/tests/value/oracle_octagon/relation_shift.res.oracle
similarity index 100%
rename from tests/value/oracle_octagons/relation_shift.res.oracle
rename to tests/value/oracle_octagon/relation_shift.res.oracle
diff --git a/tests/value/oracle_octagons/relations.res.oracle b/tests/value/oracle_octagon/relations.res.oracle
similarity index 100%
rename from tests/value/oracle_octagons/relations.res.oracle
rename to tests/value/oracle_octagon/relations.res.oracle
diff --git a/tests/value/oracle_octagons/relations2.res.oracle b/tests/value/oracle_octagon/relations2.res.oracle
similarity index 100%
rename from tests/value/oracle_octagons/relations2.res.oracle
rename to tests/value/oracle_octagon/relations2.res.oracle
diff --git a/tests/value/oracle_octagons/semaphore.res.oracle b/tests/value/oracle_octagon/semaphore.res.oracle
similarity index 100%
rename from tests/value/oracle_octagons/semaphore.res.oracle
rename to tests/value/oracle_octagon/semaphore.res.oracle
diff --git a/tests/value/oracle_octagons/struct2.res.oracle b/tests/value/oracle_octagon/struct2.res.oracle
similarity index 100%
rename from tests/value/oracle_octagons/struct2.res.oracle
rename to tests/value/oracle_octagon/struct2.res.oracle
diff --git a/tests/value/oracle_octagons/test.0.res.oracle b/tests/value/oracle_octagon/test.0.res.oracle
similarity index 100%
rename from tests/value/oracle_octagons/test.0.res.oracle
rename to tests/value/oracle_octagon/test.0.res.oracle
diff --git a/tests/value/oracle_octagons/unroll.res.oracle b/tests/value/oracle_octagon/unroll.res.oracle
similarity index 100%
rename from tests/value/oracle_octagons/unroll.res.oracle
rename to tests/value/oracle_octagon/unroll.res.oracle
diff --git a/tests/value/oracle_octagons/unroll_simple.res.oracle b/tests/value/oracle_octagon/unroll_simple.res.oracle
similarity index 100%
rename from tests/value/oracle_octagons/unroll_simple.res.oracle
rename to tests/value/oracle_octagon/unroll_simple.res.oracle