diff --git a/charts/dependency/promtail/Chart.yaml b/charts/dependency/promtail/Chart.yaml
index 10b85805c1c..822f04ea5e9 100644
--- a/charts/dependency/promtail/Chart.yaml
+++ b/charts/dependency/promtail/Chart.yaml
@@ -22,7 +22,7 @@ sources:
   - https://grafana.com/oss/loki/
   - https://grafana.com/docs/loki/latest/
 type: application
-version: 3.0.13
+version: 3.0.14
 annotations:
   truecharts.org/catagories: |
     - metrics
diff --git a/charts/dependency/promtail/templates/_servicemonitor.tpl b/charts/dependency/promtail/templates/_servicemonitor.tpl
index 2daee565e15..cda54130742 100644
--- a/charts/dependency/promtail/templates/_servicemonitor.tpl
+++ b/charts/dependency/promtail/templates/_servicemonitor.tpl
@@ -4,13 +4,13 @@
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
-  name: {{ include "common.names.fullname" . -}}
+  name: {{ include "tc.common.names.fullname" . -}}
   {{- with .Values.serviceMonitor.annotations }}
   annotations:
     {{- toYaml . | nindent 4 }}
   {{- end }}
   labels:
-    {{- include "common.labels" . | nindent 4 }}
+    {{- include "tc.common.labels" . | nindent 4 }}
     {{- with .Values.serviceMonitor.labels }}
     {{- toYaml . | nindent 4 }}
     {{- end }}
@@ -21,7 +21,7 @@ spec:
   {{- end }}
   selector:
     matchLabels:
-      {{- include "common.labels.selectorLabels" . | nindent 6 }}
+      {{- include "tc.common.labels.selectorLabels" . | nindent 6 }}
   endpoints:
     - port: http-metrics
       {{- with .Values.serviceMonitor.interval }}
diff --git a/charts/stable/grafana/Chart.yaml b/charts/stable/grafana/Chart.yaml
index 3f6f234dc17..0e99d18c518 100644
--- a/charts/stable/grafana/Chart.yaml
+++ b/charts/stable/grafana/Chart.yaml
@@ -23,7 +23,7 @@ sources:
   - https://github.com/bitnami/bitnami-docker-grafana
   - https://grafana.com/
 type: application
-version: 4.0.14
+version: 4.0.15
 annotations:
   truecharts.org/catagories: |
     - metrics
diff --git a/charts/stable/grafana/templates/prometheusrules.yaml b/charts/stable/grafana/templates/prometheusrules.yaml
index ae2e511cac2..35b77edf0f6 100644
--- a/charts/stable/grafana/templates/prometheusrules.yaml
+++ b/charts/stable/grafana/templates/prometheusrules.yaml
@@ -2,15 +2,15 @@
 apiVersion: monitoring.coreos.com/v1
 kind: PrometheusRule
 metadata:
-  name: {{ include "common.names.fullname" . }}
+  name: {{ include "tc.common.names.fullname" . }}
   labels:
-    {{- include "common.labels" . | nindent 4 }}
+    {{- include "tc.common.labels" . | nindent 4 }}
     {{- with .Values.metrics.prometheusRule.labels }}
     {{- toYaml . | nindent 4 }}
     {{- end }}
 spec:
   groups:
-    - name: {{ include "common.names.fullname" . }}
+    - name: {{ include "tc.common.names.fullname" . }}
       rules:
         {{- with .Values.metrics.prometheusRule.rules }}
         {{- toYaml . | nindent 8 }}
diff --git a/charts/stable/grafana/templates/servicemonitor.yaml b/charts/stable/grafana/templates/servicemonitor.yaml
index 3edd7fd70b1..cec4d368093 100644
--- a/charts/stable/grafana/templates/servicemonitor.yaml
+++ b/charts/stable/grafana/templates/servicemonitor.yaml
@@ -2,16 +2,16 @@
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
-  name: {{ include "common.names.fullname" . }}
+  name: {{ include "tc.common.names.fullname" . }}
   labels:
-    {{- include "common.labels" . | nindent 4 }}
+    {{- include "tc.common.labels" . | nindent 4 }}
     {{- with .Values.metrics.serviceMonitor.labels }}
     {{- toYaml . | nindent 4 }}
     {{- end }}
 spec:
   selector:
     matchLabels:
