diff --git a/tools/code_generators/GEN_AMD_switch_buffer_by_offset_1x64_be_S.pl b/tools/code_generators/GEN_AMD_switch_buffer_by_offset_1x64_be_S.pl
index 06ebdd6c6..18867c567 100644
--- a/tools/code_generators/GEN_AMD_switch_buffer_by_offset_1x64_be_S.pl
+++ b/tools/code_generators/GEN_AMD_switch_buffer_by_offset_1x64_be_S.pl
@@ -10,11 +10,11 @@ for (my $i = 0, my $s = 0; $i < 64; $i++, $s++)
   {
     if ((($j - $s - 1) >= 0) && (($j - $s - 0) >= 0))
     {
-      printf ("      w[%2d] = amd_bytealign_S (w[%2d], w[%2d], offset);\n", $j, $j - $s - 1, $j - $s - 0);
+      printf ("      w[%2d] = hc_bytealign_S (w[%2d], w[%2d], offset);\n", $j, $j - $s - 1, $j - $s - 0);
     }
     elsif (($j - $s - 0) >= 0)
     {
-      printf ("      w[%2d] = amd_bytealign_S (    0, w[%2d], offset);\n", $j, $j - $s - 0);
+      printf ("      w[%2d] = hc_bytealign_S (    0, w[%2d], offset);\n", $j, $j - $s - 0);
     }
     else
     {
diff --git a/tools/code_generators/GEN_AMD_switch_buffer_by_offset_1x64_le_S.pl b/tools/code_generators/GEN_AMD_switch_buffer_by_offset_1x64_le_S.pl
index 294b51f73..26a73ba5e 100644
--- a/tools/code_generators/GEN_AMD_switch_buffer_by_offset_1x64_le_S.pl
+++ b/tools/code_generators/GEN_AMD_switch_buffer_by_offset_1x64_le_S.pl
@@ -10,11 +10,11 @@ for (my $i = 0, my $s = 0; $i < 64; $i++, $s++)
   {
     if ((($j - $s - 1) >= 0) && (($j - $s - 0) >= 0))
     {
-      printf ("      w[%2d] = amd_bytealign_S (w[%2d], w[%2d], offset_minus_4);\n", $j, $j - $s - 0, $j - $s - 1);
+      printf ("      w[%2d] = hc_bytealign_S (w[%2d], w[%2d], offset_minus_4);\n", $j, $j - $s - 0, $j - $s - 1);
     }
     elsif (($j - $s - 0) >= 0)
     {
-      printf ("      w[%2d] = amd_bytealign_S (w[%2d],     0, offset_minus_4);\n", $j, $j - $s - 0);
+      printf ("      w[%2d] = hc_bytealign_S (w[%2d],     0, offset_minus_4);\n", $j, $j - $s - 0);
     }
     else
     {
diff --git a/tools/code_generators/GEN_AMD_switch_buffer_by_offset_4x4_be_S.pl b/tools/code_generators/GEN_AMD_switch_buffer_by_offset_4x4_be_S.pl
index 9ffd23725..25acf22f0 100644
--- a/tools/code_generators/GEN_AMD_switch_buffer_by_offset_4x4_be_S.pl
+++ b/tools/code_generators/GEN_AMD_switch_buffer_by_offset_4x4_be_S.pl
@@ -19,11 +19,11 @@ for (my $i = 0, my $s = 0; $i < 16; $i++, $s++)
 
     if ((($j - $s - 1) >= 0) && (($j - $s - 0) >= 0))
     {
-      printf ("      w%d[%d] = amd_bytealign_S (w%d[%d], w%d[%d], offset);\n", $jd4, $jm4, $js1d4, $js1m4, $js0d4, $js0m4);
+      printf ("      w%d[%d] = hc_bytealign_S (w%d[%d], w%d[%d], offset);\n", $jd4, $jm4, $js1d4, $js1m4, $js0d4, $js0m4);
     }
     elsif (($j - $s - 0) >= 0)
     {
-      printf ("      w%d[%d] = amd_bytealign_S (    0, w%d[%d], offset);\n", $jd4, $jm4, $js0d4, $js0m4);
+      printf ("      w%d[%d] = hc_bytealign_S (    0, w%d[%d], offset);\n", $jd4, $jm4, $js0d4, $js0m4);
     }
     else
     {
diff --git a/tools/code_generators/GEN_AMD_switch_buffer_by_offset_4x4_carry_be_S.pl b/tools/code_generators/GEN_AMD_switch_buffer_by_offset_4x4_carry_be_S.pl
index 06586846d..cbaa406fe 100644
--- a/tools/code_generators/GEN_AMD_switch_buffer_by_offset_4x4_carry_be_S.pl
+++ b/tools/code_generators/GEN_AMD_switch_buffer_by_offset_4x4_carry_be_S.pl
@@ -32,11 +32,11 @@ for (my $i = 0, my $s = 0; $i < 16; $i++, $s++)
 
     if ($js0d4 >= 4)
     {
-      printf ("      %s%d[%d] = amd_bytealign_S (%s%d[%d],     0, offset);\n", $c1, $jd4, $jm4, $c2, $js1d4, $js1m4);
+      printf ("      %s%d[%d] = hc_bytealign_S (%s%d[%d],     0, offset);\n", $c1, $jd4, $jm4, $c2, $js1d4, $js1m4);
     }
     elsif ((($j - $s - 1) >= 0) && (($j - $s - 0) >= 0))
     {
-      printf ("      %s%d[%d] = amd_bytealign_S (%s%d[%d], %s%d[%d], offset);\n", $c1, $jd4, $jm4, $c2, $js1d4, $js1m4, $c3, $js0d4, $js0m4);
+      printf ("      %s%d[%d] = hc_bytealign_S (%s%d[%d], %s%d[%d], offset);\n", $c1, $jd4, $jm4, $c2, $js1d4, $js1m4, $c3, $js0d4, $js0m4);
     }
     elsif (($j - $s - 0) >= 0)
     {
diff --git a/tools/code_generators/GEN_AMD_switch_buffer_by_offset_4x4_le_S.pl b/tools/code_generators/GEN_AMD_switch_buffer_by_offset_4x4_le_S.pl
index d9d897054..310634f6b 100644
--- a/tools/code_generators/GEN_AMD_switch_buffer_by_offset_4x4_le_S.pl
+++ b/tools/code_generators/GEN_AMD_switch_buffer_by_offset_4x4_le_S.pl
@@ -19,11 +19,11 @@ for (my $i = 0, my $s = 0; $i < 16; $i++, $s++)
 
     if ((($j - $s - 1) >= 0) && (($j - $s - 0) >= 0))
     {
-      printf ("      w%d[%d] = amd_bytealign_S (w%d[%d], w%d[%d], offset_minus_4);\n", $jd4, $jm4, $js0d4, $js0m4, $js1d4, $js1m4);
+      printf ("      w%d[%d] = hc_bytealign_S (w%d[%d], w%d[%d], offset_minus_4);\n", $jd4, $jm4, $js0d4, $js0m4, $js1d4, $js1m4);
     }
     elsif (($j - $s - 0) >= 0)
     {
-      printf ("      w%d[%d] = amd_bytealign_S (w%d[%d],     0, offset_minus_4);\n", $jd4, $jm4, $js0d4, $js0m4);
+      printf ("      w%d[%d] = hc_bytealign_S (w%d[%d],     0, offset_minus_4);\n", $jd4, $jm4, $js0d4, $js0m4);
     }
     else
     {
diff --git a/tools/code_generators/GEN_AMD_switch_buffer_by_offset_8x4_be_S.pl b/tools/code_generators/GEN_AMD_switch_buffer_by_offset_8x4_be_S.pl
index f7939db87..404d3eb0e 100644
--- a/tools/code_generators/GEN_AMD_switch_buffer_by_offset_8x4_be_S.pl
+++ b/tools/code_generators/GEN_AMD_switch_buffer_by_offset_8x4_be_S.pl
@@ -19,11 +19,11 @@ for (my $i = 0, my $s = 0; $i < 32; $i++, $s++)
 
     if ((($j - $s - 1) >= 0) && (($j - $s - 0) >= 0))
     {
-      printf ("      w%d[%d] = amd_bytealign_S (w%d[%d], w%d[%d], offset);\n", $jd4, $jm4, $js1d4, $js1m4, $js0d4, $js0m4);
+      printf ("      w%d[%d] = hc_bytealign_S (w%d[%d], w%d[%d], offset);\n", $jd4, $jm4, $js1d4, $js1m4, $js0d4, $js0m4);
     }
     elsif (($j - $s - 0) >= 0)
     {
-      printf ("      w%d[%d] = amd_bytealign_S (    0, w%d[%d], offset);\n", $jd4, $jm4, $js0d4, $js0m4);
+      printf ("      w%d[%d] = hc_bytealign_S (    0, w%d[%d], offset);\n", $jd4, $jm4, $js0d4, $js0m4);
     }
     else
     {
diff --git a/tools/code_generators/GEN_AMD_switch_buffer_by_offset_8x4_carry_be_S.pl b/tools/code_generators/GEN_AMD_switch_buffer_by_offset_8x4_carry_be_S.pl
index 186b9bf25..931caf5c6 100644
--- a/tools/code_generators/GEN_AMD_switch_buffer_by_offset_8x4_carry_be_S.pl
+++ b/tools/code_generators/GEN_AMD_switch_buffer_by_offset_8x4_carry_be_S.pl
@@ -32,15 +32,15 @@ for (my $i = 0, my $s = 0; $i < 32; $i++, $s++)
 
     if ($js0d4 >= 8)
     {
-      printf ("      %s%d[%d] = amd_bytealign_S (%s%d[%d],     0, offset);\n", $c1, $jd4, $jm4, $c2, $js1d4, $js1m4);
+      printf ("      %s%d[%d] = hc_bytealign_S (%s%d[%d],     0, offset);\n", $c1, $jd4, $jm4, $c2, $js1d4, $js1m4);
     }
     elsif ((($j - $s - 1) >= 0) && (($j - $s - 0) >= 0))
     {
-      printf ("      %s%d[%d] = amd_bytealign_S (%s%d[%d], %s%d[%d], offset);\n", $c1, $jd4, $jm4, $c2, $js1d4, $js1m4, $c3, $js0d4, $js0m4);
+      printf ("      %s%d[%d] = hc_bytealign_S (%s%d[%d], %s%d[%d], offset);\n", $c1, $jd4, $jm4, $c2, $js1d4, $js1m4, $c3, $js0d4, $js0m4);
     }
     elsif (($j - $s - 0) >= 0)
     {
-      printf ("      %s%d[%d] = amd_bytealign_S (    0, %s%d[%d], offset);\n", $c1, $jd4, $jm4, $c2, $js0d4, $js0m4);
+      printf ("      %s%d[%d] = hc_bytealign_S (    0, %s%d[%d], offset);\n", $c1, $jd4, $jm4, $c2, $js0d4, $js0m4);
     }
     else
     {
diff --git a/tools/code_generators/GEN_NV_switch_buffer_by_offset_1x64_be_S.pl b/tools/code_generators/GEN_NV_switch_buffer_by_offset_1x64_be_S.pl
index ade31c6d9..2719267fd 100644
--- a/tools/code_generators/GEN_NV_switch_buffer_by_offset_1x64_be_S.pl
+++ b/tools/code_generators/GEN_NV_switch_buffer_by_offset_1x64_be_S.pl
@@ -11,11 +11,11 @@ for (my $i = 0, my $s = 0; $i < 64; $i++, $s++)
   {
     if ((($j - $s - 1) >= 0) && (($j - $s - 0) >= 0))
     {
-      printf ("      w[%2d] = __byte_perm_S (w[%2d], w[%2d], selector);\n", $j, $j - $s - 0, $j - $s - 1);
+      printf ("      w[%2d] = hc_byte_perm_S (w[%2d], w[%2d], selector);\n", $j, $j - $s - 0, $j - $s - 1);
     }
     elsif (($j - $s - 0) >= 0)
     {
-      printf ("      w[%2d] = __byte_perm_S (w[%2d],     0, selector);\n", $j, $j - $s - 0);
+      printf ("      w[%2d] = hc_byte_perm_S (w[%2d],     0, selector);\n", $j, $j - $s - 0);
     }
     else
     {
diff --git a/tools/code_generators/GEN_NV_switch_buffer_by_offset_1x64_le_S.pl b/tools/code_generators/GEN_NV_switch_buffer_by_offset_1x64_le_S.pl
index 87e4ac527..f8a87f7d5 100644
--- a/tools/code_generators/GEN_NV_switch_buffer_by_offset_1x64_le_S.pl
+++ b/tools/code_generators/GEN_NV_switch_buffer_by_offset_1x64_le_S.pl
@@ -11,11 +11,11 @@ for (my $i = 0, my $s = 0; $i < 64; $i++, $s++)
   {
     if ((($j - $s - 1) >= 0) && (($j - $s - 0) >= 0))
     {
-      printf ("      w[%2d] = __byte_perm_S (w[%2d], w[%2d], selector);\n", $j, $j - $s - 1, $j - $s - 0);
+      printf ("      w[%2d] = hc_byte_perm_S (w[%2d], w[%2d], selector);\n", $j, $j - $s - 1, $j - $s - 0);
     }
     elsif (($j - $s - 0) >= 0)
     {
-      printf ("      w[%2d] = __byte_perm_S (    0, w[%2d], selector);\n", $j, $j - $s - 0);
+      printf ("      w[%2d] = hc_byte_perm_S (    0, w[%2d], selector);\n", $j, $j - $s - 0);
     }
     else
     {
diff --git a/tools/code_generators/GEN_NV_switch_buffer_by_offset_4x4_be_S.pl b/tools/code_generators/GEN_NV_switch_buffer_by_offset_4x4_be_S.pl
index 091e038cd..c2c95751f 100644
--- a/tools/code_generators/GEN_NV_switch_buffer_by_offset_4x4_be_S.pl
+++ b/tools/code_generators/GEN_NV_switch_buffer_by_offset_4x4_be_S.pl
@@ -20,11 +20,11 @@ for (my $i = 0, my $s = 0; $i < 16; $i++, $s++)
 
     if ((($j - $s - 1) >= 0) && (($j - $s - 0) >= 0))
     {
-      printf ("      w%d[%d] = __byte_perm_S (w%d[%d], w%d[%d], selector);\n", $jd4, $jm4, $js0d4, $js0m4, $js1d4, $js1m4);
+      printf ("      w%d[%d] = hc_byte_perm_S (w%d[%d], w%d[%d], selector);\n", $jd4, $jm4, $js0d4, $js0m4, $js1d4, $js1m4);
     }
     elsif (($j - $s - 0) >= 0)
     {
-      printf ("      w%d[%d] = __byte_perm_S (w%d[%d],     0, selector);\n", $jd4, $jm4, $js0d4, $js0m4);
+      printf ("      w%d[%d] = hc_byte_perm_S (w%d[%d],     0, selector);\n", $jd4, $jm4, $js0d4, $js0m4);
     }
     else
     {
diff --git a/tools/code_generators/GEN_NV_switch_buffer_by_offset_4x4_carry_be_S.pl b/tools/code_generators/GEN_NV_switch_buffer_by_offset_4x4_carry_be_S.pl
index ac5041192..2f1e87497 100644
--- a/tools/code_generators/GEN_NV_switch_buffer_by_offset_4x4_carry_be_S.pl
+++ b/tools/code_generators/GEN_NV_switch_buffer_by_offset_4x4_carry_be_S.pl
@@ -32,15 +32,15 @@ for (my $i = 0, my $s = 0; $i < 16; $i++, $s++)
 
     if ($js0d4 >= 4)
     {
-      printf ("      %s%d[%d] = __byte_perm_S (    0, %s%d[%d], selector);\n", $c1, $jd4, $jm4, $c2, $js1d4, $js1m4);
+      printf ("      %s%d[%d] = hc_byte_perm_S (    0, %s%d[%d], selector);\n", $c1, $jd4, $jm4, $c2, $js1d4, $js1m4);
     }
     elsif ((($j - $s - 1) >= 0) && (($j - $s - 0) >= 0))
     {
-      printf ("      %s%d[%d] = __byte_perm_S (%s%d[%d], %s%d[%d], selector);\n", $c1, $jd4, $jm4, $c2, $js0d4, $js0m4, $c3, $js1d4, $js1m4);
+      printf ("      %s%d[%d] = hc_byte_perm_S (%s%d[%d], %s%d[%d], selector);\n", $c1, $jd4, $jm4, $c2, $js0d4, $js0m4, $c3, $js1d4, $js1m4);
     }
     elsif (($j - $s - 0) >= 0)
     {
-      printf ("      %s%d[%d] = __byte_perm_S (%s%d[%d],     0, selector);\n", $c1, $jd4, $jm4, $c2, $js0d4, $js0m4);
+      printf ("      %s%d[%d] = hc_byte_perm_S (%s%d[%d],     0, selector);\n", $c1, $jd4, $jm4, $c2, $js0d4, $js0m4);
     }
     else
     {
diff --git a/tools/code_generators/GEN_NV_switch_buffer_by_offset_4x4_le_S.pl b/tools/code_generators/GEN_NV_switch_buffer_by_offset_4x4_le_S.pl
index bcdcb962b..0f0f62809 100644
--- a/tools/code_generators/GEN_NV_switch_buffer_by_offset_4x4_le_S.pl
+++ b/tools/code_generators/GEN_NV_switch_buffer_by_offset_4x4_le_S.pl
@@ -20,11 +20,11 @@ for (my $i = 0, my $s = 0; $i < 16; $i++, $s++)
 
     if ((($j - $s - 1) >= 0) && (($j - $s - 0) >= 0))
     {
-      printf ("      w%d[%d] = __byte_perm_S (w%d[%d], w%d[%d], selector);\n", $jd4, $jm4, $js1d4, $js1m4, $js0d4, $js0m4);
+      printf ("      w%d[%d] = hc_byte_perm_S (w%d[%d], w%d[%d], selector);\n", $jd4, $jm4, $js1d4, $js1m4, $js0d4, $js0m4);
     }
     elsif (($j - $s - 0) >= 0)
     {
-      printf ("      w%d[%d] = __byte_perm_S (    0, w%d[%d], selector);\n", $jd4, $jm4, $js0d4, $js0m4);
+      printf ("      w%d[%d] = hc_byte_perm_S (    0, w%d[%d], selector);\n", $jd4, $jm4, $js0d4, $js0m4);
     }
     else
     {
diff --git a/tools/code_generators/GEN_NV_switch_buffer_by_offset_8x4_be_S.pl b/tools/code_generators/GEN_NV_switch_buffer_by_offset_8x4_be_S.pl
index 4195fde81..ea67607ab 100644
--- a/tools/code_generators/GEN_NV_switch_buffer_by_offset_8x4_be_S.pl
+++ b/tools/code_generators/GEN_NV_switch_buffer_by_offset_8x4_be_S.pl
@@ -19,11 +19,11 @@ for (my $i = 0, my $s = 0; $i < 32; $i++, $s++)
 
     if ((($j - $s - 1) >= 0) && (($j - $s - 0) >= 0))
     {
-      printf ("      w%d[%d] = __byte_perm_S (w%d[%d], w%d[%d], selector);\n", $jd4, $jm4, $js0d4, $js0m4, $js1d4, $js1m4);
+      printf ("      w%d[%d] = hc_byte_perm_S (w%d[%d], w%d[%d], selector);\n", $jd4, $jm4, $js0d4, $js0m4, $js1d4, $js1m4);
     }
     elsif (($j - $s - 0) >= 0)
     {
-      printf ("      w%d[%d] = __byte_perm_S (w%d[%d],     0, selector);\n", $jd4, $jm4, $js0d4, $js0m4);
+      printf ("      w%d[%d] = hc_byte_perm_S (w%d[%d],     0, selector);\n", $jd4, $jm4, $js0d4, $js0m4);
     }
     else
     {
diff --git a/tools/code_generators/GEN_NV_switch_buffer_by_offset_8x4_carry_be_S.pl b/tools/code_generators/GEN_NV_switch_buffer_by_offset_8x4_carry_be_S.pl
index 690f9b4ab..2ac665806 100644
--- a/tools/code_generators/GEN_NV_switch_buffer_by_offset_8x4_carry_be_S.pl
+++ b/tools/code_generators/GEN_NV_switch_buffer_by_offset_8x4_carry_be_S.pl
@@ -32,15 +32,15 @@ for (my $i = 0, my $s = 0; $i < 32; $i++, $s++)
 
     if ($js0d4 >= 8)
     {
-      printf ("      %s%d[%d] = __byte_perm_S (    0, %s%d[%d], selector);\n", $c1, $jd4, $jm4, $c2, $js1d4, $js1m4);
+      printf ("      %s%d[%d] = hc_byte_perm_S (    0, %s%d[%d], selector);\n", $c1, $jd4, $jm4, $c2, $js1d4, $js1m4);
     }
     elsif ((($j - $s - 1) >= 0) && (($j - $s - 0) >= 0))
     {
-      printf ("      %s%d[%d] = __byte_perm_S (%s%d[%d], %s%d[%d], selector);\n", $c1, $jd4, $jm4, $c2, $js0d4, $js0m4, $c3, $js1d4, $js1m4);
+      printf ("      %s%d[%d] = hc_byte_perm_S (%s%d[%d], %s%d[%d], selector);\n", $c1, $jd4, $jm4, $c2, $js0d4, $js0m4, $c3, $js1d4, $js1m4);
     }
     elsif (($j - $s - 0) >= 0)
     {
-      printf ("      %s%d[%d] = __byte_perm_S (%s%d[%d],     0, selector);\n", $c1, $jd4, $jm4, $c2, $js0d4, $js0m4);
+      printf ("      %s%d[%d] = hc_byte_perm_S (%s%d[%d],     0, selector);\n", $c1, $jd4, $jm4, $c2, $js0d4, $js0m4);
     }
     else
     {