diff --git a/apps/documents/metadata.py b/apps/metadata/api.py
similarity index 100%
rename from apps/documents/metadata.py
rename to apps/metadata/api.py
diff --git a/apps/documents/classes.py b/apps/metadata/classes.py
similarity index 100%
rename from apps/documents/classes.py
rename to apps/metadata/classes.py
diff --git a/apps/permissions/views.py b/apps/permissions/views.py
index d479f03b9f..8bcfc275fe 100644
--- a/apps/permissions/views.py
+++ b/apps/permissions/views.py
@@ -1,4 +1,5 @@
 from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import ugettext
 from django.http import HttpResponseRedirect
 from django.shortcuts import render_to_response, get_object_or_404
 from django.template import RequestContext
@@ -44,12 +45,12 @@ def _role_permission_link(requester, permission, permission_list):
         return template % {
             'url': reverse('permission_revoke',
                 args=[permission.id, ct.app_label, ct.model, requester.id]),
-            'icon': 'delete', 'text': _(u'Revoke')}
+            'icon': 'delete', 'text': ugettext(u'Revoke')}
     else:
         return template % {
             'url': reverse('permission_grant',
                 args=[permission.id, ct.app_label, ct.model, requester.id]),
-            'icon': 'add', 'text': _(u'Grant')}
+            'icon': 'add', 'text': ugettext(u'Grant')}
 
 
 def role_permissions(request, role_id):