diff --git a/pagure/api/user.py b/pagure/api/user.py
index 5560f7e..3550e99 100644
--- a/pagure/api/user.py
+++ b/pagure/api/user.py
@@ -301,7 +301,7 @@ def api_view_user_activity_date(username, date):
         commits = collections.defaultdict(list)
         acts = []
         for activity in activities:
-            if activity.type_ == 'commit':
+            if activity.log_type == 'commit':
                 commits[activity.project.fullname].append(activity)
             else:
                 acts.append(activity)
diff --git a/pagure/lib/__init__.py b/pagure/lib/__init__.py
index 9aff98f..83a6547 100644
--- a/pagure/lib/__init__.py
+++ b/pagure/lib/__init__.py
@@ -3343,7 +3343,7 @@ def log_action(session, action, obj):
     log = model.PagureLog(
         user_id=obj.user_id,
         project_id=project_id,
-        type_=obj.isa,
+        log_type=obj.isa,
         description=desc % arg,
         date=obj.date_created.date(),
         date_created=obj.date_created
diff --git a/pagure/lib/model.py b/pagure/lib/model.py
index e4bfd6b..5d6fd06 100644
--- a/pagure/lib/model.py
+++ b/pagure/lib/model.py
@@ -1594,7 +1594,7 @@ class PagureLog(BASE):
         nullable=True,
         index=True
     )
-    type_ = sa.Column(sa.Text, nullable=False)
+    log_type = sa.Column(sa.Text, nullable=False)
     description = sa.Column(sa.Text, nullable=False)
     date = sa.Column(
         sa.Date,
@@ -1630,7 +1630,7 @@ class PagureLog(BASE):
         '''
         output = {
             'id': self.id,
-            'type': self.type_,
+            'type': self.log_type,
             'description': self.description,
             'date': self.date.strftime('%Y-%m-%d'),
             'date_created': self.date_created.strftime('%s'),