-      {{- include "common.labels.selectorLabels" . | nindent 6 }}
+      {{- include "tc.common.labels.selectorLabels" . | nindent 6 }}
   endpoints:
     - port: main
       {{- with .Values.metrics.serviceMonitor.interval }}
diff --git a/charts/stable/loki/Chart.yaml b/charts/stable/loki/Chart.yaml
index dbd715a43e8..cc6bad797f7 100644
--- a/charts/stable/loki/Chart.yaml
+++ b/charts/stable/loki/Chart.yaml
@@ -23,7 +23,7 @@ name: loki
 sources:
   - https://github.com/grafana/loki
 type: application
-version: 5.0.8
+version: 5.0.9
 annotations:
   truecharts.org/catagories: |
     - logs
diff --git a/charts/stable/loki/values.yaml b/charts/stable/loki/values.yaml
index 3fb99ed0fab..50fd4052c88 100644
--- a/charts/stable/loki/values.yaml
+++ b/charts/stable/loki/values.yaml
@@ -32,7 +32,7 @@ args:
 #   alerting:
 #     enabled: true
 #     data:
-#       '{{ include "common.names.fullname" . }}-alerting-rules.yaml': |-
+#       '{{ include "tc.common.names.fullname" . }}-alerting-rules.yaml': |-
 #       {{- if gt (len .Values.alerting_groups) 0 }}
 #           groups:
 #           {{- toYaml .Values.alerting_groups | nindent 6 }}
diff --git a/charts/stable/promcord/Chart.yaml b/charts/stable/promcord/Chart.yaml
index ad802b9c368..e1da3f597ca 100644
--- a/charts/stable/promcord/Chart.yaml
+++ b/charts/stable/promcord/Chart.yaml
@@ -21,7 +21,7 @@ name: promcord
 sources:
   - https://github.com/nimarion/promcord
 type: application
-version: 4.0.8
+version: 4.0.9
 annotations:
   truecharts.org/catagories: |
     - metrics
diff --git a/charts/stable/promcord/templates/prometheusrules.yaml b/charts/stable/promcord/templates/prometheusrules.yaml
index f049742a258..cfa038ff0f6 100644
--- a/charts/stable/promcord/templates/prometheusrules.yaml
+++ b/charts/stable/promcord/templates/prometheusrules.yaml
@@ -2,22 +2,22 @@
 apiVersion: monitoring.coreos.com/v1
 kind: PrometheusRule
 metadata:
-  name: {{ include "common.names.fullname" . }}
+  name: {{ include "tc.common.names.fullname" . }}
   labels:
-    {{- include "common.labels" . | nindent 4 }}
+    {{- include "tc.common.labels" . | nindent 4 }}
     {{- with .Values.metrics.prometheusRule.labels }}
     {{- toYaml . | nindent 4 }}
     {{- end }}
 spec:
   groups:
-    - name: {{ include "common.names.fullname" . }}
+    - name: {{ include "tc.common.names.fullname" . }}
       rules:
         - alert: PromcordAbsent
           annotations:
             description: Promcord has disappeared from Prometheus service discovery.
             summary: Promcord is down.
           expr: |
-            absent(up{job=~".*{{ include "common.names.fullname" . }}.*"} == 1)
+            absent(up{job=~".*{{ include "tc.common.names.fullname" . }}.*"} == 1)
           for: 5m
           labels:
             severity: critical
diff --git a/charts/stable/promcord/templates/servicemonitor.yaml b/charts/stable/promcord/templates/servicemonitor.yaml
index b4245480567..9e5ddea1095 100644
--- a/charts/stable/promcord/templates/servicemonitor.yaml
+++ b/charts/stable/promcord/templates/servicemonitor.yaml
@@ -2,16 +2,16 @@
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
-  name: {{ include "common.names.fullname" . }}
+  name: {{ include "tc.common.names.fullname" . }}
   labels:
-    {{- include "common.labels" . | nindent 4 }}
+    {{- include "tc.common.labels" . | nindent 4 }}
     {{- with .Values.metrics.serviceMonitor.labels }}
     {{- toYaml . | nindent 4 }}
     {{- end }}
 spec:
   selector:
     matchLabels:
