diff --git a/vunit/vhdl/data_types/src/integer_vector_ptr_pkg-body-200x.vhd b/vunit/vhdl/data_types/src/integer_vector_ptr_pkg-body-200x.vhd
index a8c4e64705..f900d33e8d 100644
--- a/vunit/vhdl/data_types/src/integer_vector_ptr_pkg-body-200x.vhd
+++ b/vunit/vhdl/data_types/src/integer_vector_ptr_pkg-body-200x.vhd
@@ -25,14 +25,14 @@ package body integer_vector_ptr_pkg is
     procedure
     set(
       ref   : natural;
-      index : integer;
+      index : natural;
       value : val_t
     );
 
     impure function
     get(
       ref   : natural;
-      index : integer
+      index : natural
     ) return val_t;
 
     procedure
@@ -100,7 +100,7 @@ package body integer_vector_ptr_pkg is
     procedure
     set(
       ref   : natural;
-      index : integer;
+      index : natural;
       value : val_t
     ) is begin
       ptrs(ref)(index) := value;
@@ -109,7 +109,7 @@ package body integer_vector_ptr_pkg is
     impure function
     get(
       ref   : natural;
-      index : integer
+      index : natural
     ) return val_t is begin
       return ptrs(ref)(index);
     end;
@@ -190,7 +190,7 @@ package body integer_vector_ptr_pkg is
   procedure
   set(
     ptr   : ptr_t;
-    index : integer;
+    index : natural;
     value : val_t
   ) is begin
     integer_vector_ptr_storage.set(ptr.ref, index, value);
@@ -199,7 +199,7 @@ package body integer_vector_ptr_pkg is
   impure function
   get(
     ptr   : ptr_t;
-    index : integer
+    index : natural
   ) return val_t is begin
     return integer_vector_ptr_storage.get(ptr.ref, index);
   end;
diff --git a/vunit/vhdl/data_types/src/integer_vector_ptr_pkg-body-93.vhd b/vunit/vhdl/data_types/src/integer_vector_ptr_pkg-body-93.vhd
index effc86199f..3c5c4be816 100644
--- a/vunit/vhdl/data_types/src/integer_vector_ptr_pkg-body-93.vhd
+++ b/vunit/vhdl/data_types/src/integer_vector_ptr_pkg-body-93.vhd
@@ -52,7 +52,7 @@ package body integer_vector_ptr_pkg is
   procedure
   set(
     ptr   : ptr_t;
-    index : integer;
+    index : natural;
     value : val_t
   ) is begin
     ptrs(ptr.ref)(index) := value;
@@ -61,7 +61,7 @@ package body integer_vector_ptr_pkg is
   impure function
   get(
     ptr   : ptr_t;
-    index : integer
+    index : natural
   ) return val_t is begin
     return ptrs(ptr.ref)(index);
   end;
diff --git a/vunit/vhdl/data_types/src/integer_vector_ptr_pkg.vhd b/vunit/vhdl/data_types/src/integer_vector_ptr_pkg.vhd
index 19068d86df..68939a215d 100644
--- a/vunit/vhdl/data_types/src/integer_vector_ptr_pkg.vhd
+++ b/vunit/vhdl/data_types/src/integer_vector_ptr_pkg.vhd
@@ -58,14 +58,14 @@ package integer_vector_ptr_pkg is
   procedure
   set(
     ptr   : ptr_t;
-    index : integer;
+    index : natural;
     value : val_t
   );
 
   impure function
   get(
     ptr   : ptr_t;
-    index : integer
+    index : natural
   ) return val_t;
 
   procedure
diff --git a/vunit/vhdl/data_types/src/string_ptr_pkg-body-200x.vhd b/vunit/vhdl/data_types/src/string_ptr_pkg-body-200x.vhd
index ff28bb093e..a1dc0fa6c7 100644
--- a/vunit/vhdl/data_types/src/string_ptr_pkg-body-200x.vhd
+++ b/vunit/vhdl/data_types/src/string_ptr_pkg-body-200x.vhd
@@ -24,14 +24,14 @@ package body string_ptr_pkg is
     procedure
     set(
       ref   : natural;
-      index : integer;
+      index : natural;
       value : val_t
     );
 
     impure function
     get(
       ref   : natural;
-      index : integer
+      index : natural
     ) return val_t;
 
     procedure
@@ -104,7 +104,7 @@ package body string_ptr_pkg is
     procedure
     set(
       ref   : natural;
-      index : integer;
+      index : natural;
       value : val_t
     ) is begin
       ptrs(ref)(index) := value;
@@ -113,7 +113,7 @@ package body string_ptr_pkg is
     impure function
     get(
       ref   : natural;
-      index : integer
+      index : natural
     ) return val_t is begin
       return ptrs(ref)(index);
     end;
@@ -229,7 +229,7 @@ package body string_ptr_pkg is
   procedure
   set(
     ptr   : ptr_t;
-    index : integer;
+    index : natural;
     value : val_t
   ) is begin
     string_ptr_storage.set(ptr.ref, index, value);
@@ -238,7 +238,7 @@ package body string_ptr_pkg is
   impure function
   get(
     ptr : ptr_t;
-    index : integer
+    index : natural
   ) return val_t is begin
     return string_ptr_storage.get(ptr.ref, index);
   end;
diff --git a/vunit/vhdl/data_types/src/string_ptr_pkg-body-93.vhd b/vunit/vhdl/data_types/src/string_ptr_pkg-body-93.vhd
index fc269781a6..a187063f9d 100644
--- a/vunit/vhdl/data_types/src/string_ptr_pkg-body-93.vhd
+++ b/vunit/vhdl/data_types/src/string_ptr_pkg-body-93.vhd
@@ -50,7 +50,7 @@ package body string_ptr_pkg is
   procedure
   set(
     ptr   : ptr_t;
-    index : integer;
+    index : natural;
     value : val_t
   ) is begin
     ptrs(ptr.ref)(index) := value;
@@ -59,7 +59,7 @@ package body string_ptr_pkg is
   impure function
   get(
     ptr   : ptr_t;
-    index : integer
+    index : natural
   ) return val_t is begin
     return ptrs(ptr.ref)(index);
   end;
diff --git a/vunit/vhdl/data_types/src/string_ptr_pkg.vhd b/vunit/vhdl/data_types/src/string_ptr_pkg.vhd
index f0f288c7ae..b20ebc34d9 100644
--- a/vunit/vhdl/data_types/src/string_ptr_pkg.vhd
+++ b/vunit/vhdl/data_types/src/string_ptr_pkg.vhd
@@ -60,14 +60,14 @@ package string_ptr_pkg is
   procedure
   set(
     ptr   : string_ptr_t;
-    index : integer;
+    index : natural;
     value : character
   );
 
   impure function
   get(
     ptr   : string_ptr_t;
-    index : integer
+    index : natural
   ) return character;
 
   procedure