diff --git a/config/settings.py b/config/settings.py
index d688f2c..cf71219 100644
--- a/config/settings.py
+++ b/config/settings.py
@@ -237,3 +237,4 @@
 CACHE_RECENT_PUBLISHED_POSTS: bool = False
 RECENT_PUBLISHED_POSTS_COUNT: int = 20
 BLOG_TITLE = "stuartm.nz"
+MARKDOWN_EXTENSIONS = ["fenced_code", "codehilite"]
diff --git a/djpress/feeds.py b/djpress/feeds.py
index a5b4036..407b0ce 100644
--- a/djpress/feeds.py
+++ b/djpress/feeds.py
@@ -20,14 +20,18 @@ class PostFeed(Feed):
 
     def items(self: "PostFeed") -> "models.QuerySet":
         """Return the most recent posts."""
-        return Post.post_objects.get_recent_published_content()
+        return Post.post_objects.get_recent_published_posts()
 
     def item_title(self: "PostFeed", item: Post) -> str:
         """Return the title of the post."""
         return item.title
 
     def item_description(self: "PostFeed", item: Post) -> str:
-        """Return the description of the post."""
+        """Return the description of the post.
+
+        This is taken from the truncated content of the post converted to HTML from
+        Markdown.
+        """
         description = item.truncated_content_markdown
         if item.is_truncated:
             description += f'<p><a href="{self.item_link(item)}">Read more</a></p>'
@@ -35,4 +39,4 @@ def item_description(self: "PostFeed", item: Post) -> str:
 
     def item_link(self: "PostFeed", item: Post) -> str:
         """Return the link to the post."""
-        return reverse("djpress:content_detail", args=[item.slug])
+        return reverse("djpress:post_detail", args=[item.slug])
diff --git a/djpress/migrations/0002_rename_content_type_post_post_type.py b/djpress/migrations/0002_rename_content_type_post_post_type.py
new file mode 100644
index 0000000..040dd42
--- /dev/null
+++ b/djpress/migrations/0002_rename_content_type_post_post_type.py
@@ -0,0 +1,18 @@
+# Generated by Django 5.0.4 on 2024-05-03 11:04
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('djpress', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.RenameField(
+            model_name='post',
+            old_name='content_type',
+            new_name='post_type',
+        ),
+    ]
diff --git a/djpress/models/post.py b/djpress/models/post.py
index d13d11a..a297a03 100644
--- a/djpress/models/post.py
+++ b/djpress/models/post.py
@@ -1,6 +1,5 @@
 """Post model."""
 
-import logging
 from typing import ClassVar
 
 import markdown
@@ -12,17 +11,15 @@
 
 from config.settings import (
     CACHE_RECENT_PUBLISHED_POSTS,
+    MARKDOWN_EXTENSIONS,
     RECENT_PUBLISHED_POSTS_COUNT,
     TRUNCATE_TAG,
 )
 from djpress.models import Category
 
-logger = logging.getLogger(__name__)
+md = markdown.Markdown(extensions=MARKDOWN_EXTENSIONS, output_format="html")
 
-markdown_extensions = ["fenced_code", "codehilite"]
-md = markdown.Markdown(extensions=markdown_extensions, output_format="html")
-
-PUBLISHED_CONTENT_CACHE_KEY = "published_content"
+PUBLISHED_POSTS_CACHE_KEY = "published_posts"
 
 
 class PostsManager(models.Manager):
@@ -30,9 +27,9 @@ class PostsManager(models.Manager):
 
     def get_queryset(self: "PostsManager") -> models.QuerySet:
         """Return the queryset for published posts."""
-        return super().get_queryset().filter(content_type="post").order_by("-date")
+        return super().get_queryset().filter(post_type="post").order_by("-date")
 
