diff --git a/src/alire-conditional.ads b/src/alire-conditional.ads
index 41e7cb7a..79c20fcf 100644
--- a/src/alire-conditional.ads
+++ b/src/alire-conditional.ads
@@ -1,4 +1,4 @@
-with Alire.Conditional_Values;
+with Alire.Conditional_Trees;
 with Alire.Dependencies;
 with Alire.Properties;
 with Alire.Requisites;
@@ -7,7 +7,7 @@ with Semantic_Versioning;
 
 package Alire.Conditional with Preelaborate is
 
-   package For_Dependencies is new Conditional_Values (Dependencies.Dependency,
+   package For_Dependencies is new Conditional_Trees (Dependencies.Dependency,
                                                        Dependencies.Image);
    subtype Dependencies is For_Dependencies.Conditional_Value;
 
@@ -16,7 +16,7 @@ package Alire.Conditional with Preelaborate is
                             return Dependencies;
 
 
-   package For_Properties is new Conditional_Values (Properties.Property'Class,
+   package For_Properties is new Conditional_Trees (Properties.Property'Class,
                                                      Properties.Image_Classwide);
    subtype Properties is For_Properties.Conditional_Value;
 
diff --git a/src/alire-conditional_values.adb b/src/alire-conditional_trees.adb
similarity index 99%
rename from src/alire-conditional_values.adb
rename to src/alire-conditional_trees.adb
index d4b7fd28..1176bdc5 100644
--- a/src/alire-conditional_values.adb
+++ b/src/alire-conditional_trees.adb
@@ -1,6 +1,6 @@
 with GNAT.IO;
 
-package body Alire.Conditional_Values is
+package body Alire.Conditional_Trees is
 
    function All_But_First_Children (This : Conditional_Value) return Conditional_Value is
       Children : Vectors.Vector := This.As_Vector;
@@ -437,4 +437,4 @@ package body Alire.Conditional_Values is
                              return Conditional_Value is
      (Conditional_Value'(To_Holder (Element (Pos))));
 
-end Alire.Conditional_Values;
+end Alire.Conditional_Trees;
diff --git a/src/alire-conditional_values.ads b/src/alire-conditional_trees.ads
similarity index 99%
rename from src/alire-conditional_values.ads
rename to src/alire-conditional_trees.ads
index 1cb42e7e..d718664a 100644
--- a/src/alire-conditional_values.ads
+++ b/src/alire-conditional_trees.ads
@@ -11,7 +11,7 @@ private with Ada.Containers.Indefinite_Vectors;
 generic
    type Values (<>) is private;
    with function Image (V : Values) return String;
-package Alire.Conditional_Values with Preelaborate is
+package Alire.Conditional_Trees with Preelaborate is
 
    type Kinds is (Condition, Value, Vector);
 
@@ -335,4 +335,4 @@ private
       then "(empty condition)"
       else This.Constant_Reference.Image);
 
-end Alire.Conditional_Values;
+end Alire.Conditional_Trees;