diff --git a/templates/_backendTLSPolicy.tpl b/templates/_backendTLSPolicies.tpl
similarity index 100%
rename from templates/_backendTLSPolicy.tpl
rename to templates/_backendTLSPolicies.tpl
diff --git a/templates/_certificate.tpl b/templates/_certificates.tpl
similarity index 100%
rename from templates/_certificate.tpl
rename to templates/_certificates.tpl
diff --git a/templates/_clientSettingsPolicy.tpl b/templates/_clientSettingsPolicies.tpl
similarity index 100%
rename from templates/_clientSettingsPolicy.tpl
rename to templates/_clientSettingsPolicies.tpl
diff --git a/templates/_configMap.tpl b/templates/_configMaps.tpl
similarity index 100%
rename from templates/_configMap.tpl
rename to templates/_configMaps.tpl
diff --git a/templates/_deployment.tpl b/templates/_deployments.tpl
similarity index 100%
rename from templates/_deployment.tpl
rename to templates/_deployments.tpl
diff --git a/templates/_httpRoute.tpl b/templates/_httpRoutes.tpl
similarity index 100%
rename from templates/_httpRoute.tpl
rename to templates/_httpRoutes.tpl
diff --git a/templates/_ingress.tpl b/templates/_ingresses.tpl
similarity index 100%
rename from templates/_ingress.tpl
rename to templates/_ingresses.tpl
diff --git a/templates/_networkPolicy.tpl b/templates/_networkPolicies.tpl
similarity index 100%
rename from templates/_networkPolicy.tpl
rename to templates/_networkPolicies.tpl
diff --git a/templates/_persistentVolumeClaim.tpl b/templates/_persistentVolumeClaims.tpl
similarity index 100%
rename from templates/_persistentVolumeClaim.tpl
rename to templates/_persistentVolumeClaims.tpl
diff --git a/templates/_pod.tpl b/templates/_pods.tpl
similarity index 100%
rename from templates/_pod.tpl
rename to templates/_pods.tpl
diff --git a/templates/_serviceAccount.tpl b/templates/_serviceAccounts.tpl
similarity index 100%
rename from templates/_serviceAccount.tpl
rename to templates/_serviceAccounts.tpl
diff --git a/templates/_service.tpl b/templates/_services.tpl
similarity index 100%
rename from templates/_service.tpl
rename to templates/_services.tpl
diff --git a/unittests/backendTLSPolicy/backendTLSPolicy.yaml b/unittests/backendTLSPolicies/backendTLSPolicy.yaml
similarity index 100%
rename from unittests/backendTLSPolicy/backendTLSPolicy.yaml
rename to unittests/backendTLSPolicies/backendTLSPolicy.yaml
diff --git a/unittests/clientSettingsPolicy/clientSettingsPolicy.yaml b/unittests/clientSettingsPolicies/clientSettingsPolicy.yaml
similarity index 100%
rename from unittests/clientSettingsPolicy/clientSettingsPolicy.yaml
rename to unittests/clientSettingsPolicies/clientSettingsPolicy.yaml
diff --git a/unittests/deployment/certificate.yaml b/unittests/deployments/certificate.yaml
similarity index 100%
rename from unittests/deployment/certificate.yaml
rename to unittests/deployments/certificate.yaml
diff --git a/unittests/deployment/deployment.yaml b/unittests/deployments/deployment.yaml
similarity index 100%
rename from unittests/deployment/deployment.yaml
rename to unittests/deployments/deployment.yaml
diff --git a/unittests/deployment/downloadMode.yaml b/unittests/deployments/downloadMode.yaml
similarity index 100%
rename from unittests/deployment/downloadMode.yaml
rename to unittests/deployments/downloadMode.yaml
diff --git a/unittests/deployment/env.yaml b/unittests/deployments/env.yaml
similarity index 100%
rename from unittests/deployment/env.yaml
rename to unittests/deployments/env.yaml
diff --git a/unittests/deployment/gitConfig.yaml b/unittests/deployments/gitConfig.yaml
similarity index 100%
rename from unittests/deployment/gitConfig.yaml
rename to unittests/deployments/gitConfig.yaml
diff --git a/unittests/deployment/netrc.yaml b/unittests/deployments/netrc.yaml
similarity index 100%
rename from unittests/deployment/netrc.yaml
rename to unittests/deployments/netrc.yaml
diff --git a/unittests/deployment/persistentVolumeClaim.yaml b/unittests/deployments/persistentVolumeClaim.yaml
similarity index 100%
rename from unittests/deployment/persistentVolumeClaim.yaml
rename to unittests/deployments/persistentVolumeClaim.yaml
diff --git a/unittests/deployment/ssh.yaml b/unittests/deployments/ssh.yaml
similarity index 100%
rename from unittests/deployment/ssh.yaml
rename to unittests/deployments/ssh.yaml
diff --git a/unittests/httpRoute/httpRoute.yaml b/unittests/httpRoutes/httpRoute.yaml
similarity index 100%
rename from unittests/httpRoute/httpRoute.yaml
rename to unittests/httpRoutes/httpRoute.yaml
diff --git a/unittests/ingress/ingress.yaml b/unittests/ingresses/ingress.yaml
similarity index 100%
rename from unittests/ingress/ingress.yaml
rename to unittests/ingresses/ingress.yaml
diff --git a/unittests/networkPolicy/networkPolicy.yaml b/unittests/networkPolicies/networkPolicy.yaml
similarity index 100%
rename from unittests/networkPolicy/networkPolicy.yaml
rename to unittests/networkPolicies/networkPolicy.yaml
diff --git a/unittests/persistentVolumeClaim/persistentVolumeClaim.yaml b/unittests/persistentVolumeClaims/persistentVolumeClaim.yaml
similarity index 100%
rename from unittests/persistentVolumeClaim/persistentVolumeClaim.yaml
rename to unittests/persistentVolumeClaims/persistentVolumeClaim.yaml
diff --git a/unittests/service/service.yaml b/unittests/services/service.yaml
similarity index 100%
rename from unittests/service/service.yaml
rename to unittests/services/service.yaml