diff --git a/pagure/hooks/__init__.py b/pagure/hooks/__init__.py
index 7146448..b3aeb54 100644
--- a/pagure/hooks/__init__.py
+++ b/pagure/hooks/__init__.py
@@ -74,7 +74,7 @@ class BaseHook(object):
                            postreceive)
 
     @classmethod
-    def install(cls, repopaths, dbobj, hook_name, filein):  # pragma: no cover
+    def base_install(cls, repopaths, dbobj, hook_name, filein):  # pragma: no cover
         ''' Method called to install the hook for a project.
 
         :arg project: a ``pagure.model.Project`` object to which the hook
@@ -97,7 +97,8 @@ class BaseHook(object):
                 os.makedirs(hookfolder)
 
             # Install the hook itself
-            hook_file = os.path.join(repopath, 'hooks', hook_name)
+            hook_file = os.path.join(repopath, 'hooks', cls.hook_type + '.'
+                                     + hook_name)
 
             if not os.path.exists(hook_file):
                 os.symlink(
@@ -106,7 +107,7 @@ class BaseHook(object):
                 )
 
     @classmethod
-    def remove(cls, repopaths, hook_name):  # pragma: no cover
+    def base_remove(cls, repopaths, hook_name):  # pragma: no cover
         ''' Method called to remove the hook of a project.
 
         :arg project: a ``pagure.model.Project`` object to which the hook
@@ -118,6 +119,7 @@ class BaseHook(object):
                 APP.logger.debug('Hook remove repo %s not found', repopath)
                 flask.abort(404, 'No git repo found')
 
-            hook_path = os.path.join(repopath, 'hooks', hook_name)
+            hook_path = os.path.join(repopath, 'hooks', cls.hook_type + '.'
+                                     + hook_name)
             if os.path.exists(hook_path):
                 os.unlink(hook_path)
diff --git a/pagure/hooks/fedmsg.py b/pagure/hooks/fedmsg.py
index a6522b8..aa21493 100644
--- a/pagure/hooks/fedmsg.py
+++ b/pagure/hooks/fedmsg.py
@@ -75,7 +75,7 @@ class Fedmsg(BaseHook):
 
         '''
         repopaths = [get_repo_path(project)]
-        BaseHook.install(repopaths, dbobj, 'post-receive.fedmsg', 'fedmsg_hook.py')
+        cls.base_install(repopaths, dbobj, 'fedmsg', 'fedmsg_hook.py')
 
     @classmethod
     def remove(cls, project):
@@ -86,4 +86,4 @@ class Fedmsg(BaseHook):
 
         '''
         repopaths = [get_repo_path(project)]
-        BaseHook.remove(repopaths, 'post-receive.fedmsg')
+        cls.base_remove(repopaths, 'fedmsg')
diff --git a/pagure/hooks/irc.py b/pagure/hooks/irc.py
index af36311..48f0a47 100644
--- a/pagure/hooks/irc.py
+++ b/pagure/hooks/irc.py
@@ -122,7 +122,7 @@ class Hook(BaseHook):
         # repo_obj.config.set_multivar()
 
         # Install the hook itself
-        # BaseHook.install(repopaths, dbobj, 'post-receive.irc', 'git_irc.py')
+        # cls.base_install(repopaths, dbobj, 'irc', 'git_irc.py')
 
     @classmethod
     def remove(cls, project):
@@ -134,4 +134,4 @@ class Hook(BaseHook):
         '''
         repopaths = [get_repo_path(project)]
 
-        # BaseHook.remove(repopaths, 'post-receive.irc')
+        # cls.base_remove(repopaths, 'irc')
diff --git a/pagure/hooks/mail.py b/pagure/hooks/mail.py
index 6e688a5..a4cc2cb 100644
--- a/pagure/hooks/mail.py
+++ b/pagure/hooks/mail.py
@@ -93,7 +93,7 @@ class Mail(BaseHook):
             'multimailhook.environment', '', 'gitolite')
 
         # Install the hook itself
-        BaseHook.install(repopaths, dbobj, 'post-receive.mail', 'git_multimail.py')
+        cls.base_install(repopaths, dbobj, 'mail', 'git_multimail.py')
 
     @classmethod
     def remove(cls, project):
@@ -104,4 +104,4 @@ class Mail(BaseHook):
 
         '''
         repopaths = [get_repo_path(project)]
-        BaseHook.remove(repopaths, 'post-receive.mail')
+        cls.base_remove(repopaths, 'mail')
diff --git a/pagure/hooks/pagure_force_commit.py b/pagure/hooks/pagure_force_commit.py
index 3119f9f..ff58b19 100644
--- a/pagure/hooks/pagure_force_commit.py
+++ b/pagure/hooks/pagure_force_commit.py
@@ -87,7 +87,7 @@ class PagureForceCommitHook(BaseHook):
         repopaths = [get_repo_path(project)]
         pygit2.Repository(repopaths[0])
 
