diff --git a/zerver/lib/realm_description.py b/zerver/lib/realm_description.py
index 83bf29ebc4..d674dcb557 100644
--- a/zerver/lib/realm_description.py
+++ b/zerver/lib/realm_description.py
@@ -4,15 +4,15 @@ from zerver.lib.cache import (
     realm_text_description_cache_key,
 )
 from zerver.lib.html_to_text import html_to_text
-from zerver.lib.markdown import convert as bugdown_convert
+from zerver.lib.markdown import convert as markdown_convert
 from zerver.models import Realm
 
 
 @cache_with_key(realm_rendered_description_cache_key, timeout=3600*24*7)
 def get_realm_rendered_description(realm: Realm) -> str:
     realm_description_raw = realm.description or "The coolest place in the universe."
-    return bugdown_convert(realm_description_raw, message_realm=realm,
-                           no_previews=True)
+    return markdown_convert(realm_description_raw, message_realm=realm,
+                            no_previews=True)
 
 @cache_with_key(realm_text_description_cache_key, timeout=3600*24*7)
 def get_realm_text_description(realm: Realm) -> str:
diff --git a/zerver/lib/streams.py b/zerver/lib/streams.py
index 9b9b8f0c9d..67e47e5382 100644
--- a/zerver/lib/streams.py
+++ b/zerver/lib/streams.py
@@ -4,7 +4,7 @@ from django.conf import settings
 from django.db.models.query import QuerySet
 from django.utils.translation import ugettext as _
 
-from zerver.lib.markdown import convert as bugdown_convert
+from zerver.lib.markdown import convert as markdown_convert
 from zerver.lib.request import JsonableError
 from zerver.models import (
     DefaultStreamGroup,
@@ -45,7 +45,7 @@ def get_default_value_for_history_public_to_subscribers(
     return history_public_to_subscribers
 
 def render_stream_description(text: str) -> str:
-    return bugdown_convert(text, no_previews=True)
+    return markdown_convert(text, no_previews=True)
 
 def send_stream_creation_event(stream: Stream, user_ids: List[int]) -> None:
     event = dict(type="stream", op="create",
diff --git a/zerver/tests/test_custom_profile_data.py b/zerver/tests/test_custom_profile_data.py
index 022a44db50..0aff7921f3 100644
--- a/zerver/tests/test_custom_profile_data.py
+++ b/zerver/tests/test_custom_profile_data.py
@@ -10,7 +10,7 @@ from zerver.lib.actions import (
     try_reorder_realm_custom_profile_fields,
 )
 from zerver.lib.external_accounts import DEFAULT_EXTERNAL_ACCOUNTS
-from zerver.lib.markdown import convert as bugdown_convert
+from zerver.lib.markdown import convert as markdown_convert
 from zerver.lib.test_classes import ZulipTestCase
 from zerver.lib.test_helpers import queries_captured
 from zerver.models import (
@@ -536,7 +536,7 @@ class UpdateCustomProfileFieldTest(CustomProfileFieldTestCase):
         expected_rendered_value: Dict[Union[int, float, str, None], Union[str, None]] = {}
         for f in data:
             if f['field'].is_renderable():
-                expected_rendered_value[f['id']] = bugdown_convert(f['value'])
+                expected_rendered_value[f['id']] = markdown_convert(f['value'])
             else:
                 expected_rendered_value[f['id']] = None