diff --git a/forums/templates/forums/forum_detail.html b/forums/templates/forums/forum_detail.html
index 7a360ba..d57b7b9 100644
--- a/forums/templates/forums/forum_detail.html
+++ b/forums/templates/forums/forum_detail.html
@@ -2,14 +2,14 @@
 
 {% block content %}
 <a href="{% url 'threads:new' %}" class="btn btn-green">New Thread</a>
-<a href="{% url 'forums:update' object.slug %}" class="btn btn-grey">Update</a>
-<a href="{% url 'forums:visibility' object.slug %}" class="btn btn-grey">Change Visibility</a>
+<a href="{% url 'forums:update' forum.slug %}" class="btn btn-grey">Update</a>
+<a href="{% url 'forums:visibility' forum.slug %}" class="btn btn-grey">Change Visibility</a>
 
-<h1>{{ object.name }}</h1>
-<p>{{ object.description }}</p>
+<h1>{{ forum.name }}</h1>
+<p>{{ forum.description }}</p>
 
 <ul>
-    {% for thread in object.threads %}
+    {% for thread in forum.threads %}
     <li>
         <a href="{% url 'threads:show' thread.slug %}">{{ thread.subject }}</a>
     </li>
diff --git a/forums/templates/forums/forum_form.html b/forums/templates/forums/forum_form.html
index 5a6e38d..c58ac3f 100644
--- a/forums/templates/forums/forum_form.html
+++ b/forums/templates/forums/forum_form.html
@@ -4,7 +4,7 @@
 <form action="" method="post">
     {% csrf_token %}
     {{ form.as_p }}
-    {% if object %}
+    {% if forum %}
     <input type="submit" value="Update Forum" class="btn btn-green" />
     {% else %}
     <input type="submit" value="Create Forum" class="btn btn-green" />
diff --git a/forums/templates/forums/forum_list.html b/forums/templates/forums/forum_list.html
index 8be54d5..a457df0 100644
--- a/forums/templates/forums/forum_list.html
+++ b/forums/templates/forums/forum_list.html
@@ -12,7 +12,7 @@
         </tr>
     </thead>
     <tbody>
-        {% for forum in object_list %}
+        {% for forum in forums %}
         <tr>
             <td><a href="{% url 'forums:show' forum.slug %}">{{ forum.name }}</a></td>
             <td>{{ forum.description }}</td>
diff --git a/forums/views.py b/forums/views.py
index 5c0d801..cfa1ddd 100644
--- a/forums/views.py
+++ b/forums/views.py
@@ -7,6 +7,7 @@
 
 
 class ForumIndexView(ListView):
+    context_object_name = 'forums'
     model = Forum
 
 
@@ -29,6 +30,7 @@ def get_object(self):
 
 
 class UpdateForumView(ForumMixin, UpdateView):
+    context_object_name = 'forum'
     model = Forum
     fields = ['name', 'description']
 
@@ -37,6 +39,7 @@ def get_success_url(self):
 
 
 class ChangeForumVisibilityView(UpdateView):
+    context_object_name = 'forum'
     model = Forum
     fields = ['active']
 
@@ -45,4 +48,5 @@ def get_success_url(self):
 
 
 class ShowForumView(ForumMixin, DetailView):
+    context_object_name = 'forum'
     model = Forum
diff --git a/threads/templates/threads/thread_detail.html b/threads/templates/threads/thread_detail.html
index 2f8dd37..5ba9b38 100644
--- a/threads/templates/threads/thread_detail.html
+++ b/threads/templates/threads/thread_detail.html
@@ -1,7 +1,7 @@
 {% extends "base.html" %}
 
 {% block content %}
-<h1>{{ object.subject }}</h1>
-<p>Forum: <a href="{% url 'forums:show' object.forum.slug %}">{{ object.forum.name }}</a></p>
-<p>{{ object.created }}</p>
+<h1>{{ thread.subject }}</h1>
+<p>Forum: <a href="{% url 'forums:show' thread.forum.slug %}">{{ thread.forum.name }}</a></p>
+<p>{{ thread.created }}</p>
 {% endblock content %}
\ No newline at end of file
diff --git a/threads/templates/threads/thread_form.html b/threads/templates/threads/thread_form.html
index cbef894..2546c7e 100644
--- a/threads/templates/threads/thread_form.html
+++ b/threads/templates/threads/thread_form.html
@@ -4,7 +4,7 @@
 <form action="" method="post">
     {% csrf_token %}
     {{ form.as_p }}
-    {% if object %}
+    {% if thread %}
     <input type="submit" value="Update Thread" class="btn btn-green" />
     {% else %}
     <input type="submit" value="Create Thread" class="btn btn-green" />
diff --git a/threads/views.py b/threads/views.py
index 49059b5..c6d41af 100644
--- a/threads/views.py
+++ b/threads/views.py
@@ -16,6 +16,7 @@ def get_object(self):
 
 
 class NewThreadView(CreateView):
+    context_object_name = 'thread'
     model = Thread
     fields = ['subject', 'forum']
 
@@ -25,3 +26,4 @@ def get_success_url(self):
 
 class ShowThreadView(ThreadMixin, DetailView):
     model = Thread
+    context_object_name = 'thread'