diff --git a/netbox/templates/circuits/circuit.html b/netbox/templates/circuits/circuit.html
index 07d3c360d..51f80cca5 100644
--- a/netbox/templates/circuits/circuit.html
+++ b/netbox/templates/circuits/circuit.html
@@ -119,7 +119,7 @@
             </div>
             <div class="panel-body rendered-markdown">
                 {% if circuit.comments %}
-                    {{ circuit.comments|gfm }}
+                    {{ circuit.comments|markdown }}
                 {% else %}
                     <span class="text-muted">None</span>
                 {% endif %}
diff --git a/netbox/templates/circuits/provider.html b/netbox/templates/circuits/provider.html
index 7472366c5..dad07bc7c 100644
--- a/netbox/templates/circuits/provider.html
+++ b/netbox/templates/circuits/provider.html
@@ -88,11 +88,11 @@
                 </tr>
                 <tr>
                     <td>NOC Contact</td>
-                    <td class="rendered-markdown">{{ provider.noc_contact|gfm|placeholder }}</td>
+                    <td class="rendered-markdown">{{ provider.noc_contact|markdown|placeholder }}</td>
                 </tr>
                 <tr>
                     <td>Admin Contact</td>
-                    <td class="rendered-markdown">{{ provider.admin_contact|gfm|placeholder }}</td>
+                    <td class="rendered-markdown">{{ provider.admin_contact|markdown|placeholder }}</td>
                 </tr>
                 <tr>
                     <td>Circuits</td>
@@ -110,7 +110,7 @@
             </div>
             <div class="panel-body rendered-markdown">
                 {% if provider.comments %}
-                    {{ provider.comments|gfm }}
+                    {{ provider.comments|markdown }}
                 {% else %}
                     <span class="text-muted">None</span>
                 {% endif %}
diff --git a/netbox/templates/dcim/device.html b/netbox/templates/dcim/device.html
index 5ab28b409..9e16f6e6c 100644
--- a/netbox/templates/dcim/device.html
+++ b/netbox/templates/dcim/device.html
@@ -325,7 +325,7 @@
                 </div>
                 <div class="panel-body rendered-markdown">
                     {% if device.comments %}
-                        {{ device.comments|gfm }}
+                        {{ device.comments|markdown }}
                     {% else %}
                         <span class="text-muted">None</span>
                     {% endif %}
diff --git a/netbox/templates/dcim/devicetype.html b/netbox/templates/dcim/devicetype.html
index 292a31c89..27c61de76 100644
--- a/netbox/templates/dcim/devicetype.html
+++ b/netbox/templates/dcim/devicetype.html
@@ -149,7 +149,7 @@
             </div>
             <div class="panel-body rendered-markdown">
                 {% if devicetype.comments %}
-                    {{ devicetype.comments|gfm }}
+                    {{ devicetype.comments|markdown }}
                 {% else %}
                     <span class="text-muted">None</span>
                 {% endif %}
diff --git a/netbox/templates/dcim/powerfeed.html b/netbox/templates/dcim/powerfeed.html
index 316e0e5f0..350d9bd52 100644
--- a/netbox/templates/dcim/powerfeed.html
+++ b/netbox/templates/dcim/powerfeed.html
@@ -158,7 +158,7 @@
             </div>
             <div class="panel-body rendered-markdown">
                 {% if powerfeed.comments %}
-                    {{ powerfeed.comments|gfm }}
+                    {{ powerfeed.comments|markdown }}
                 {% else %}
                     <span class="text-muted">None</span>
                 {% endif %}
diff --git a/netbox/templates/dcim/rack.html b/netbox/templates/dcim/rack.html
index b43a4bfdf..a824f44de 100644
--- a/netbox/templates/dcim/rack.html
+++ b/netbox/templates/dcim/rack.html
@@ -198,7 +198,7 @@
             </div>
             <div class="panel-body rendered-markdown">
                 {% if rack.comments %}
-                    {{ rack.comments|gfm }}
+                    {{ rack.comments|markdown }}
                 {% else %}
                     <span class="text-muted">None</span>
                 {% endif %}