-      {{- include "common.labels.selectorLabels" . | nindent 6 }}
+      {{- include "tc.common.labels.selectorLabels" . | nindent 6 }}
   endpoints:
     - port: metrics
       {{- with .Values.metrics.serviceMonitor.interval }}
diff --git a/charts/stable/speedtest-exporter/Chart.yaml b/charts/stable/speedtest-exporter/Chart.yaml
index a2939e8bdf3..4d8e7d73ace 100644
--- a/charts/stable/speedtest-exporter/Chart.yaml
+++ b/charts/stable/speedtest-exporter/Chart.yaml
@@ -21,7 +21,7 @@ name: speedtest-exporter
 sources:
 - https://github.com/MiguelNdeCarvalho/speedtest-exporter/
 type: application
-version: 3.0.8
+version: 3.0.9
 annotations:
   truecharts.org/catagories: |
     - metrics
diff --git a/charts/stable/speedtest-exporter/templates/prometheusrules.yaml b/charts/stable/speedtest-exporter/templates/prometheusrules.yaml
index eff07133af4..057fa27f195 100644
--- a/charts/stable/speedtest-exporter/templates/prometheusrules.yaml
+++ b/charts/stable/speedtest-exporter/templates/prometheusrules.yaml
@@ -2,22 +2,22 @@
 apiVersion: monitoring.coreos.com/v1
 kind: PrometheusRule
 metadata:
-  name: {{ include "common.names.fullname" . }}
+  name: {{ include "tc.common.names.fullname" . }}
   labels:
-    {{- include "common.labels" . | nindent 4 }}
+    {{- include "tc.common.labels" . | nindent 4 }}
     {{- with .Values.metrics.prometheusRule.labels }}
     {{- toYaml . | nindent 4 }}
     {{- end }}
 spec:
   groups:
-    - name: {{ include "common.names.fullname" . }}
+    - name: {{ include "tc.common.names.fullname" . }}
       rules:
         - alert: SpeedtestExporterAbsent
           annotations:
             description: Speedtest Exporter has disappeared from Prometheus target discovery.
             summary: Speedtest Exporter is down.
           expr: |
-            absent(up{job=~".*{{ include "common.names.fullname" . }}.*"} == 1)
+            absent(up{job=~".*{{ include "tc.common.names.fullname" . }}.*"} == 1)
           for: {{ trimAll "m" .Values.metrics.serviceMonitor.interval | add 15 }}m
           labels:
             severity: critical
@@ -26,7 +26,7 @@ spec:
             description: Internet download speed is averaging {{ "{{ humanize $value }}" }} Mbps.
             summary: SpeedTest slow internet download.
           expr: |
-            avg_over_time(speedtest_download_bits_per_second{job=~".*{{ include "common.names.fullname" . }}.*"}[4h])
+            avg_over_time(speedtest_download_bits_per_second{job=~".*{{ include "tc.common.names.fullname" . }}.*"}[4h])
               < {{ .Values.metrics.prometheusRule.downloadLimit }}
           for: 0m
           labels:
@@ -36,7 +36,7 @@ spec:
             description: Internet upload speed is averaging {{ "{{ humanize $value }}" }} Mbps.
             summary: SpeedTest slow internet upload.
           expr: |
-            avg_over_time(speedtest_upload_bits_per_second{job=~".*{{ include "common.names.fullname" . }}.*"}[4h])
+            avg_over_time(speedtest_upload_bits_per_second{job=~".*{{ include "tc.common.names.fullname" . }}.*"}[4h])
               < {{ .Values.metrics.prometheusRule.uploadLimit }}
           for: 0m
           labels:
@@ -46,7 +46,7 @@ spec:
             description: Internet ping latency is averaging {{ "{{ humanize $value }}" }} ms.
             summary: SpeedTest high ping latency.
           expr: |
-            avg_over_time(speedtest_ping_latency_milliseconds{job=~".*{{ include "common.names.fullname" . }}.*"}[4h])
+            avg_over_time(speedtest_ping_latency_milliseconds{job=~".*{{ include "tc.common.names.fullname" . }}.*"}[4h])
               > {{ .Values.metrics.prometheusRule.pingLimit }}
           for: 0m
           labels:
