3 files changed, 10 insertions, 9 deletions
diff --git a/src/synth/synth-context.adb b/src/synth/synth-context.adb
index 96242ee73..607c94555 100644
--- a/src/synth/synth-context.adb
+++ b/src/synth/synth-context.adb
@@ -25,7 +25,7 @@ with Grt.Types; use Grt.Types;
 with Errorout; use Errorout;
 with Iirs_Utils;
 
-with Std_Package;
+with Vhdl.Std_Package;
 with Ieee.Std_Logic_1164;
 
 with Simul.Annotations; use Simul.Annotations;
@@ -139,8 +139,9 @@ package body Synth.Context is
             case Val.Lit.Kind is
                when Iir_Value_B1 =>
                   pragma Assert
-                    (Val.Lit_Type = Std_Package.Boolean_Type_Definition
-                       or else Val.Lit_Type = Std_Package.Bit_Type_Definition);
+                    (Val.Lit_Type = Vhdl.Std_Package.Boolean_Type_Definition
+                       or else
+                       Val.Lit_Type = Vhdl.Std_Package.Bit_Type_Definition);
                   return Build_Const_UB32
                     (Build_Context, Ghdl_B1'Pos (Val.Lit.B1), 1);
                when Iir_Value_E8 =>
diff --git a/src/synth/synth-expr.adb b/src/synth/synth-expr.adb
index dea474e6c..cbc9f87d2 100644
--- a/src/synth/synth-expr.adb
+++ b/src/synth/synth-expr.adb
@@ -22,7 +22,7 @@ with Ada.Unchecked_Conversion;
 with Ada.Unchecked_Deallocation;
 with Std_Names;
 with Ieee.Std_Logic_1164;
-with Std_Package;
+with Vhdl.Std_Package;
 with Errorout; use Errorout;
 with Simul.Execution;
 with Grt.Types; use Grt.Types;
@@ -695,11 +695,11 @@ package body Synth.Expr is
          return Build_Edge (Build_Context, True, Clk);
       end if;
       Lit := Get_Named_Entity (Right);
-      if Lit = Std_Package.Bit_0
+      if Lit = Vhdl.Std_Package.Bit_0
         or else Lit = Ieee.Std_Logic_1164.Std_Ulogic_0
       then
          Posedge := False;
-      elsif Lit = Std_Package.Bit_1
+      elsif Lit = Vhdl.Std_Package.Bit_1
         or else Lit = Ieee.Std_Logic_1164.Std_Ulogic_1
       then
          Posedge := True;
diff --git a/src/synth/synth-types.adb b/src/synth/synth-types.adb
index 87fc1826c..88542ab6b 100644
--- a/src/synth/synth-types.adb
+++ b/src/synth/synth-types.adb
@@ -19,7 +19,7 @@
 --  MA 02110-1301, USA.
 
 with Types; use Types;
-with Std_Package;
+with Vhdl.Std_Package;
 with Ieee.Std_Logic_1164;
 with Iirs_Utils; use Iirs_Utils;
 
@@ -32,8 +32,8 @@ package body Synth.Types is
    begin
       return Atype = Ieee.Std_Logic_1164.Std_Ulogic_Type
         or else Atype = Ieee.Std_Logic_1164.Std_Logic_Type
-        or else Atype = Std_Package.Boolean_Type_Definition
-        or else Atype = Std_Package.Bit_Type_Definition;
+        or else Atype = Vhdl.Std_Package.Boolean_Type_Definition
+        or else Atype = Vhdl.Std_Package.Bit_Type_Definition;
    end Is_Bit_Type;
 
    function Is_Vector_Type (Atype : Iir) return Boolean is