diff --git a/pkg/apis/policy/register.go b/pkg/apis/policy/register.go
index 9e9831538d..d55c28d2f6 100644
--- a/pkg/apis/policy/register.go
+++ b/pkg/apis/policy/register.go
@@ -1,5 +1,6 @@
 package policy
 
 const (
-    GroupName = "policy.nirmata.io"
+	// GroupName must be the same as specified in Policy CRD
+	GroupName = "kubepolicy.nirmata.io"
 )
diff --git a/pkg/apis/policy/v1alpha1/deepcopy.go b/pkg/apis/policy/v1alpha1/deepcopy.go
new file mode 100644
index 0000000000..a6170cff51
--- /dev/null
+++ b/pkg/apis/policy/v1alpha1/deepcopy.go
@@ -0,0 +1,25 @@
+package v1alpha1
+
+// DeepCopyInto is declared because k8s:deepcopy-gen is
+// not able to generate this method for interface{} member
+func (in *Mutation) DeepCopyInto(out *Mutation) {
+	if out != nil {
+		*out = *in
+	}
+}
+
+// DeepCopyInto is declared because k8s:deepcopy-gen is
+// not able to generate this method for interface{} member
+func (in *Patch) DeepCopyInto(out *Patch) {
+	if out != nil {
+		*out = *in
+	}
+}
+
+// DeepCopyInto is declared because k8s:deepcopy-gen is
+// not able to generate this method for interface{} member
+func (in *Validation) DeepCopyInto(out *Validation) {
+	if out != nil {
+		*out = *in
+	}
+}
diff --git a/pkg/apis/policy/v1alpha1/doc.go b/pkg/apis/policy/v1alpha1/doc.go
index 29811f597c..d1cb706659 100644
--- a/pkg/apis/policy/v1alpha1/doc.go
+++ b/pkg/apis/policy/v1alpha1/doc.go
@@ -1,4 +1,4 @@
 // +k8s:deepcopy-gen=package
-// +groupName=nirmata.io
+// +groupName=kubepolicy.nirmata.io
 
 package v1alpha1
diff --git a/pkg/apis/policy/v1alpha1/types.go b/pkg/apis/policy/v1alpha1/types.go
index 7fcb3fc380..6dd2838d22 100644
--- a/pkg/apis/policy/v1alpha1/types.go
+++ b/pkg/apis/policy/v1alpha1/types.go
@@ -7,89 +7,92 @@ import (
 // +genclient
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 
-// An example of the YAML representation of this structure is here:
-// <project_root>/crd/policy-example.yaml
+// Policy contains rules to be applied to created resources
 type Policy struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`
-	Spec              PolicySpec   `json:"spec"`
-	Status            PolicyStatus `json:"status"`
+	Spec              Spec   `json:"spec"`
+	Status            Status `json:"status"`
 }
 
-// Specification of the Policy.
-// failurePolicy can have values "continueOnError" and "stopOnError" (default).
-type PolicySpec struct {
-	FailurePolicy *string      `json:"failurePolicy"`
-	Rules         []PolicyRule `json:"rules"`
+// Spec describes policy behavior by its rules
+type Spec struct {
+	Rules []Rule `json:"rules"`
 }
 
-// The rule of mutation for the single resource definition.
-// Details are listed in the description of each of the substructures.
-type PolicyRule struct {
-	Name               string                 `json:"name"`
-	Resource           PolicyResource         `json:"resource"`
-	Patches            []PolicyPatch          `json:"patch,omitempty"`
-	ConfigMapGenerator *PolicyConfigGenerator `json:"configMapGenerator,omitempty"`
-	SecretGenerator    *PolicyConfigGenerator `json:"secretGenerator,omitempty"`
+// Rule is set of mutation, validation and generation actions
+// for the single resource description
+type Rule struct {
+	Name                string `json:"name"`
+	ResourceDescription `json:"resource"`
+	Mutation            `json:"mutate"`
+	Validation          `json:"validate"`
+	Generation          `json:"generate"`
 }
 
-// Describes the resource to which the PolicyRule will apply.
-// Either the name or selector must be specified.
-// IMPORTANT: If neither is specified, the policy rule will not apply (TBD).
-type PolicyResource struct {
+// ResourceDescription describes the resource to which the PolicyRule will be applied.
+type ResourceDescription struct {
 	Kind     string                `json:"kind"`
 	Name     *string               `json:"name"`
-	Selector *metav1.LabelSelector `json:"selector,omitempty"`
+	Selector *metav1.LabelSelector `json:"selector"`
+}
+
+// Mutation describes the way how Mutating Webhook will react on resource creation
+type Mutation struct {
+	Overlay interface{} `json:"overlay"`
+	Patches []Patch     `json:"patches"`
 }
 
 // +k8s:deepcopy-gen=false
 
-// PolicyPatch declares patch operation for created object according to the JSONPatch spec:
-// http://jsonpatch.com/
-type PolicyPatch struct {
+// Patch declares patch operation for created object according to RFC 6902
+type Patch struct {
 	Path      string      `json:"path"`
 	Operation string      `json:"op"`
 	Value     interface{} `json:"value"`
 }
 
-func (in *PolicyPatch) DeepCopyInto(out *PolicyPatch) {
-	if out != nil {
-		*out = *in
-	}
+// Validation describes the way how Validating Webhook will check the resource on creation
+type Validation struct {
+	Message *string     `json:"message"`
+	Pattern interface{} `json:"pattern"`
 }
 
-// The declaration for a Secret or a ConfigMap, which will be created in the new namespace.
-// Can be applied only when PolicyRule.Resource.Kind is "Namespace".
-type PolicyConfigGenerator struct {
-	Name     string            `json:"name"`
-	CopyFrom *PolicyCopyFrom   `json:"copyFrom"`
+// Generation describes which resources will be created when other resource is created
+type Generation struct {
+	Kind     string `json:"kind"`
+	Name     string `json:"name"`
+	CopyFrom `json:"copyFrom"`
 	Data     map[string]string `json:"data"`
+	Labels   map[string]string `json:"labels"`
 }
 
-// Location of a Secret or a ConfigMap which will be used as source when applying PolicyConfigGenerator
-type PolicyCopyFrom struct {
+// CopyFrom - location of a Secret or a ConfigMap
+// which will be used as source when applying 'generate'
+type CopyFrom struct {
 	Namespace string `json:"namespace"`
 	Name      string `json:"name"`
 }
 
-// Contains logs about policy application
-type PolicyStatus struct {
-	Logs       []string    `json:"log"`
+// Status contains violations for existing resources
+type Status struct {
 	Violations []Violation `json:"violations,omitempty"`
 }
 
-// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
-
-// List of Policy resources
-type PolicyList struct {
-	metav1.TypeMeta `json:",inline"`
-	metav1.ListMeta `json:"metadata"`
-	Items           []Policy `json:"items"`
-}
-
 // Violation for the policy
 type Violation struct {
 	Kind     string `json:"kind,omitempty"`
 	Resource string `json:"resource,omitempty"`
 	Rule     string `json:"rule,omitempty"`
+	Reason   string `json:"reason,omitempty"`
+	Message  string `json:"message,omitempty`
+}
+
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
+
+// PolicyList is a list of Policy resources
+type PolicyList struct {
+	metav1.TypeMeta `json:",inline"`
+	metav1.ListMeta `json:"metadata"`
+	Items           []Policy `json:"items"`
 }