diff --git a/library/common/templates/class/_priorityClass.tpl b/library/common/templates/class/_priorityClass.tpl
index 4789f9b8..3b4b8450 100644
--- a/library/common/templates/class/_priorityClass.tpl
+++ b/library/common/templates/class/_priorityClass.tpl
@@ -22,7 +22,7 @@ apiVersion: scheduling.k8s.io/v1
 kind: PriorityClass
 metadata:
   name: {{ $objectData.name }}
-  namespace: {{ include "tc.v1.common.lib.metadata.namespace" (dict "rootCtx" $rootCtx "objectData" $objectData "caller" "priorityclass") }}
+  namespace: {{ include "tc.v1.common.lib.metadata.namespace" (dict "rootCtx" $rootCtx "objectData" $objectData "caller" "Priority Class") }}
   {{- $labels := (mustMerge ($objectData.labels | default dict) (include "tc.v1.common.lib.metadata.allLabels" $rootCtx | fromYaml)) -}}
   {{- with (include "tc.v1.common.lib.metadata.render" (dict "rootCtx" $rootCtx "labels" $labels) | trim) }}
   labels:
diff --git a/library/common/templates/lib/util/_primary_service.tpl b/library/common/templates/lib/util/_primary_service.tpl
index b661a250..75f57631 100644
--- a/library/common/templates/lib/util/_primary_service.tpl
+++ b/library/common/templates/lib/util/_primary_service.tpl
@@ -32,8 +32,8 @@
   {{- end -}}
 
   {{- if $result -}}
-  {{- $result -}}
+    {{- $result -}}
   {{- else -}}
-  {{- fail "No primary and enabled service found" -}}
+    {{- fail "No primary and enabled service found" -}}
   {{- end -}}
 {{- end -}}
diff --git a/library/common/templates/spawner/_priorityClass.tpl b/library/common/templates/spawner/_priorityClass.tpl
index a7391d5d..07ecb992 100644
--- a/library/common/templates/spawner/_priorityClass.tpl
+++ b/library/common/templates/spawner/_priorityClass.tpl
@@ -1,4 +1,4 @@
-{{/* priorityclass Spawwner */}}
+{{/* Priority Class Spawner */}}
 {{/* Call this template:
 {{ include "tc.v1.common.spawner.priorityclass" $ -}}
 */}}
diff --git a/library/common/templates/spawner/_service.tpl b/library/common/templates/spawner/_service.tpl
index 86d40841..57081af9 100644
--- a/library/common/templates/spawner/_service.tpl
+++ b/library/common/templates/spawner/_service.tpl
@@ -43,7 +43,7 @@
       {{- include "tc.v1.common.lib.metadata.validation" (dict "objectData" $objectData "caller" "Service") -}}
       {{- include "tc.v1.common.lib.service.validation" (dict "rootCtx" $ "objectData" $objectData) -}}
 
-      {{/* Set the name of the service account */}}
+      {{/* Set the name of the service */}}
       {{- $_ := set $objectData "name" $objectName -}}
       {{- $_ := set $objectData "shortName" $name -}}