diff --git a/netbox/templates/dcim/site.html b/netbox/templates/dcim/site.html
index ae452bde9..ac7e1d07f 100644
--- a/netbox/templates/dcim/site.html
+++ b/netbox/templates/dcim/site.html
@@ -206,7 +206,7 @@
             </div>
             <div class="panel-body rendered-markdown">
                 {% if site.comments %}
-                    {{ site.comments|gfm }}
+                    {{ site.comments|markdown }}
                 {% else %}
                     <span class="text-muted">None</span>
                 {% endif %}
diff --git a/netbox/templates/extras/script.html b/netbox/templates/extras/script.html
index fc10db80f..bf83e7fd9 100644
--- a/netbox/templates/extras/script.html
+++ b/netbox/templates/extras/script.html
@@ -47,7 +47,7 @@
                                     <tr>
                                         <td>{{ forloop.counter }}</td>
                                         <td>{% log_level level %}</td>
-                                        <td class="rendered-markdown">{{ message|gfm }}</td>
+                                        <td class="rendered-markdown">{{ message|markdown }}</td>
                                     </tr>
                                 {% empty %}
                                     <tr>
diff --git a/netbox/templates/extras/tag.html b/netbox/templates/extras/tag.html
index 2857d6188..f127d365a 100644
--- a/netbox/templates/extras/tag.html
+++ b/netbox/templates/extras/tag.html
@@ -90,7 +90,7 @@
                 </div>
                 <div class="panel-body rendered-markdown">
                     {% if tag.comments %}
-                        {{ tag.comments|gfm }}
+                        {{ tag.comments|markdown }}
                     {% else %}
                         <span class="text-muted">None</span>
                     {% endif %}
diff --git a/netbox/templates/tenancy/tenant.html b/netbox/templates/tenancy/tenant.html
index 9a1ed1be8..e5cea5705 100644
--- a/netbox/templates/tenancy/tenant.html
+++ b/netbox/templates/tenancy/tenant.html
@@ -87,7 +87,7 @@
             </div>
             <div class="panel-body rendered-markdown">
                 {% if tenant.comments %}
-                    {{ tenant.comments|gfm }}
+                    {{ tenant.comments|markdown }}
                 {% else %}
                     <span class="text-muted">None</span>
                 {% endif %}
diff --git a/netbox/templates/virtualization/cluster.html b/netbox/templates/virtualization/cluster.html
index 92540fd70..0d2b1a968 100644
--- a/netbox/templates/virtualization/cluster.html
+++ b/netbox/templates/virtualization/cluster.html
@@ -115,7 +115,7 @@
             </div>
             <div class="panel-body rendered-markdown">
                 {% if cluster.comments %}
-                    {{ cluster.comments|gfm }}
+                    {{ cluster.comments|markdown }}
                 {% else %}
                     <span class="text-muted">None</span>
                 {% endif %}
diff --git a/netbox/templates/virtualization/virtualmachine.html b/netbox/templates/virtualization/virtualmachine.html
index 8f3bb61d4..b5339f508 100644
--- a/netbox/templates/virtualization/virtualmachine.html
+++ b/netbox/templates/virtualization/virtualmachine.html
@@ -152,7 +152,7 @@
             </div>
             <div class="panel-body rendered-markdown">
                 {% if virtualmachine.comments %}
-                    {{ virtualmachine.comments|gfm }}
+                    {{ virtualmachine.comments|markdown }}
                 {% else %}
                     <span class="text-muted">None</span>
                 {% endif %}
diff --git a/netbox/utilities/templatetags/helpers.py b/netbox/utilities/templatetags/helpers.py
index 51768b56d..5086265db 100644
--- a/netbox/utilities/templatetags/helpers.py
+++ b/netbox/utilities/templatetags/helpers.py
@@ -31,9 +31,8 @@ def placeholder(value):
     return mark_safe(placeholder)
 
 
-# TODO: Rename this filter as py-gfm is no longer in use
 @register.filter(is_safe=True)
-def gfm(value):
+def render_markdown(value):
     """
     Render text as Markdown
     """