diff --git a/pagure/lib/__init__.py b/pagure/lib/__init__.py
index cefff2b..7afc553 100644
--- a/pagure/lib/__init__.py
+++ b/pagure/lib/__init__.py
@@ -545,7 +545,7 @@ def add_pull_request_comment(session, request, commit, filename, row,
     session.flush()
 
     pagure.lib.git.update_git(
-        request, repo=request.repo, repofolder=requestfolder)
+        request, repo=request.project, repofolder=requestfolder)
 
     if notify:
         pagure.lib.notify.notify_pull_request_comment(pr_comment, user_obj)
@@ -695,7 +695,7 @@ def new_pull_request(session, repo_from, branch_from,
     session.flush()
 
     pagure.lib.git.update_git(
-        request, repo=request.repo, repofolder=requestfolder)
+        request, repo=request.project, repofolder=requestfolder)
 
     if notify:
         pagure.lib.notify.notify_new_pull_request(request)
@@ -1186,7 +1186,7 @@ def close_pull_request(session, request, user, requestfolder, merged=True):
         pagure.lib.notify.notify_cancelled_pull_request(request, user_obj)
 
     pagure.lib.git.update_git(
-        request, repo=request.repo, repofolder=requestfolder)
+        request, repo=request.project, repofolder=requestfolder)
 
     pagure.lib.notify.fedmsg_publish(
         'pull-request.closed',
diff --git a/pagure/lib/model.py b/pagure/lib/model.py
index 6504c50..975feeb 100644
--- a/pagure/lib/model.py
+++ b/pagure/lib/model.py
@@ -619,20 +619,20 @@ class PullRequest(BASE):
     date_created = sa.Column(sa.DateTime, nullable=False,
                              default=datetime.datetime.utcnow)
 
-    repo = relation(
+    project = relation(
         'Project', foreign_keys=[project_id], remote_side=[Project.id],
         backref=backref(
             'requests', cascade="delete, delete-orphan",
         ),
         single_parent=True)
-    repo_from = relation(
+    project_from = relation(
         'Project', foreign_keys=[project_id_from], remote_side=[Project.id])
     user = relation('User', foreign_keys=[user_id],
                     remote_side=[User.id], backref='pull_requests')
 
     def __repr__(self):
         return 'PullRequest(%s, project:%s, user:%s, title:%s)' % (
-            self.id, self.repo.name, self.user.user, self.title
+            self.id, self.project.name, self.user.user, self.title
         )
 
     @property
@@ -640,7 +640,7 @@ class PullRequest(BASE):
         ''' Return a unique reprensetation of the issue as string that
         can be used when sending emails.
         '''
-        return '%s-pull-request-%s@pagure' % (self.repo.name, self.uid)
+        return '%s-pull-request-%s@pagure' % (self.project.name, self.uid)
 
     @property
     def discussion(self):
@@ -658,9 +658,9 @@ class PullRequest(BASE):
             'uid': self.uid,
             'title': self.title,
             'branch': self.branch,
-            'project': self.repo.to_json(),
+            'project': self.project.to_json(),
             'branch_from': self.branch_from,
-            'repo_from': self.repo_from.to_json(),
+            'repo_from': self.project_from.to_json(),
             'date_created': self.date_created.strftime('%s'),
             'user': self.user.to_json(),
             'status': self.status,
@@ -743,7 +743,7 @@ class PullRequestComment(BASE):
         can be used when sending emails.
         '''
         return '%s-pull-request-%s-%s@pagure' % (
-            self.pull_request.repo.name, self.pull_request.uid, self.id)
+            self.pull_request.project.name, self.pull_request.uid, self.id)
 
     @property
     def parent(self):
diff --git a/pagure/lib/notify.py b/pagure/lib/notify.py
index ed170c0..7a5097b 100644
--- a/pagure/lib/notify.py
+++ b/pagure/lib/notify.py
@@ -263,16 +263,16 @@ def notify_new_pull_request(request):
 To reply, visit the link below or just reply to this email
 %s
 """ % (request.user.user,
-       request.repo.name,
+       request.project.name,
        request.title,
        _build_url(
            pagure.APP.config['APP_URL'],
-           request.repo.name,
+           request.project.name,
            'pull-request',
            request.id))
     mail_to = set([cmt.user.default_email for cmt in request.comments])
-    mail_to.add(request.repo.user.default_email)
-    for prouser in request.repo.users:
+    mail_to.add(request.project.user.default_email)
+    for prouser in request.project.users:
         if prouser.default_email:
             mail_to.add(prouser.default_email)
 
@@ -299,16 +299,16 @@ Merged pull-request:
 
 %s
 """ % (user.username,
-       request.repo.name,
+       request.project.name,
        request.title,
        _build_url(
            pagure.APP.config['APP_URL'],
-           request.repo.name,
+           request.project.name,
            'pull-request',
            request.id))
     mail_to = set([cmt.user.default_email for cmt in request.comments])
-    mail_to.add(request.repo.user.default_email)
-    for prouser in request.repo.users:
+    mail_to.add(request.project.user.default_email)
+    for prouser in request.project.users:
         if prouser.default_email:
             mail_to.add(prouser.default_email)
 
@@ -337,16 +337,16 @@ Cancelled pull-request:
 
 %s
 """ % (user.username,
-       request.repo.name,
+       request.project.name,
        request.title,
        _build_url(
            pagure.APP.config['APP_URL'],
-           request.repo.name,
+           request.project.name,
            'pull-request',
            request.id))
     mail_to = set([cmt.user.default_email for cmt in request.comments])
-    mail_to.add(request.repo.user.default_email)
-    for prouser in request.repo.users:
+    mail_to.add(request.project.user.default_email)
+    for prouser in request.project.users:
         if prouser.default_email:
             mail_to.add(prouser.default_email)
 
@@ -377,14 +377,14 @@ To reply, visit the link below or just reply to this email
        comment.comment,
        _build_url(
            pagure.APP.config['APP_URL'],
-           comment.pull_request.repo.name,
+           comment.pull_request.project.name,
            'pull-request',
            comment.pull_request.id))
     mail_to = set([
         cmt.user.default_email
         for cmt in comment.pull_request.comments])
-    mail_to.add(comment.pull_request.repo.user.default_email)
-    for prouser in comment.pull_request.repo.users:
+    mail_to.add(comment.pull_request.project.user.default_email)
+    for prouser in comment.pull_request.project.users:
         if prouser.default_email:
             mail_to.add(prouser.default_email)
 
@@ -393,7 +393,7 @@ To reply, visit the link below or just reply to this email
     send_email(
         text,
         'Update to %s pull-Request #%s `%s`' % (
-            comment.pull_request.repo.name,
+            comment.pull_request.project.name,
             comment.pull_request.id,
             comment.pull_request.title),
         ','.join(mail_to),
diff --git a/pagure/templates/pull_request.html b/pagure/templates/pull_request.html
index d5234bc..81ea53c 100644
--- a/pagure/templates/pull_request.html
+++ b/pagure/templates/pull_request.html
@@ -104,11 +104,11 @@
       <th>From</th>
       <td>
         <a href="{{ url_for('view_repo_branch',
-          username=pull_request.repo_from.user.user if pull_request.repo_from.is_fork,
-          repo=pull_request.repo_from.name,
+          username=pull_request.project_from.user.user if pull_request.project_from.is_fork,
+          repo=pull_request.project_from.name,
           branchname=pull_request.branch_from)
         }}">
-          {{ pull_request.repo_from.fullname }} ({{ pull_request.branch_from }})
+          {{ pull_request.project_from.fullname }} ({{ pull_request.branch_from }})
         </a>
       </td>
     </tr>
@@ -126,9 +126,9 @@
   <ul>
     {% for commit in diff_commits %}
     <li>
-    {% if pull_request and pull_request.status and pull_request.repo_from.is_fork %}
-      <a href="{{ url_for('view_commit', username=pull_request.repo_from.user.user,
-                  repo=pull_request.repo_from.name, commitid=commit.oid.hex)}}">
+    {% if pull_request and pull_request.status and pull_request.project_from.is_fork %}
+      <a href="{{ url_for('view_commit', username=pull_request.project_from.user.user,
+                  repo=pull_request.project_from.name, commitid=commit.oid.hex)}}">
     {% else %}
       <a href="{{ url_for('view_commit', username=username,
                   repo=repo.name, commitid=commit.oid.hex)}}">
@@ -170,8 +170,8 @@
         <a class="button view" href="{{
             url_for(
                 'view_file',
-                username=pull_request.repo_from.user.username,
-                repo=pull_request.repo_from.name,
+                username=pull_request.project_from.user.username,
+                repo=pull_request.project_from.name,
                 identifier=pull_request.branch_from,
                 filename=patch.new_file_path) }}"
         {% else %}
diff --git a/pagure/ui/filters.py b/pagure/ui/filters.py
index beade88..d0b12f4 100644
--- a/pagure/ui/filters.py
+++ b/pagure/ui/filters.py
@@ -138,7 +138,7 @@ def format_loc(loc, commit=None, filename=None, prequest=None, index=None):
                 if authenticated() and (
                         (comment.parent.status is True
                          and comment.user.user == flask.g.fas_user.username)
-                        or is_repo_admin(comment.parent.repo)):
+                        or is_repo_admin(comment.parent.project)):
                     templ_delete = tpl_delete % ({'commentid': comment.id})
 
                 output.append(
diff --git a/pagure/ui/fork.py b/pagure/ui/fork.py
index ad752c4..420effc 100644
--- a/pagure/ui/fork.py
+++ b/pagure/ui/fork.py
@@ -96,7 +96,7 @@ def request_pull(repo, requestid, username=None):
     if not request:
         flask.abort(404, 'Pull-request not found')
 
-    repo_from = request.repo_from
+    repo_from = request.project_from
     repopath = pagure.get_repo_path(repo_from)
     repo_obj = pygit2.Repository(repopath)
 
@@ -142,7 +142,7 @@ def request_pull(repo, requestid, username=None):
                 try:
                     SESSION.commit()
                     pagure.lib.git.update_git(
-                        request, repo=request.repo,
+                        request, repo=request.project,
                         repofolder=APP.config['REQUESTS_FOLDER'])
                 except SQLAlchemyError as err:
                     SESSION.rollback()
@@ -177,7 +177,7 @@ def request_pull(repo, requestid, username=None):
         repo=repo,
         username=username,
         pull_request=request,
-        repo_admin=is_repo_admin(request.repo),
+        repo_admin=is_repo_admin(request.project),
         diff_commits=diff_commits,
         diff=diff,
         mergeform=form,
@@ -204,7 +204,7 @@ def request_pull_patch(repo, requestid, username=None):
     if not request:
         flask.abort(404, 'Pull-request not found')
 
-    repo_from = request.repo_from
+    repo_from = request.project_from
     repopath = pagure.get_repo_path(repo_from)
     repo_obj = pygit2.Repository(repopath)
 
@@ -276,7 +276,7 @@ def pull_request_add_comment(
 
     request = pagure.lib.search_pull_requests(
         SESSION, project_id=repo.id, requestid=requestid)
-    repo = request.repo_from
+    repo = request.project_from
 
     if not request:
         flask.abort(404, 'Pull-request not found')
@@ -355,7 +355,7 @@ def pull_request_drop_comment(repo, requestid, username=None):
 
             comment = pagure.lib.get_request_comment(
                 SESSION, request.uid, commentid)
-            if comment is None or comment.pull_request.repo != repo:
+            if comment is None or comment.pull_request.project != repo:
                 flask.abort(404, 'Comment not found')
 
             if (flask.g.fas_user.username != comment.user.username
@@ -422,11 +422,11 @@ def merge_request_pull(repo, requestid, username=None):
             username=username)
 
     # Get the fork
-    repopath = pagure.get_repo_path(request.repo_from)
+    repopath = pagure.get_repo_path(request.project_from)
     fork_obj = pygit2.Repository(repopath)
 
     # Get the original repo
-    parentpath = pagure.get_repo_path(request.repo)
+    parentpath = pagure.get_repo_path(request.project)
 
     # Clone the original repo into a temp folder
     newpath = tempfile.mkdtemp()
diff --git a/tests/test_progit_lib_git.py b/tests/test_progit_lib_git.py
index 8f088b1..dcbe768 100644
--- a/tests/test_progit_lib_git.py
+++ b/tests/test_progit_lib_git.py
@@ -457,7 +457,7 @@ index 458821a..77674a8
         self.assertEqual(msg, 'Request created')
         request = repo.requests[0]
         self.assertEqual(request.title, 'test PR')
-        pagure.lib.git.update_git(request, request.repo, tests.HERE)
+        pagure.lib.git.update_git(request, request.project, tests.HERE)
 
         repo = pygit2.Repository(self.gitrepo)
         commit = repo.revparse_single('HEAD')