-    def _get_published_content(self: "PostsManager") -> models.QuerySet:
+    def _get_published_posts(self: "PostsManager") -> models.QuerySet:
         """Returns all published posts.
 
         For a post to be considered published, it must meet the following requirements:
@@ -44,26 +41,25 @@ def _get_published_content(self: "PostsManager") -> models.QuerySet:
             date__lte=timezone.now(),
         )
 
-    def get_recent_published_content(self: "PostsManager") -> models.QuerySet:
+    def get_recent_published_posts(self: "PostsManager") -> models.QuerySet:
         """Return recent published posts.
 
         If CACHE_RECENT_PUBLISHED_POSTS is set to True, we return the cached queryset.
         """
         if CACHE_RECENT_PUBLISHED_POSTS:
-            return self._get_cached_recent_published_content()
+            return self._get_cached_recent_published_posts()
 
-        return self._get_published_content().prefetch_related("categories", "author")[
+        return self._get_published_posts().prefetch_related("categories", "author")[
             :RECENT_PUBLISHED_POSTS_COUNT
         ]
 
-    def _get_cached_recent_published_content(self: "PostsManager") -> models.QuerySet:
+    def _get_cached_recent_published_posts(self: "PostsManager") -> models.QuerySet:
         """Return the cached recent published posts queryset.
 
         If there are any future posts, we calculate the seconds until that post, then we
         set the timeout to that number of seconds.
         """
-        queryset = cache.get(PUBLISHED_CONTENT_CACHE_KEY)
-        logger.debug(f"Getting posts from cache: {queryset=}")
+        queryset = cache.get(PUBLISHED_POSTS_CACHE_KEY)
 
         if queryset is None:
             queryset = (
@@ -78,25 +74,18 @@ def _get_cached_recent_published_content(self: "PostsManager") -> models.QuerySe
             if future_posts.exists():
                 future_post = future_posts[0]
                 timeout = (future_post.date - timezone.now()).total_seconds()
-                logger.debug(f"Future post found, setting timeout to {timeout} seconds")
             else:
-                logger.debug("No future posts found, setting timeout to None")
                 timeout = None
 
             queryset = queryset.filter(date__lte=timezone.now())[
                 :RECENT_PUBLISHED_POSTS_COUNT
             ]
-            logger.debug(f"Setting posts in cache: {queryset=}")
-            logger.debug(f"With a timeout of: {timeout=}")
             cache.set(
-                PUBLISHED_CONTENT_CACHE_KEY,
+                PUBLISHED_POSTS_CACHE_KEY,
                 queryset,
                 timeout=timeout,
             )
 
-            logger.debug(
-                f"Posts set in cache: {cache.get(PUBLISHED_CONTENT_CACHE_KEY)=}",
-            )
         return queryset
 
     def get_published_post_by_slug(
@@ -107,33 +96,31 @@ def get_published_post_by_slug(
 
         Must have a date less than or equal to the current date/time based on its slug.
         """
-        logger.debug(f"Getting post by slug: {slug=}")
-
         # First, try to get the post from the cache
-        posts = self.get_recent_published_content()
+        posts = self.get_recent_published_posts()
         post = next((post for post in posts if post.slug == slug), None)
 
         # If the post is not found in the cache, fetch it from the database
         if not post:
             try:
-                post = self._get_published_content().get(slug=slug)
+                post = self._get_published_posts().get(slug=slug)
             except Post.DoesNotExist as exc:
                 msg = "Post not found"
                 raise ValueError(msg) from exc
 
         return post
 
