diff --git a/pkg/config/config.go b/pkg/config/config.go
index cfc27b42fe..da13c75248 100644
--- a/pkg/config/config.go
+++ b/pkg/config/config.go
@@ -15,9 +15,9 @@ const (
 	ValidatingWebhookConfigurationDebug = "kyverno-validating-webhook-cfg-debug"
 	ValidatingWebhookName               = "nirmata.kyverno.validating-webhook"
 
-	PolicyValidatingWebhookConfigurationName  = "kyverno-policy-validating-webhook-cfg"
-	PolicyValidatingWebhookConfigurationDebug = "kyverno-policy-validating-webhook-cfg-debug"
-	PolicyValidatingWebhookName               = "nirmata.kyverno.policy-validating-webhook"
+	PolicyValidatingWebhookConfigurationName      = "kyverno-policy-validating-webhook-cfg"
+	PolicyValidatingWebhookConfigurationDebugName = "kyverno-policy-validating-webhook-cfg-debug"
+	PolicyValidatingWebhookName                   = "nirmata.kyverno.policy-validating-webhook"
 
 	PolicyMutatingWebhookConfigurationName      = "kyverno-policy-mutating-webhook-cfg"
 	PolicyMutatingWebhookConfigurationDebugName = "kyverno-policy-mutating-webhook-cfg-debug"
diff --git a/pkg/webhookconfig/policy.go b/pkg/webhookconfig/policy.go
index ccf73d59ef..e44cc4f13f 100644
--- a/pkg/webhookconfig/policy.go
+++ b/pkg/webhookconfig/policy.go
@@ -41,7 +41,7 @@ func (wrc *WebhookRegistrationClient) contructDebugPolicyValidatingWebhookConfig
 
 	return &admregapi.ValidatingWebhookConfiguration{
 		ObjectMeta: v1.ObjectMeta{
-			Name:   config.PolicyValidatingWebhookConfigurationDebug,
+			Name:   config.PolicyValidatingWebhookConfigurationDebugName,
 			Labels: config.KubePolicyAppLabels,
 		},
 		Webhooks: []admregapi.Webhook{
diff --git a/pkg/webhookconfig/registration.go b/pkg/webhookconfig/registration.go
index 02ee64b3b0..aac779bfa0 100644
--- a/pkg/webhookconfig/registration.go
+++ b/pkg/webhookconfig/registration.go
@@ -205,7 +205,7 @@ func (wrc *WebhookRegistrationClient) removePolicyWebhookConfigurations() {
 	// Validating webhook configuration
 	var validatingConfig string
 	if wrc.serverIP != "" {
-		validatingConfig = config.PolicyValidatingWebhookConfigurationDebug
+		validatingConfig = config.PolicyValidatingWebhookConfigurationDebugName
 	} else {
 		validatingConfig = config.PolicyValidatingWebhookConfigurationName
 	}
@@ -229,6 +229,7 @@ func (wrc *WebhookRegistrationClient) removePolicyWebhookConfigurations() {
 	}
 }
 
+//RemoveResourceMutatingWebhookConfiguration removes mutating webhook configuration for all resources
 func (wrc *WebhookRegistrationClient) RemoveResourceMutatingWebhookConfiguration() {
 	var configName string
 	if wrc.serverIP != "" {
@@ -245,6 +246,7 @@ func (wrc *WebhookRegistrationClient) RemoveResourceMutatingWebhookConfiguration
 	}
 }
 
+// removeResourceValidatingWebhookConfiguration removes validating webhook configuration on all resources
 func (wrc *WebhookRegistrationClient) removeResourceValidatingWebhookConfiguration() {
 	var configName string
 	if wrc.serverIP != "" {