diff --git a/nagios/templates/configmap-etc.yaml b/nagios/templates/configmap-etc.yaml
index abc16a3cc..1864ad01c 100644
--- a/nagios/templates/configmap-etc.yaml
+++ b/nagios/templates/configmap-etc.yaml
@@ -27,14 +27,14 @@ data:
   nagios-host.conf: |
 {{- tuple .Values.conf.apache.host "etc/_nagios-host.conf.tpl" . | include "helm-toolkit.utils.configmap_templater" }}
   cgi.cfg: |+
-{{ include "nagios.to_nagios_conf" .Values.conf.nagios.cgi | indent 4 }}
+{{ include "nagios.utils.to_nagios_conf" .Values.conf.nagios.cgi | indent 4 }}
   nagios.cfg: |+
-{{ include "nagios.to_nagios_conf" .Values.conf.nagios.nagios | indent 4 }}
+{{ include "nagios.utils.to_nagios_conf" .Values.conf.nagios.nagios | indent 4 }}
   nagios_objects.cfg: |+
-{{- tuple "contact" .Values.conf.nagios.contacts | include "nagios.object_definition" | indent 4 }}
-{{- tuple "contactgroup" .Values.conf.nagios.contactgroups | include "nagios.object_definition" | indent 4 }}
-{{- tuple "host" .Values.conf.nagios.hosts | include "nagios.object_definition" | indent 4 }}
-{{- tuple "hostgroup" .Values.conf.nagios.host_groups | include "nagios.object_definition" | indent 4 }}
-{{- tuple "command" .Values.conf.nagios.commands | include "nagios.object_definition" | indent 4 }}
-{{- tuple "service" .Values.conf.nagios.services | include "nagios.object_definition" | indent 4 }}
+{{- tuple "contact" .Values.conf.nagios.contacts | include "nagios.utils.object_definition" | indent 4 }}
+{{- tuple "contactgroup" .Values.conf.nagios.contactgroups | include "nagios.utils.object_definition" | indent 4 }}
+{{- tuple "host" .Values.conf.nagios.hosts | include "nagios.utils.object_definition" | indent 4 }}
+{{- tuple "hostgroup" .Values.conf.nagios.host_groups | include "nagios.utils.object_definition" | indent 4 }}
+{{- tuple "command" .Values.conf.nagios.commands | include "nagios.utils.object_definition" | indent 4 }}
+{{- tuple "service" .Values.conf.nagios.services | include "nagios.utils.object_definition" | indent 4 }}
 {{- end }}
diff --git a/nagios/templates/_helpers.tpl b/nagios/templates/utils/_object_definition.tpl
similarity index 77%
rename from nagios/templates/_helpers.tpl
rename to nagios/templates/utils/_object_definition.tpl
index c689b0bbe..d21d4e447 100644
--- a/nagios/templates/_helpers.tpl
+++ b/nagios/templates/utils/_object_definition.tpl
@@ -14,7 +14,7 @@ limitations under the License.
 # This function defines commands, hosts, hostgroups, and services for nagios by
 # consuming yaml trees to define the fields for these objects
 
-{{- define "nagios.object_definition" -}}
+{{- define "nagios.utils.object_definition" -}}
 {{- $type := index . 0 }}
 {{- $objects := index . 1 }}
 {{- range $object := $objects }}
@@ -27,15 +27,3 @@ define {{ $type }} {
 {{end -}}
 {{- end -}}
 {{- end -}}
-
-{{- define "nagios.to_nagios_conf" -}}
-{{- range $key, $value := . -}}
-{{ if eq $key "cfg_file" }}
-{{ range $file := $value -}}
-{{ $key }}={{ $file }}
-{{ end }}
-{{- else }}
-{{ $key }}={{ $value }}
-{{- end }}
-{{- end -}}
-{{- end -}}
diff --git a/nagios/templates/utils/_to_nagios_conf.tpl b/nagios/templates/utils/_to_nagios_conf.tpl
new file mode 100644
index 000000000..e7f59cd58
--- /dev/null
+++ b/nagios/templates/utils/_to_nagios_conf.tpl
@@ -0,0 +1,24 @@
+{{/*
+Copyright 2017 The Openstack-Helm Authors.
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+   http://www.apache.org/licenses/LICENSE-2.0
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/}}
+
+{{- define "nagios.utils.to_nagios_conf" -}}
+{{- range $key, $value := . -}}
+{{ if eq $key "cfg_file" }}
+{{ range $file := $value -}}
+{{ $key }}={{ $file }}
+{{ end }}
+{{- else }}
+{{ $key }}={{ $value }}
+{{- end }}
+{{- end -}}
+{{- end -}}