diff --git a/src/test/resources/tosca/guard1-policy-payload.json b/src/test/resources/tosca/guard1-policy-payload.json
index bacf174..b4e0809 100644
--- a/src/test/resources/tosca/guard1-policy-payload.json
+++ b/src/test/resources/tosca/guard1-policy-payload.json
@@ -1,15 +1,15 @@
 {
 	"policy-id": "guard1",
-	"contents": {
+	"content": {
 		"recipe": "Rebuild",
 		"actor": "SO",
 		"clname": "testloop",
-		"guardTargets": ".*",
-		"minGuard": "3",
-		"maxGuard": "7",
-		"limitGuard": "",
-		"timeUnitsGuard": "",
-		"timeWindowGuard": "",
+		"targets": ".*",
+		"min": "3",
+		"max": "7",
+		"limit": "",
+		"timeUnits": "",
+		"timeWindow": "",
 		"guardActiveStart": "00:00:01-05:00",
 		"guardActiveEnd": "23:59:01-05:00"
 	}
diff --git a/src/test/resources/tosca/guard2-policy-payload.json b/src/test/resources/tosca/guard2-policy-payload.json
index 89f7ec8..29beb6b 100644
--- a/src/test/resources/tosca/guard2-policy-payload.json
+++ b/src/test/resources/tosca/guard2-policy-payload.json
@@ -1,15 +1,15 @@
 {
 	"policy-id": "guard2",
-	"contents": {
+	"content": {
 		"recipe": "Migrate",
 		"actor": "SO",
 		"clname": "testloop",
-		"guardTargets": ".*",
-		"minGuard": "1",
-		"maxGuard": "2",
-		"limitGuard": "",
-		"timeUnitsGuard": "",
-		"timeWindowGuard": "",
+		"targets": ".*",
+		"min": "1",
+		"max": "2",
+		"limit": "",
+		"timeUnits": "",
+		"timeWindow": "",
 		"guardActiveStart": "00:00:01-05:00",
 		"guardActiveEnd": "23:59:01-05:00"
 	}
diff --git a/src/test/resources/tosca/operational-policy-properties.json b/src/test/resources/tosca/operational-policy-properties.json
index 5036165..52eabb8 100644
--- a/src/test/resources/tosca/operational-policy-properties.json
+++ b/src/test/resources/tosca/operational-policy-properties.json
@@ -4,12 +4,12 @@
 			"recipe": "Rebuild",
 			"actor": "SO",
 			"clname": "testloop",
-			"guardTargets": ".*",
-			"minGuard": "3",
-			"maxGuard": "7",
-			"limitGuard": "",
-			"timeUnitsGuard": "",
-			"timeWindowGuard": "",
+			"targets": ".*",
+			"min": "3",
+			"max": "7",
+			"limit": "",
+			"timeUnits": "",
+			"timeWindow": "",
 			"guardActiveStart": "00:00:01-05:00",
 			"guardActiveEnd": "23:59:01-05:00"
 		},
@@ -17,12 +17,12 @@
 			"recipe": "Migrate",
 			"actor": "SO",
 			"clname": "testloop",
-			"guardTargets": ".*",
-			"minGuard": "1",
-			"maxGuard": "2",
-			"limitGuard": "",
-			"timeUnitsGuard": "",
-			"timeWindowGuard": "",
+			"targets": ".*",
+			"min": "1",
+			"max": "2",
+			"limit": "",
+			"timeUnits": "",
+			"timeWindow": "",
 			"guardActiveStart": "00:00:01-05:00",
 			"guardActiveEnd": "23:59:01-05:00"
 		}