diff --git a/macros/streamline/configs.yaml.sql b/macros/streamline/configs.yaml.sql
index 61c310e..5992deb 100644
--- a/macros/streamline/configs.yaml.sql
+++ b/macros/streamline/configs.yaml.sql
@@ -158,18 +158,18 @@
   sql: |
     {{ fsc_utils.create_udf_transform_logs() | indent(4) }}
 
-- name: {{ schema }}.udf_base58
+- name: {{ schema }}.udf_hex_to_base58
   signature:
     - [input, STRING]
   return_type: TEXT
   options: |
     LANGUAGE PYTHON
     RUNTIME_VERSION = '3.8'
-    HANDLER = 'transform_base58'
+    HANDLER = 'transform_hex_to_base58'
   sql: |
-    {{ fsc_utils.create_udf_base58() | indent(4) }}
+    {{ fsc_utils.create_udf_hex_to_base58() | indent(4) }}
 
-- name: {{ schema }}.udf_bech32
+- name: {{ schema }}.udf_hex_to_bech32
   signature:
     - [input, STRING]
     - [hrp, STRING]
@@ -177,9 +177,9 @@
   options: |
     LANGUAGE PYTHON
     RUNTIME_VERSION = '3.8'
-    HANDLER = 'transform_bech32'
+    HANDLER = 'transform_hex_to_bech32'
   sql: |
-    {{ fsc_utils.create_udf_bech32() | indent(4) }}
+    {{ fsc_utils.create_udf_hex_to_bech32() | indent(4) }}
 
 - name: {{ schema }}.udf_hex_to_algorand
   signature:
diff --git a/macros/streamline/functions.py.sql b/macros/streamline/functions.py.sql
index 52087cc..06b5208 100644
--- a/macros/streamline/functions.py.sql
+++ b/macros/streamline/functions.py.sql
@@ -179,9 +179,9 @@ def transform(events: dict):
 
 {% endmacro %}
 
-{% macro create_udf_base58() %}
+{% macro create_udf_hex_to_base58() %}
 
-def transform_base58(input):
+def transform_hex_to_base58(input):
     if input is None:
         return None
 
@@ -207,9 +207,9 @@ def transform_base58(input):
 
 {% endmacro %}
 
-{% macro create_udf_bech32() %}
+{% macro create_udf_hex_to_bech32() %}
 
-def transform_bech32(input, hrp=''):
+def transform_hex_to_bech32(input, hrp=''):
     CHARSET = "qpzry9x8gf2tvdw0s3jn54khce6mua7l"
 
     def bech32_polymod(values):