@@ -56,7 +56,7 @@ spec:
             description: Internet jitter latency is averaging {{ "{{ humanize $value }}" }} ms.
             summary: SpeedTest high jitter latency.
           expr: |
-            avg_over_time(speedtest_jitter_latency_milliseconds{job=~".*{{ include "common.names.fullname" . }}.*"}[4h])
+            avg_over_time(speedtest_jitter_latency_milliseconds{job=~".*{{ include "tc.common.names.fullname" . }}.*"}[4h])
               > {{ .Values.metrics.prometheusRule.jitterLimit }}
           for: 0m
           labels:
diff --git a/charts/stable/speedtest-exporter/templates/servicemonitor.yaml b/charts/stable/speedtest-exporter/templates/servicemonitor.yaml
index b4245480567..9e5ddea1095 100644
--- a/charts/stable/speedtest-exporter/templates/servicemonitor.yaml
+++ b/charts/stable/speedtest-exporter/templates/servicemonitor.yaml
@@ -2,16 +2,16 @@
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
-  name: {{ include "common.names.fullname" . }}
+  name: {{ include "tc.common.names.fullname" . }}
   labels:
-    {{- include "common.labels" . | nindent 4 }}
+    {{- include "tc.common.labels" . | nindent 4 }}
     {{- with .Values.metrics.serviceMonitor.labels }}
     {{- toYaml . | nindent 4 }}
     {{- end }}
 spec:
   selector:
     matchLabels:
-      {{- include "common.labels.selectorLabels" . | nindent 6 }}
+      {{- include "tc.common.labels.selectorLabels" . | nindent 6 }}
   endpoints:
     - port: metrics
       {{- with .Values.metrics.serviceMonitor.interval }}
diff --git a/charts/stable/unpoller/Chart.yaml b/charts/stable/unpoller/Chart.yaml
index 285e4c527e4..f679bef8684 100644
--- a/charts/stable/unpoller/Chart.yaml
+++ b/charts/stable/unpoller/Chart.yaml
@@ -22,7 +22,7 @@ sources:
 - https://github.com/unifi-poller/unifi-poller
 - https://hub.docker.com/r/golift/unifi-poller
 type: application
-version: 3.0.8
+version: 3.0.9
 annotations:
   truecharts.org/catagories: |
     - metrics
diff --git a/charts/stable/unpoller/templates/prometheusrules.yaml b/charts/stable/unpoller/templates/prometheusrules.yaml
index e80273d6517..0482b8703f9 100644
--- a/charts/stable/unpoller/templates/prometheusrules.yaml
+++ b/charts/stable/unpoller/templates/prometheusrules.yaml
@@ -2,22 +2,22 @@
 apiVersion: monitoring.coreos.com/v1
 kind: PrometheusRule
 metadata:
-  name: {{ include "common.names.fullname" . }}
+  name: {{ include "tc.common.names.fullname" . }}
   labels:
-    {{- include "common.labels" . | nindent 4 }}
+    {{- include "tc.common.labels" . | nindent 4 }}
     {{- with .Values.metrics.prometheusRule.labels }}
     {{- toYaml . | nindent 4 }}
     {{- end }}
 spec:
   groups:
-    - name: {{ include "common.names.fullname" . }}
+    - name: {{ include "tc.common.names.fullname" . }}
       rules:
         - alert: UnifiPollerAbsent
           annotations:
             description: Unifi Poller has disappeared from Prometheus service discovery.
             summary: Unifi Poller is down.
           expr: |
-            absent(up{job=~".*{{ include "common.names.fullname" . }}.*"} == 1)
+            absent(up{job=~".*{{ include "tc.common.names.fullname" . }}.*"} == 1)
           for: 5m
           labels:
             severity: critical
diff --git a/charts/stable/unpoller/templates/servicemonitor.yaml b/charts/stable/unpoller/templates/servicemonitor.yaml
index b4245480567..9e5ddea1095 100644
--- a/charts/stable/unpoller/templates/servicemonitor.yaml
+++ b/charts/stable/unpoller/templates/servicemonitor.yaml
@@ -2,16 +2,16 @@
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
-  name: {{ include "common.names.fullname" . }}
+  name: {{ include "tc.common.names.fullname" . }}
   labels:
