diff --git a/pom.xml b/pom.xml
index 7b04c60..77182c6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,16 +19,16 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>com.googlesource.gerrit.plugins.its</groupId>
-    <artifactId>hooks-its-parent</artifactId>
+    <artifactId>its-base-parent</artifactId>
     <version>2.9-SNAPSHOT</version>
   </parent>
-  <artifactId>hooks-jira</artifactId>
+  <artifactId>its-jira</artifactId>
   <packaging>jar</packaging>
   <name>Gerrit Code Review - Atlassian Jira support</name>
   <properties>
     <Gerrit-ApiType>plugin</Gerrit-ApiType>
     <Gerrit-ReloadMode>reload</Gerrit-ReloadMode>
-    <Gerrit-PluginName>jira</Gerrit-PluginName>
+    <Gerrit-PluginName>its-jira</Gerrit-PluginName>
     <Gerrit-InitStep>com.googlesource.gerrit.plugins.hooks.jira.InitJira</Gerrit-InitStep>
     <Gerrit-Module>com.googlesource.gerrit.plugins.hooks.jira.JiraModule</Gerrit-Module>
   </properties>
@@ -206,7 +206,7 @@
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>hooks-its</artifactId>
+      <artifactId>its-base</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
diff --git a/src/main/resources/Documentation/config.md b/src/main/resources/Documentation/config.md
index 2cca3f4..1ce37c2 100644
--- a/src/main/resources/Documentation/config.md
+++ b/src/main/resources/Documentation/config.md
@@ -29,7 +29,7 @@
 
 Example:
 
-    [commentLink "Jira"]
+    [commentLink "its-jira"]
     match = (\\[[A-Z][A-Z]+-[1-9][0-9]*\\])
     html = "<a href=\"http://jira.example.com/browse/$1\">$1</a>"
     association = SUGGESTED
@@ -43,11 +43,11 @@
 
 In order for Gerrit to connect to Jira/SOAP-API URL and credentials
 are required in your `gerrit.config` / `secure.config` under the
-`[jira]` section.
+`[its-jira]` section.
 
 Example:
 
-    [jira]
+    [its-jira]
     url=http://jira.example.com
     username=admin
     password=jirapass
@@ -58,7 +58,7 @@
 ---------------------
 
 It is possible to choose which kind of Gerrit event will trigger the plugin to comment on
-the Jira issue by adding the following in your `gerrit.config` file under the `[jira]` section:
+the Jira issue by adding the following in your `gerrit.config` file under the `[its-jira]` section:
 
 commentOnChangeAbandoned
 :	If true, abandoning a change adds a comment to the issue.
@@ -89,7 +89,7 @@
 
 Example:
 
-    [jira]
+    [its-jira]
     commentOnCommentAdded=false
     commentOnRefUpdatedGitWeb=false