diff --git a/templates/packages/details.html b/templates/packages/details.html
index 873609ee..1784ab79 100644
--- a/templates/packages/details.html
+++ b/templates/packages/details.html
@@ -33,10 +33,10 @@ <h2 class="title">{{ pkg.pkgname }} {{ pkg.pkgver }}-{{ pkg.pkgrel }}</h2>
 		<table class="listing">
 			<tr>
 				<th>Architecture:</th>
-				<td>{{ pkg.get_arch_display }}</td>
+				<td>{{ pkg.arch.name }}</td>
 			</tr><tr>
 				<th>Repository:</th>
-				<td>{{ pkg.get_repo_display|capfirst }}</td>
+				<td>{{ pkg.repo.name|capfirst }}</td>
 			</tr><tr>
 				<th>Description:</th>
 				<td>{{ pkg.pkgdesc }}</td>
diff --git a/templates/packages/search.html b/templates/packages/search.html
index 1e8d2659..b58ad07a 100644
--- a/templates/packages/search.html
+++ b/templates/packages/search.html
@@ -87,8 +87,8 @@ <h4 style="text-align: right">Search Criteria</h4>
 				{% if not user.is_anonymous %}
 				<td><input type="checkbox" name="pkgid" value="{{ pkg.id }}" /></td>
 				{% endif %}
-				<td>{{ pkg.get_arch_display }}</td>
-				<td>{{ pkg.get_repo_display|capfirst }}</td>
+				<td>{{ pkg.arch.name }}</td>
+				<td>{{ pkg.repo.name|capfirst }}</td>
 				<td><a href="{{ pkg.get_absolute_url }}">{{ pkg.pkgname }}</a></td>
 			{% if pkg.needupdate %}
 				<td><span style="color:red">{{ pkg.pkgver }}-{{ pkg.pkgrel }}</span></td>
diff --git a/templates/todolists/view.html b/templates/todolists/view.html
index c8a3e9bb..1ebf810c 100644
--- a/templates/todolists/view.html
+++ b/templates/todolists/view.html
@@ -48,8 +48,8 @@ <h2 class="title">ToDo List: {{ list.name }}</h2>
             {% for pkg in pkgs %}
                 <tr class="{% cycle even,odd %}">
                     <td><a href="/packages/{{ pkg.pkg.id }}/">{{ pkg.pkg.id }}</a></td>
-                    <td>{{ pkg.pkg.get_arch_display }}</td>
-                    <td>{{ pkg.pkg.get_repo_display }}</td>
+                    <td>{{ pkg.pkg.arch.name }}</td>
+                    <td>{{ pkg.pkg.repo.name|capfirst }}</td>
                     <td>{{ pkg.pkg.pkgname }}</td>
                     <td>{{ pkg.pkg.maintainer.get_full_name|default:"Orphan" }}</td>
                     <td>