-    def get_published_content_by_category(
+    def get_published_posts_by_category(
         self: "PostsManager",
         category: Category,
     ) -> models.QuerySet:
-        """Return all published posts.
+        """Return all published posts for a given category.
 
         Must have a date less than or equal to the current date/time for a specific
         category, ordered by date in descending order.
         """
         return (
-            self._get_published_content()
+            self._get_published_posts()
             .filter(categories=category)
             .prefetch_related("categories", "author")
         )
@@ -152,7 +139,7 @@ class Post(models.Model):
     date = models.DateTimeField(default=timezone.now)
     modified_date = models.DateTimeField(auto_now=True)
     status = models.CharField(max_length=10, choices=STATUS_CHOICES, default="draft")
-    content_type = models.CharField(
+    post_type = models.CharField(
         max_length=10,
         choices=CONTENT_TYPE_CHOICES,
         default="post",
@@ -164,13 +151,13 @@ class Post(models.Model):
     post_objects: "PostsManager" = PostsManager()
 
     class Meta:
-        """Meta options for the content model."""
+        """Meta options for the Post model."""
 
         verbose_name = "post"
         verbose_name_plural = "posts"
 
     def __str__(self: "Post") -> str:
-        """Return the string representation of the content."""
+        """Return the string representation of the post."""
         return self.title
 
     def save(self: "Post", *args, **kwargs) -> None:  # noqa: ANN002, ANN003
@@ -185,7 +172,6 @@ def save(self: "Post", *args, **kwargs) -> None:  # noqa: ANN002, ANN003
     def render_markdown(self: "Post", markdown_text: str) -> str:
         """Return the markdown text as HTML."""
         html = md.convert(markdown_text)
-        logger.debug(f"Converted markdown to HTML: {html=}")
         md.reset()
 
         return html
@@ -209,3 +195,11 @@ def truncated_content_markdown(self: "Post") -> str:
     def is_truncated(self: "Post") -> bool:
         """Return whether the content is truncated."""
         return TRUNCATE_TAG in self.content
+
+    @property
+    def author_display_name(self: "Post") -> str:
+        """Return the author's display name.
+
+        If the author has a first name, return that. Otherwise, return the username.
+        """
+        return self.author.first_name or self.author.username
diff --git a/djpress/signals.py b/djpress/signals.py
index fd1513d..d51c336 100644
--- a/djpress/signals.py
+++ b/djpress/signals.py
@@ -9,7 +9,7 @@
     Category,
 )
 from djpress.models.post import (
-    PUBLISHED_CONTENT_CACHE_KEY,
+    PUBLISHED_POSTS_CACHE_KEY,
     Post,
 )
 
@@ -25,4 +25,4 @@ def invalidate_category_cache(**kwargs) -> None:  # noqa: ARG001, ANN003
 @receiver(post_delete, sender=Post)
 def invalidate_published_content_cache(**kwargs) -> None:  # noqa: ARG001, ANN003
     """Invalidate the published posts cache."""
-    cache.delete(PUBLISHED_CONTENT_CACHE_KEY)
+    cache.delete(PUBLISHED_POSTS_CACHE_KEY)
diff --git a/djpress/templates/djpress/index.html b/djpress/templates/djpress/index.html
index 39086b7..1886a63 100644
--- a/djpress/templates/djpress/index.html
+++ b/djpress/templates/djpress/index.html
@@ -22,7 +22,7 @@ <h1><a href="{% url "djpress:index" %}">{% get_blog_title %}</a></h1>
         <article>
           <header>
             <h1>{{ post.title }}</h1>
-            <p>By <span rel="author">{{ post.author.first_name }}</span></p>
+            <p>By <span rel="author">{{ post.author_display_name }}</span></p>
             <p><time datetime="2023-05-01">{{ post.date }}</time></p>
           </header>
           <section>
@@ -52,15 +52,15 @@ <h1>{{ category.name }}</h1>
 
           <article>
             <header>
-              <h1><a href="{% url 'djpress:content_detail' post.slug %}">{{ post.title }}</a></h1>
-              <p>By <span rel="author">{{ post.author.first_name }}</span></p>
+              <h1><a href="{% url 'djpress:post_detail' post.slug %}">{{ post.title }}</a></h1>
+              <p>By <span rel="author">{{ post.author_display_name }}</span></p>
               <p><time datetime="2023-05-01">{{ post.date }}</time></p>
             </header>
             <section>
               {{ post.truncated_content_markdown|safe }}
 
               {% if post.is_truncated %}
-                <p><a href="{% url 'djpress:content_detail' post.slug %}">Read more</a></p>
+                <p><a href="{% url 'djpress:post_detail' post.slug %}">Read more</a></p>
               {% endif %}
             </section>
             <footer>
diff --git a/djpress/templatetags/djpress_tags.py b/djpress/templatetags/djpress_tags.py
index 721d917..19a45fb 100644
--- a/djpress/templatetags/djpress_tags.py
+++ b/djpress/templatetags/djpress_tags.py
@@ -16,13 +16,13 @@ def get_categories() -> models.QuerySet[Category] | None:
 
 
 @register.simple_tag
-def get_recent_published_content() -> models.QuerySet[Category] | None:
+def get_recent_published_posts() -> models.QuerySet[Category] | None:
     """Return recent published posts from the cache."""
-    return Post.post_objects.get_recent_published_content()
+    return Post.post_objects.get_recent_published_posts()
 
 
 @register.simple_tag
-def get_single_published_content(slug: str) -> Post | None:
+def get_single_published_post(slug: str) -> Post | None:
     """Return a single published post by slug."""
     return Post.post_objects.get_published_post_by_slug(slug)
 
diff --git a/djpress/tests/test_models.py b/djpress/tests/test_models.py
index f177a50..ed87d15 100644
--- a/djpress/tests/test_models.py
+++ b/djpress/tests/test_models.py
@@ -27,14 +27,14 @@ def test_content_model():
         content="This is a test content.",
         author=user,
         status="published",
-        content_type="post",
+        post_type="post",
     )
     content.categories.add(category)
     assert content.title == "Test Content"
     assert content.slug == "test-content"
     assert content.author == user
     assert content.status == "published"
-    assert content.content_type == "post"
+    assert content.post_type == "post"
     assert content.categories.count() == 1
     assert str(content) == "Test Content"
 
@@ -50,7 +50,7 @@ def test_content_methods():
         content="This is test post 1.",
         author=user,
         status="published",
-        content_type="post",
+        post_type="post",
     ).categories.add(category1)
     Post.post_objects.create(
         title="Test Post 2",
@@ -58,15 +58,15 @@ def test_content_methods():
         content="This is test post 2.",
         author=user,
         status="draft",
-        content_type="post",
+        post_type="post",
     )
     assert Post.post_objects.all().count() == 2
     assert (
         Post.post_objects.get_published_post_by_slug("test-post-1").title
         == "Test Post 1"
     )
-    assert Post.post_objects.get_published_content_by_category(category1).count() == 1
-    assert Post.post_objects.get_published_content_by_category(category2).count() == 0
+    assert Post.post_objects.get_published_posts_by_category(category1).count() == 1
+    assert Post.post_objects.get_published_posts_by_category(category2).count() == 0
 
 
 @pytest.mark.django_db
@@ -78,7 +78,7 @@ def test_get_published_content_with_future_date():
         content="This is a past post.",
         author=user,
         status="published",
-        content_type="post",
+        post_type="post",
         date=timezone.now() - timezone.timedelta(days=1),
     )
     Post.post_objects.create(
@@ -87,11 +87,11 @@ def test_get_published_content_with_future_date():
         content="This is a future post.",
         author=user,
         status="published",
-        content_type="post",
+        post_type="post",
         date=timezone.now() + timezone.timedelta(days=1),
     )
     assert Post.post_objects.all().count() == 2
-    assert Post.post_objects._get_published_content().count() == 1
+    assert Post.post_objects._get_published_posts().count() == 1
 
 
 @pytest.mark.django_db
@@ -103,7 +103,7 @@ def test_get_published_content_ordering():
         content="This is an older post.",
         author=user,
         status="published",
-        content_type="post",
+        post_type="post",
         date=timezone.now() - timezone.timedelta(days=2),
     )
     Post.post_objects.create(
@@ -112,7 +112,7 @@ def test_get_published_content_ordering():
         content="This is a newer post.",
         author=user,
         status="published",
-        content_type="post",
+        post_type="post",
         date=timezone.now() - timezone.timedelta(days=1),
     )
     posts = Post.post_objects.all()
@@ -129,7 +129,7 @@ def test_get_published_post_by_slug_with_future_date():
         content="This is a future post.",
         author=user,
         status="published",
-        content_type="post",
+        post_type="post",
         date=timezone.now() + timezone.timedelta(days=1),
     )
     with pytest.raises(ValueError):
@@ -146,7 +146,7 @@ def test_get_published_content_by_category_with_future_date():
         content="This is a past post.",
         author=user,
         status="published",
-        content_type="post",
+        post_type="post",
         date=timezone.now() - timezone.timedelta(days=1),
     ).categories.add(category)
     Post.post_objects.create(
@@ -155,10 +155,10 @@ def test_get_published_content_by_category_with_future_date():
         content="This is a future post.",
         author=user,
         status="published",
-        content_type="post",
+        post_type="post",
         date=timezone.now() + timezone.timedelta(days=1),
     ).categories.add(category)
-    assert Post.post_objects.get_published_content_by_category(category).count() == 1
+    assert Post.post_objects.get_published_posts_by_category(category).count() == 1
 
 
 @pytest.mark.django_db
diff --git a/djpress/tests/test_published_content_cache.py b/djpress/tests/test_published_posts_cache.py
similarity index 73%
rename from djpress/tests/test_published_content_cache.py
rename to djpress/tests/test_published_posts_cache.py
index 1aafb4b..ff194e4 100644
--- a/djpress/tests/test_published_content_cache.py
+++ b/djpress/tests/test_published_posts_cache.py
@@ -5,7 +5,7 @@
 from django.utils import timezone
 
 from djpress.models import Post
-from djpress.models.post import PUBLISHED_CONTENT_CACHE_KEY
+from djpress.models.post import PUBLISHED_POSTS_CACHE_KEY
 
 
 @pytest.fixture(autouse=True)
@@ -22,7 +22,7 @@ def test_get_cached_content():
         content="This is a test post.",
         author=user,
         status="published",
-        content_type="post",
+        post_type="post",
         date=timezone.now(),
     )
     Post.post_objects.create(
@@ -30,21 +30,21 @@ def test_get_cached_content():
         content="This is another test post.",
         author=user,
         status="published",
-        content_type="post",
+        post_type="post",
         date=timezone.now(),
     )
 
     # Call the _get_cached_recent_published_content method
-    queryset = Post.post_objects._get_cached_recent_published_content()
+    queryset = Post.post_objects._get_cached_recent_published_posts()
 
     # Assert that the queryset is cached
-    cached_queryset = cache.get(PUBLISHED_CONTENT_CACHE_KEY)
+    cached_queryset = cache.get(PUBLISHED_POSTS_CACHE_KEY)
     assert cached_queryset is not None
     assert len(queryset) == 2
     assert len(cached_queryset) == 2
 
     # Assert that subsequent calls retrieve the queryset from cache
-    queryset2 = Post.post_objects._get_cached_recent_published_content()
+    queryset2 = Post.post_objects._get_cached_recent_published_posts()
     assert list(queryset2) == list(cached_queryset)
 
 
@@ -57,15 +57,15 @@ def test_cache_invalidation_on_save():
         content="This is a test post.",
         author=user,
         status="published",
-        content_type="post",
+        post_type="post",
         date=timezone.now(),
     )
 
     # Call the get_cached_published_content method
-    queryset = Post.post_objects._get_cached_recent_published_content()
+    queryset = Post.post_objects._get_cached_recent_published_posts()
 
     # Assert that the queryset is cached
-    cached_queryset = cache.get(PUBLISHED_CONTENT_CACHE_KEY)
+    cached_queryset = cache.get(PUBLISHED_POSTS_CACHE_KEY)
     assert cached_queryset is not None
     assert len(queryset) == 1
 
@@ -74,14 +74,14 @@ def test_cache_invalidation_on_save():
     content.save()
 
     # Assert that the cache is invalidated
-    cached_queryset = cache.get(PUBLISHED_CONTENT_CACHE_KEY)
+    cached_queryset = cache.get(PUBLISHED_POSTS_CACHE_KEY)
     assert cached_queryset is None
 
     # Call the get_cached_published_content method again
-    queryset2 = Post.post_objects._get_cached_recent_published_content()
+    queryset2 = Post.post_objects._get_cached_recent_published_posts()
 
     # Assert that the queryset is cached again with the updated data
-    cached_queryset2 = cache.get(PUBLISHED_CONTENT_CACHE_KEY)
+    cached_queryset2 = cache.get(PUBLISHED_POSTS_CACHE_KEY)
     assert cached_queryset2 is not None
     assert len(queryset2) == 1
     assert queryset2[0].title == "Updated Content 1"
@@ -96,15 +96,15 @@ def test_cache_invalidation_on_delete():
         content="This is a test post.",
         author=user,
         status="published",
-        content_type="post",
+        post_type="post",
         date=timezone.now(),
     )
 
     # Call the get_cached_published_content method
-    queryset = Post.post_objects._get_cached_recent_published_content()
+    queryset = Post.post_objects._get_cached_recent_published_posts()
 
     # Assert that the queryset is cached
-    cached_queryset = cache.get(PUBLISHED_CONTENT_CACHE_KEY)
+    cached_queryset = cache.get(PUBLISHED_POSTS_CACHE_KEY)
     assert cached_queryset is not None
     assert len(queryset) == 1
 
@@ -112,13 +112,13 @@ def test_cache_invalidation_on_delete():
     content.delete()
 
     # Assert that the cache is invalidated
-    cached_queryset = cache.get(PUBLISHED_CONTENT_CACHE_KEY)
+    cached_queryset = cache.get(PUBLISHED_POSTS_CACHE_KEY)
     assert cached_queryset is None
 
     # Call the get_cached_published_content method again
-    queryset2 = Post.post_objects._get_cached_recent_published_content()
+    queryset2 = Post.post_objects._get_cached_recent_published_posts()
 
     # Assert that the queryset is cached again with the updated data
-    cached_queryset2 = cache.get(PUBLISHED_CONTENT_CACHE_KEY)
+    cached_queryset2 = cache.get(PUBLISHED_POSTS_CACHE_KEY)
     assert cached_queryset2 is not None
     assert len(queryset2) == 0
diff --git a/djpress/tests/test_views.py b/djpress/tests/test_views.py
index c90f9e7..d9d4ac1 100644
--- a/djpress/tests/test_views.py
+++ b/djpress/tests/test_views.py
@@ -22,9 +22,9 @@ def test_content_detail_view(client):
         content="This is a test post.",
         author=user,
         status="published",
-        content_type="post",
+        post_type="post",
     )
-    url = reverse("djpress:content_detail", args=[content.slug])
+    url = reverse("djpress:post_detail", args=[content.slug])
     response = client.get(url)
     assert response.status_code == 200
     assert "post" in response.context
@@ -32,7 +32,7 @@ def test_content_detail_view(client):
 
 @pytest.mark.django_db
 def test_content_detail_not_exist(client):
-    url = reverse("djpress:content_detail", args=["foobar-does-not-exist"])
+    url = reverse("djpress:post_detail", args=["foobar-does-not-exist"])
     response = client.get(url)
     assert response.status_code == 404
 
diff --git a/djpress/urls.py b/djpress/urls.py
index 2a36865..56ae87e 100644
--- a/djpress/urls.py
+++ b/djpress/urls.py
@@ -3,12 +3,12 @@
 from django.urls import path
 
 from djpress.feeds import PostFeed
-from djpress.views import category_posts, content_detail, index
+from djpress.views import category_posts, index, post_detail
 
 app_name = "djpress"
 urlpatterns = [
     path("", index, name="index"),
-    path("post/<slug:slug>/", content_detail, name="content_detail"),
+    path("post/<slug:slug>/", post_detail, name="post_detail"),
     path("category/<slug:slug>/", category_posts, name="category_posts"),
     path("rss/", PostFeed(), name="rss_feed"),
 ]
diff --git a/djpress/views.py b/djpress/views.py
index ba7ed17..e9114a1 100644
--- a/djpress/views.py
+++ b/djpress/views.py
@@ -8,7 +8,7 @@
 
 def index(request: HttpRequest) -> HttpResponse:
     """View for the index page."""
-    posts = Post.post_objects.get_recent_published_content()
+    posts = Post.post_objects.get_recent_published_posts()
 
     return render(
         request,
@@ -17,8 +17,8 @@ def index(request: HttpRequest) -> HttpResponse:
     )
 
 
-def content_detail(request: HttpRequest, slug: str) -> HttpResponse:
-    """View for a single content page."""
+def post_detail(request: HttpRequest, slug: str) -> HttpResponse:
+    """View for a single post."""
     try:
         post = Post.post_objects.get_published_post_by_slug(slug)
     except ValueError as exc:
@@ -40,7 +40,7 @@ def category_posts(request: HttpRequest, slug: str) -> HttpResponse:
         msg = "Category not found"
         raise Http404(msg) from exc
 
-    posts = Post.post_objects.get_published_content_by_category(category)
+    posts = Post.post_objects.get_published_posts_by_category(category)
 
     return render(
         request,
diff --git a/templates/djpress/index.html b/templates/djpress/index.html
index 95378c8..c340a6e 100644
--- a/templates/djpress/index.html
+++ b/templates/djpress/index.html
@@ -25,13 +25,13 @@
 
   {% if post %}
 
-    {% include "djpress/snippets/content_detail.html" %}
+    {% include "djpress/snippets/post_detail.html" %}
 
   {% elif posts %}
 
     {% for post in posts %}
 
-      {% include "djpress/snippets/content_summary.html" %}
+      {% include "djpress/snippets/post_summary.html" %}
 
     {% endfor %}
 
diff --git a/templates/djpress/snippets/content_detail.html b/templates/djpress/snippets/post_detail.html
similarity index 94%
rename from templates/djpress/snippets/content_detail.html
rename to templates/djpress/snippets/post_detail.html
index aaaf6a7..c15897f 100644
--- a/templates/djpress/snippets/content_detail.html
+++ b/templates/djpress/snippets/post_detail.html
@@ -1,5 +1,5 @@
 <h1>{{ post.title }}</h1>
-<p class="text-muted">Posted on {{ post.date }} by {{ post.author.first_name }}</p>
+<p class="text-muted">Posted on {{ post.date }} by {{ post.author_display_name }}</p>
 <p>
   Categories:
   {% for category in post.categories.all %}
diff --git a/templates/djpress/snippets/content_summary.html b/templates/djpress/snippets/post_summary.html
similarity index 64%
rename from templates/djpress/snippets/content_summary.html
rename to templates/djpress/snippets/post_summary.html
index a6938aa..abf59f9 100644
--- a/templates/djpress/snippets/content_summary.html
+++ b/templates/djpress/snippets/post_summary.html
@@ -1,9 +1,9 @@
 <div class="card my-4">
   <div class="card-body">
-    <h2 class="card-title"><a href="{% url 'djpress:content_detail' post.slug %}">{{ post.title }}</a></h2>
+    <h2 class="card-title"><a href="{% url 'djpress:post_detail' post.slug %}">{{ post.title }}</a></h2>
     <p class="card-text">{{ post.truncated_content_markdown|safe }}</p>
     {% if post.is_truncated %}
-      <p><a href="{% url 'djpress:content_detail' post.slug %}">Read more</a></p>
+      <p><a href="{% url 'djpress:post_detail' post.slug %}">Read more</a></p>
     {% endif %}
     <p>
       Categories:
@@ -13,6 +13,6 @@ <h2 class="card-title"><a href="{% url 'djpress:content_detail' post.slug %}">{{
     </p>
   </div>
   <div class="card-footer text-muted">
-    Posted on {{ post.date }} by {{ post.author.first_name }}
+    Posted on {{ post.date }} by {{ post.author_display_name }}
   </div>
 </div>