-    {{- include "common.labels" . | nindent 4 }}
+    {{- include "tc.common.labels" . | nindent 4 }}
     {{- with .Values.metrics.serviceMonitor.labels }}
     {{- toYaml . | nindent 4 }}
     {{- end }}
 spec:
   selector:
     matchLabels:
-      {{- include "common.labels.selectorLabels" . | nindent 6 }}
+      {{- include "tc.common.labels.selectorLabels" . | nindent 6 }}
   endpoints:
     - port: metrics
       {{- with .Values.metrics.serviceMonitor.interval }}
diff --git a/charts/stable/uptimerobot-prometheus/Chart.yaml b/charts/stable/uptimerobot-prometheus/Chart.yaml
index 97a6c29ae7a..eaa9f7b668d 100644
--- a/charts/stable/uptimerobot-prometheus/Chart.yaml
+++ b/charts/stable/uptimerobot-prometheus/Chart.yaml
@@ -23,7 +23,7 @@ sources:
   - https://github.com/lekpamartin/uptimerobot_exporter
   - https://github.com/k8s-at-home/charts/tree/master/charts/uptimerobot-prometheus
 type: application
-version: 4.0.8
+version: 4.0.9
 annotations:
   truecharts.org/catagories: |
     - metrics
diff --git a/charts/stable/uptimerobot-prometheus/templates/prometheusrules.yaml b/charts/stable/uptimerobot-prometheus/templates/prometheusrules.yaml
index 93cd4d987ad..85f37b0b122 100644
--- a/charts/stable/uptimerobot-prometheus/templates/prometheusrules.yaml
+++ b/charts/stable/uptimerobot-prometheus/templates/prometheusrules.yaml
@@ -2,22 +2,22 @@
 apiVersion: monitoring.coreos.com/v1
 kind: PrometheusRule
 metadata:
-  name: {{ include "common.names.fullname" . }}
+  name: {{ include "tc.common.names.fullname" . }}
   labels:
-    {{- include "common.labels" . | nindent 4 }}
+    {{- include "tc.common.labels" . | nindent 4 }}
     {{- with .Values.metrics.prometheusRule.labels }}
     {{- toYaml . | nindent 4 }}
     {{- end }}
 spec:
   groups:
-    - name: {{ include "common.names.fullname" . }}
+    - name: {{ include "tc.common.names.fullname" . }}
       rules:
         - alert: UptimeRobotExporterAbsent
           annotations:
             description: Uptime Robot Exporter has disappeared from Prometheus service discovery.
             summary: Uptime Robot Exporter is down.
           expr: |
-            absent(up{job=~".*{{ include "common.names.fullname" . }}.*"} == 1)
+            absent(up{job=~".*{{ include "tc.common.names.fullname" . }}.*"} == 1)
           for: 5m
           labels:
             severity: critical
diff --git a/charts/stable/uptimerobot-prometheus/templates/servicemonitor.yaml b/charts/stable/uptimerobot-prometheus/templates/servicemonitor.yaml
index b4245480567..9e5ddea1095 100644
--- a/charts/stable/uptimerobot-prometheus/templates/servicemonitor.yaml
+++ b/charts/stable/uptimerobot-prometheus/templates/servicemonitor.yaml
@@ -2,16 +2,16 @@
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
-  name: {{ include "common.names.fullname" . }}
+  name: {{ include "tc.common.names.fullname" . }}
   labels:
-    {{- include "common.labels" . | nindent 4 }}
+    {{- include "tc.common.labels" . | nindent 4 }}
     {{- with .Values.metrics.serviceMonitor.labels }}
     {{- toYaml . | nindent 4 }}
     {{- end }}
 spec:
   selector:
     matchLabels:
-      {{- include "common.labels.selectorLabels" . | nindent 6 }}
+      {{- include "tc.common.labels.selectorLabels" . | nindent 6 }}
   endpoints:
     - port: metrics
       {{- with .Values.metrics.serviceMonitor.interval }}