4 files changed, 11 insertions, 11 deletions
diff --git a/src/ghdldrv/ghdldrv.adb b/src/ghdldrv/ghdldrv.adb
index cdec0eca6..d6e2210ac 100644
--- a/src/ghdldrv/ghdldrv.adb
+++ b/src/ghdldrv/ghdldrv.adb
@@ -27,7 +27,7 @@ with Std_Package;
 with Types; use Types;
 with Iirs; use Iirs;
 with Files_Map;
-with Configuration;
+with Vhdl.Configuration;
 with Default_Paths;
 with Interfaces.C_Streams;
 with System;
@@ -1488,7 +1488,7 @@ package body Ghdldrv is
 
    procedure Perform_Action (Cmd : Command_Make; Args : Argument_List)
    is
-      use Configuration;
+      use Vhdl.Configuration;
 
       File : Iir_Design_File;
       Unit : Iir;
diff --git a/src/ghdldrv/ghdllocal.adb b/src/ghdldrv/ghdllocal.adb
index e723f4629..a400ff69d 100644
--- a/src/ghdldrv/ghdllocal.adb
+++ b/src/ghdldrv/ghdllocal.adb
@@ -29,7 +29,7 @@ with Vhdl.Disp_Vhdl;
 with Default_Paths;
 with Vhdl.Scanner;
 with Errorout;
-with Configuration;
+with Vhdl.Configuration;
 with Files_Map;
 with Options;
 with Iirs_Utils; use Iirs_Utils;
@@ -1166,7 +1166,7 @@ package body Ghdllocal is
          raise Option_Error;
       end if;
 
-      Top := Configuration.Find_Top_Entity (From);
+      Top := Vhdl.Configuration.Find_Top_Entity (From);
 
       if Top = Null_Iir then
          Error ("no top entity found");
@@ -1344,7 +1344,7 @@ package body Ghdllocal is
          Append_Element (List, File);
       end Build_Dependence_List;
 
-      use Configuration;
+      use Vhdl.Configuration;
       use Name_Table;
 
       Top : Iir;
diff --git a/src/ghdldrv/ghdlrun.adb b/src/ghdldrv/ghdlrun.adb
index b37d5a464..6763498f7 100644
--- a/src/ghdldrv/ghdlrun.adb
+++ b/src/ghdldrv/ghdlrun.adb
@@ -37,7 +37,7 @@ with Flags;
 with Errorout; use Errorout;
 with Libraries;
 with Vhdl.Canon;
-with Configuration;
+with Vhdl.Configuration;
 with Trans_Be;
 with Translation;
 with Ieee.Std_Logic_1164;
@@ -167,7 +167,7 @@ package body Ghdlrun is
 
       Flags.Flag_Elaborate := True;
 
-      Config := Configuration.Configure (Prim_Name.all, Sec_Name.all);
+      Config := Vhdl.Configuration.Configure (Prim_Name.all, Sec_Name.all);
       if Config = Null_Iir then
          raise Compilation_Error;
       end if;
diff --git a/src/ghdldrv/ghdlsimul.adb b/src/ghdldrv/ghdlsimul.adb
index cb534e19b..cc968048f 100644
--- a/src/ghdldrv/ghdlsimul.adb
+++ b/src/ghdldrv/ghdlsimul.adb
@@ -29,7 +29,7 @@ with Errorout; use Errorout;
 with Std_Package;
 with Libraries;
 with Vhdl.Canon;
-with Configuration;
+with Vhdl.Configuration;
 with Iirs_Utils;
 with Simul.Annotations;
 with Simul.Elaboration;
@@ -81,7 +81,7 @@ package body Ghdlsimul is
    is
       use Name_Table;
       use Types;
-      use Configuration;
+      use Vhdl.Configuration;
 
       First_Id : Name_Id;
       Sec_Id : Name_Id;
@@ -102,7 +102,7 @@ package body Ghdlsimul is
       else
          Sec_Id := Get_Identifier (Sec_Name.all);
       end if;
-      Top_Conf := Configuration.Configure (First_Id, Sec_Id);
+      Top_Conf := Vhdl.Configuration.Configure (First_Id, Sec_Id);
       if Top_Conf = Null_Iir then
          raise Compilation_Error;
       end if;
@@ -115,7 +115,7 @@ package body Ghdlsimul is
            (Get_Block_Specification (Get_Block_Configuration (Conf_Unit)));
          Entity : constant Iir := Iirs_Utils.Get_Entity (Arch);
       begin
-         Configuration.Check_Entity_Declaration_Top (Entity);
+         Vhdl.Configuration.Check_Entity_Declaration_Top (Entity);
          if Nbr_Errors > 0 then
             raise Compilation_Error;
          end if;