diff --git a/hooks/notification/.helm-docs.gotmpl b/hooks/notification/.helm-docs.gotmpl
index 6723c08bdb..dacde82910 100644
--- a/hooks/notification/.helm-docs.gotmpl
+++ b/hooks/notification/.helm-docs.gotmpl
@@ -6,7 +6,7 @@ SPDX-License-Identifier: Apache-2.0
 
 {{- define "extra.docsSection" -}}
 ---
-title: "Notification Hook"
+title: "Notification WebHook"
 category: "hook"
 type: "integration"
 state: "released"
diff --git a/hooks/notification/README.md b/hooks/notification/README.md
index ad897dad02..0b3db625ad 100644
--- a/hooks/notification/README.md
+++ b/hooks/notification/README.md
@@ -1,5 +1,5 @@
 ---
-title: "Notification Hook"
+title: "Notification WebHook"
 category: "hook"
 type: "integration"
 state: "released"
diff --git a/hooks/persistence-static-report/README.md b/hooks/persistence-static-report/README.md
index 9f9498186e..a4d1befeb1 100644
--- a/hooks/persistence-static-report/README.md
+++ b/hooks/persistence-static-report/README.md
@@ -1,9 +1,3 @@
-<!--
-SPDX-FileCopyrightText: 2020 iteratec GmbH
-
-SPDX-License-Identifier: Apache-2.0
--->
-
 ---
 title: "Static Report"
 category: "hook"
@@ -12,9 +6,12 @@ state: "developing"
 usecase: "Publishes all Scan Findings as HTML Report."
 ---
 
-<!-- end -->
+<!--
+SPDX-FileCopyrightText: 2020 iteratec GmbH
+
+SPDX-License-Identifier: Apache-2.0
+-->
 
 ## Deployment
 
 > 🔧 The implementation is currently work-in-progress and still undergoing major changes. It'll be released here once it has stabilized.
-
diff --git a/scanners/kube-hunter/.helm-docs.gotmpl b/scanners/kube-hunter/.helm-docs.gotmpl
index d2af9dfd57..c6305f9275 100644
--- a/scanners/kube-hunter/.helm-docs.gotmpl
+++ b/scanners/kube-hunter/.helm-docs.gotmpl
@@ -6,7 +6,7 @@ SPDX-License-Identifier: Apache-2.0
 
 {{- define "extra.docsSection" -}}
 ---
-title: "kube-hunter"
+title: "Kube Hunter"
 category: "scanner"
 type: "Kubernetes"
 state: "released"
diff --git a/scanners/kube-hunter/README.md b/scanners/kube-hunter/README.md
index c30b315216..49da3d44ea 100644
--- a/scanners/kube-hunter/README.md
+++ b/scanners/kube-hunter/README.md
@@ -1,5 +1,5 @@
 ---
-title: "kube-hunter"
+title: "Kube Hunter"
 category: "scanner"
 type: "Kubernetes"
 state: "released"
diff --git a/scanners/kubeaudit/.helm-docs.gotmpl b/scanners/kubeaudit/.helm-docs.gotmpl
index f6a7ba72f8..2c1457fc47 100644
--- a/scanners/kubeaudit/.helm-docs.gotmpl
+++ b/scanners/kubeaudit/.helm-docs.gotmpl
@@ -6,7 +6,7 @@ SPDX-License-Identifier: Apache-2.0
 
 {{- define "extra.docsSection" -}}
 ---
-title: "kubeaudit"
+title: "Kubeaudit"
 category: "scanner"
 type: "Kubernetes"
 state: "released"
diff --git a/scanners/kubeaudit/README.md b/scanners/kubeaudit/README.md
index 01ca8676e3..d33c9aacc3 100644
--- a/scanners/kubeaudit/README.md
+++ b/scanners/kubeaudit/README.md
@@ -1,5 +1,5 @@
 ---
-title: "kubeaudit"
+title: "Kubeaudit"
 category: "scanner"
 type: "Kubernetes"
 state: "released"