diff --git a/docs/embed.pod b/docs/embed.pod
index 9610a3fb72..7f5aa6d8e3 100644
--- a/docs/embed.pod
+++ b/docs/embed.pod
@@ -1362,7 +1362,7 @@ The list may also be augmented if additional functionality is required.
 
 =item C<Parrot_hll_register_HLL>
 
-=item C<Parrot_register_HLL_type>
+=item C<Parrot_hll_register_HLL_type>
 
 =item C<Parrot_util_register_move>
 
diff --git a/include/parrot/hll.h b/include/parrot/hll.h
index 1a16877809..7cc9715bbc 100644
--- a/include/parrot/hll.h
+++ b/include/parrot/hll.h
@@ -61,7 +61,7 @@ INTVAL Parrot_hll_register_HLL(PARROT_INTERP, ARGIN(STRING *hll_name))
         __attribute__nonnull__(2);
 
 PARROT_EXPORT
-void Parrot_register_HLL_type(PARROT_INTERP,
+void Parrot_hll_register_HLL_type(PARROT_INTERP,
     INTVAL hll_id,
     INTVAL core_type,
     INTVAL hll_type)
@@ -88,7 +88,7 @@ void Parrot_hll_init_HLL(PARROT_INTERP)
 #define ASSERT_ARGS_Parrot_hll_register_HLL __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
        PARROT_ASSERT_ARG(interp) \
     , PARROT_ASSERT_ARG(hll_name))
-#define ASSERT_ARGS_Parrot_register_HLL_type __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
+#define ASSERT_ARGS_Parrot_hll_register_HLL_type __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
        PARROT_ASSERT_ARG(interp))
 #define ASSERT_ARGS_Parrot_hll_init_HLL __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
        PARROT_ASSERT_ARG(interp))
diff --git a/lib/Parrot/Pmc2c/PMCEmitter.pm b/lib/Parrot/Pmc2c/PMCEmitter.pm
index 4e1dd384e0..8b7d7e50c1 100644
--- a/lib/Parrot/Pmc2c/PMCEmitter.pm
+++ b/lib/Parrot/Pmc2c/PMCEmitter.pm
@@ -627,7 +627,7 @@ EOC
 EOC
         foreach my $maps ( sort keys %{ $self->{flags}{maps} } ) {
             $cout .= <<"EOC";
-                Parrot_register_HLL_type( interp, hll_id, enum_class_$maps, entry);
+                Parrot_hll_register_HLL_type( interp, hll_id, enum_class_$maps, entry);
 EOC
         }
         $cout .= <<"EOC";
diff --git a/src/hll.c b/src/hll.c
index a80542339f..a788aead1c 100644
--- a/src/hll.c
+++ b/src/hll.c
@@ -263,7 +263,7 @@ Parrot_get_HLL_name(PARROT_INTERP, INTVAL id)
 
 /*
 
-=item C<void Parrot_register_HLL_type(PARROT_INTERP, INTVAL hll_id, INTVAL
+=item C<void Parrot_hll_register_HLL_type(PARROT_INTERP, INTVAL hll_id, INTVAL
 core_type, INTVAL hll_type)>
 
 Register a type mapping of C<< core_type => hll_type >> for the given HLL.
@@ -274,10 +274,10 @@ Register a type mapping of C<< core_type => hll_type >> for the given HLL.
 
 PARROT_EXPORT
 void
-Parrot_register_HLL_type(PARROT_INTERP, INTVAL hll_id,
+Parrot_hll_register_HLL_type(PARROT_INTERP, INTVAL hll_id,
         INTVAL core_type, INTVAL hll_type)
 {
-    ASSERT_ARGS(Parrot_register_HLL_type)
+    ASSERT_ARGS(Parrot_hll_register_HLL_type)
 
     if (hll_id == Parrot_get_HLL_id(interp, CONST_STRING(interp, "parrot")))
         Parrot_ex_throw_from_c_args(interp, NULL, EXCEPTION_INVALID_OPERATION,
diff --git a/src/pmc/parrotinterpreter.pmc b/src/pmc/parrotinterpreter.pmc
index c8bd804185..a3d8775e72 100644
--- a/src/pmc/parrotinterpreter.pmc
+++ b/src/pmc/parrotinterpreter.pmc
@@ -731,7 +731,7 @@ Map core_type to hll_type.
         const INTVAL core_type_id = VTABLE_type(INTERP, core_type);
         const INTVAL hll_type_id  = VTABLE_type(INTERP, hll_type);
         const INTVAL hll_id       = Parrot_pcc_get_HLL(INTERP, CURRENT_CONTEXT(INTERP));
-        Parrot_register_HLL_type(INTERP, hll_id, core_type_id, hll_type_id);
+        Parrot_hll_register_HLL_type(INTERP, hll_id, core_type_id, hll_type_id);
     }
 
 /*