-        BaseHook.install(repopaths, dbobj, 'pre-receive.pagureforcecommit',
+        cls.base_install(repopaths, dbobj, 'pagureforcecommit',
                          'pagure_force_commit_hook.py')
 
     @classmethod
@@ -99,4 +99,4 @@ class PagureForceCommitHook(BaseHook):
 
         '''
         repopaths = [get_repo_path(project)]
-        BaseHook.remove(repopaths, 'pre-receive.pagureforcecommit')
+        cls.base_remove(repopaths, 'pagureforcecommit')
diff --git a/pagure/hooks/pagure_hook.py b/pagure/hooks/pagure_hook.py
index bfadcc6..f3ee149 100644
--- a/pagure/hooks/pagure_hook.py
+++ b/pagure/hooks/pagure_hook.py
@@ -103,8 +103,7 @@ class PagureHook(BaseHook):
                 os.path.join(folder, project.path)
             )
 
-        BaseHook.install(repopaths, dbobj, 'post-receive.pagure',
-                         'pagure_hook.py')
+        cls.base_install(repopaths, dbobj, 'pagure', 'pagure_hook.py')
 
     @classmethod
     def remove(cls, project):
@@ -122,4 +121,4 @@ class PagureHook(BaseHook):
                 os.path.join(folder, project.path)
             )
 
-        BaseHook.remove(repopaths, 'post-receive.pagure')
+        cls.base_remove(repopaths, 'pagure')
diff --git a/pagure/hooks/pagure_request_hook.py b/pagure/hooks/pagure_request_hook.py
index 20f0710..af08004 100644
--- a/pagure/hooks/pagure_request_hook.py
+++ b/pagure/hooks/pagure_request_hook.py
@@ -102,7 +102,7 @@ class PagureRequestHook(BaseHook):
         '''
         repopaths = [os.path.join(APP.config['REQUESTS_FOLDER'], project.path)]
 
-        BaseHook.install(repopaths, dbobj, 'post-receive.pagure-requests',
+        cls.base_install(repopaths, dbobj, 'pagure-requests',
                          'pagure_hook_requests.py')
 
     @classmethod
@@ -115,4 +115,4 @@ class PagureRequestHook(BaseHook):
         '''
         repopaths = [os.path.join(APP.config['REQUESTS_FOLDER'], project.path)]
 
-        BaseHook.remove(repopaths, 'post-receive.pagure-requests')
+        cls.base_remove(repopaths, 'pagure-requests')
diff --git a/pagure/hooks/pagure_ticket_hook.py b/pagure/hooks/pagure_ticket_hook.py
index 71fe780..97e3822 100644
--- a/pagure/hooks/pagure_ticket_hook.py
+++ b/pagure/hooks/pagure_ticket_hook.py
@@ -101,7 +101,7 @@ class PagureTicketHook(BaseHook):
         '''
         repopaths = [os.path.join(APP.config['TICKETS_FOLDER'], project.path)]
 
-        BaseHook.install(repopaths, dbobj, 'post-receive.pagure-ticket',
+        cls.base_install(repopaths, dbobj, 'pagure-ticket',
                          'pagure_hook_tickets.py')
 
     @classmethod
@@ -114,4 +114,4 @@ class PagureTicketHook(BaseHook):
         '''
         repopaths = [os.path.join(APP.config['TICKETS_FOLDER'], project.path)]
 
-        BaseHook.remove(repopaths, 'post-receive.pagure-ticket')
+        cls.base_remove(repopaths, 'pagure-ticket')
diff --git a/pagure/hooks/pagure_unsigned_commits.py b/pagure/hooks/pagure_unsigned_commits.py
index 4097edc..9885b4f 100644
--- a/pagure/hooks/pagure_unsigned_commits.py
+++ b/pagure/hooks/pagure_unsigned_commits.py
@@ -79,7 +79,7 @@ class PagureUnsignedCommitHook(BaseHook):
         '''
         repopaths = [get_repo_path(project)]
 
-        BaseHook.install(repopaths, dbobj, 'pre-receive.pagureunsignedcommit',
+        cls.base_install(repopaths, dbobj, 'pagureunsignedcommit',
                          'pagure_block_unsigned.py')
 
     @classmethod
@@ -92,4 +92,4 @@ class PagureUnsignedCommitHook(BaseHook):
         '''
         repopaths = [get_repo_path(project)]
 
-        BaseHook.remove(repopaths, 'pre-receive.pagureunsignedcommit')
+        cls.base_remove(repopaths, 'pagureunsignedcommit')
diff --git a/pagure/hooks/rtd.py b/pagure/hooks/rtd.py
index 27c2dfc..b1cb0f3 100644
--- a/pagure/hooks/rtd.py
+++ b/pagure/hooks/rtd.py
@@ -88,7 +88,7 @@ class RtdHook(BaseHook):
         '''
         repopaths = [get_repo_path(project)]
 
-        BaseHook.install(repopaths, dbobj, 'post-receive.rtd', 'rtd_hook.py')
+        cls.base_install(repopaths, dbobj, 'rtd', 'rtd_hook.py')
 
     @classmethod
     def remove(cls, project):
@@ -100,4 +100,4 @@ class RtdHook(BaseHook):
         '''
         repopaths = [get_repo_path(project)]
 
-        BaseHook.remove(repopaths, 'post-receive.rtd')
+        cls.base_remove(repopaths, 'rtd')