diff --git a/packages/zammad-addon-common/build.ts b/packages/zammad-addon-common/build.ts
index 679c5c7..668df8c 100644
--- a/packages/zammad-addon-common/build.ts
+++ b/packages/zammad-addon-common/build.ts
@@ -60,7 +60,7 @@ export const createZPM = async ({ name, displayName, version }: Record<string, s
 const main = async () => {
   const packageJSON = JSON.parse(await fs.readFile("./package.json", "utf-8"));
   const { name, displayName, version } = packageJSON;
-  console.log(`Building ${displayName} v${version}`);
+  console.log(`Building addon ${displayName} v${version}`);
   await createZPM({ name, displayName, version });
 }
 
diff --git a/packages/zammad-addon-common/package.json b/packages/zammad-addon-common/package.json
index 802a045..be0d259 100644
--- a/packages/zammad-addon-common/package.json
+++ b/packages/zammad-addon-common/package.json
@@ -10,5 +10,5 @@
     "build": "tsc"
   },
   "author": "",
-  "license": "ISC"
+  "license": "AGPL-3.0-or-later"
 }
diff --git a/packages/zammad-addon-hardening/package.json b/packages/zammad-addon-hardening/package.json
index 4cbd5ca..2eddf0e 100644
--- a/packages/zammad-addon-hardening/package.json
+++ b/packages/zammad-addon-hardening/package.json
@@ -11,5 +11,5 @@
     "zammad-addon-common": "*"
   },
   "author": "",
-  "license": "ISC"
+  "license": "AGPL-3.0-or-later"
 }
diff --git a/packages/zammad-addon-metamigo/package.json b/packages/zammad-addon-metamigo/package.json
index 720f8c5..5f0a5b5 100644
--- a/packages/zammad-addon-metamigo/package.json
+++ b/packages/zammad-addon-metamigo/package.json
@@ -11,5 +11,5 @@
     "zammad-addon-common": "*"
   },
   "author": "",
-  "license": "ISC"
+  "license": "AGPL-3.0-or-later"
 }
diff --git a/packages/zammad-addon-pgp/package.json b/packages/zammad-addon-pgp/package.json
index 85b2749..8c430c6 100644
--- a/packages/zammad-addon-pgp/package.json
+++ b/packages/zammad-addon-pgp/package.json
@@ -1,6 +1,6 @@
 {
   "name": "zammad-addon-pgp",
-  "displayName": "PGP Support",
+  "displayName": "PGP",
   "version": "2.0.0",
   "description": "Adds PGP integration into [Zammad](https://zammad.org) via [Sequoia](https://sequoia-pgp.org).",
   "scripts": {
@@ -11,5 +11,5 @@
     "zammad-addon-common": "*"
   },
   "author": "",
-  "license": "ISC"
+  "license": "AGPL-3.0-or-later"
 }
diff --git a/packages/zammad-addon-pgp/src/app/assets/stylesheets/addons/pgp-support.css b/packages/zammad-addon-pgp/src/app/assets/stylesheets/addons/pgp.css
similarity index 100%
rename from packages/zammad-addon-pgp/src/app/assets/stylesheets/addons/pgp-support.css
rename to packages/zammad-addon-pgp/src/app/assets/stylesheets/addons/pgp.css
diff --git a/packages/zammad-addon-pgp/src/config/initializers/pgp_support.rb b/packages/zammad-addon-pgp/src/config/initializers/pgp.rb
similarity index 100%
rename from packages/zammad-addon-pgp/src/config/initializers/pgp_support.rb
rename to packages/zammad-addon-pgp/src/config/initializers/pgp.rb
diff --git a/packages/zammad-addon-pgp/src/db/addon/pgp_support/20220403000001_pgp_support.rb b/packages/zammad-addon-pgp/src/db/addon/pgp/20220403000001_pgp.rb
similarity index 97%
rename from packages/zammad-addon-pgp/src/db/addon/pgp_support/20220403000001_pgp_support.rb
rename to packages/zammad-addon-pgp/src/db/addon/pgp/20220403000001_pgp.rb
index b586175..bc4b60d 100644
--- a/packages/zammad-addon-pgp/src/db/addon/pgp_support/20220403000001_pgp_support.rb
+++ b/packages/zammad-addon-pgp/src/db/addon/pgp/20220403000001_pgp.rb
@@ -1,4 +1,4 @@
-class PGPSupport < ActiveRecord::Migration[5.2]
+class PGP < ActiveRecord::Migration[5.2]
   def self.up
     # return if it's a new setup
     # return unless Setting.exists?(name: 'system_init_done')
diff --git a/packages/zammad-addon-pgp/tsconfig.json b/packages/zammad-addon-pgp/tsconfig.json
deleted file mode 100644
index 4811170..0000000
--- a/packages/zammad-addon-pgp/tsconfig.json
+++ /dev/null
@@ -1,6 +0,0 @@
-  {
-    "compilerOptions": {
-      "resolveJsonModule": true,
-      "esModuleInterop": true
-    }
-  }