diff --git a/powerhint-cheetah-a0.json b/powerhint-cheetah-a0.json
index f82ce3f..51cc1ef 100644
--- a/powerhint-cheetah-a0.json
+++ b/powerhint-cheetah-a0.json
@@ -855,12 +855,6 @@
       "Duration": 0,
       "Value": "1"
     },
-    {
-      "PowerHint": "CAMERA_STREAMING_EXTREME",
-      "Node": "GPUMinFreq",
-      "Duration": 0,
-      "Value": "302000"
-    },
     {
       "PowerHint": "CAMERA_STREAMING_EXTREME",
       "Node": "MemFreq",
@@ -939,12 +933,6 @@
       "Duration": 0,
       "Value": "1401000"
     },
-    {
-      "PowerHint": "CAMERA_STREAMING_HIGH",
-      "Node": "GPUMinFreq",
-      "Duration": 0,
-      "Value": "302000"
-    },
     {
       "PowerHint": "CAMERA_STREAMING_HIGH",
       "Node": "MemFreq",
@@ -1023,12 +1011,6 @@
       "Duration": 0,
       "Value": "1401000"
     },
-    {
-      "PowerHint": "CAMERA_STREAMING_STANDARD",
-      "Node": "GPUMinFreq",
-      "Duration": 0,
-      "Value": "302000"
-    },
     {
       "PowerHint": "CAMERA_STREAMING_STANDARD",
       "Node": "MemFreq",
@@ -1101,12 +1083,6 @@
       "Duration": 0,
       "Value": "1401000"
     },
-    {
-      "PowerHint": "CAMERA_STREAMING_LOW",
-      "Node": "GPUMinFreq",
-      "Duration": 0,
-      "Value": "302000"
-    },
     {
       "PowerHint": "CAMERA_STREAMING_LOW",
       "Node": "MemFreq",
@@ -1143,6 +1119,18 @@
       "Duration": 0,
       "Value": "0"
     },
+    {
+      "PowerHint": "CAMERA_GPU_HIGH",
+      "Node": "GPUMinFreq",
+      "Duration": 0,
+      "Value": "572000"
+    },
+    {
+      "PowerHint": "CAMERA_GPU_STANDARD",
+      "Node": "GPUMinFreq",
+      "Duration": 0,
+      "Value": "302000"
+    },
     {
       "PowerHint": "FIXED_PERFORMANCE",
       "Node": "CPUBigClusterMaxFreq",
diff --git a/powerhint-cheetah.json b/powerhint-cheetah.json
index 20ee9dc..5af78dd 100644
--- a/powerhint-cheetah.json
+++ b/powerhint-cheetah.json
@@ -855,12 +855,6 @@
       "Duration": 0,
       "Value": "1"
     },
-    {
-      "PowerHint": "CAMERA_STREAMING_EXTREME",
-      "Node": "GPUMinFreq",
-      "Duration": 0,
-      "Value": "302000"
-    },
     {
       "PowerHint": "CAMERA_STREAMING_EXTREME",
       "Node": "MemFreq",
@@ -939,12 +933,6 @@
       "Duration": 0,
       "Value": "1401000"
     },
-    {
-      "PowerHint": "CAMERA_STREAMING_HIGH",
-      "Node": "GPUMinFreq",
-      "Duration": 0,
-      "Value": "302000"
-    },
     {
       "PowerHint": "CAMERA_STREAMING_HIGH",
       "Node": "MemFreq",
@@ -1023,12 +1011,6 @@
       "Duration": 0,
       "Value": "1401000"
     },
-    {
-      "PowerHint": "CAMERA_STREAMING_STANDARD",
-      "Node": "GPUMinFreq",
-      "Duration": 0,
-      "Value": "302000"
-    },
     {
       "PowerHint": "CAMERA_STREAMING_STANDARD",
       "Node": "MemFreq",
@@ -1101,12 +1083,6 @@
       "Duration": 0,
       "Value": "1401000"
     },
-    {
-      "PowerHint": "CAMERA_STREAMING_LOW",
-      "Node": "GPUMinFreq",
-      "Duration": 0,
-      "Value": "302000"
-    },
     {
       "PowerHint": "CAMERA_STREAMING_LOW",
       "Node": "MemFreq",
@@ -1143,6 +1119,18 @@
       "Duration": 0,
       "Value": "0"
     },
+    {
+      "PowerHint": "CAMERA_GPU_HIGH",
+      "Node": "GPUMinFreq",
+      "Duration": 0,
+      "Value": "572000"
+    },
+    {
+      "PowerHint": "CAMERA_GPU_STANDARD",
+      "Node": "GPUMinFreq",
+      "Duration": 0,
+      "Value": "302000"
+    },
     {
       "PowerHint": "FIXED_PERFORMANCE",
       "Node": "CPUBigClusterMaxFreq",
diff --git a/powerhint-cloudripper.json b/powerhint-cloudripper.json
index ac9ce8c..d6c1f96 100644
--- a/powerhint-cloudripper.json
+++ b/powerhint-cloudripper.json
@@ -675,12 +675,6 @@
       "Duration": 0,
       "Value": "1"
     },
-    {
-      "PowerHint": "CAMERA_STREAMING_EXTREME",
-      "Node": "GPUMinFreq",
-      "Duration": 0,
-      "Value": "302000"
-    },
     {
       "PowerHint": "CAMERA_STREAMING_EXTREME",
       "Node": "MemFreq",
@@ -759,12 +753,6 @@
       "Duration": 0,
       "Value": "1401000"
     },
-    {
-      "PowerHint": "CAMERA_STREAMING_HIGH",
-      "Node": "GPUMinFreq",
-      "Duration": 0,
-      "Value": "302000"
-    },
     {
       "PowerHint": "CAMERA_STREAMING_HIGH",
       "Node": "MemFreq",
@@ -843,12 +831,6 @@
       "Duration": 0,
       "Value": "1401000"
     },
-    {
-      "PowerHint": "CAMERA_STREAMING_STANDARD",
-      "Node": "GPUMinFreq",
-      "Duration": 0,
-      "Value": "302000"
-    },
     {
       "PowerHint": "CAMERA_STREAMING_STANDARD",
       "Node": "MemFreq",
@@ -921,12 +903,6 @@
       "Duration": 0,
       "Value": "1401000"
     },
-    {
-      "PowerHint": "CAMERA_STREAMING_LOW",
-      "Node": "GPUMinFreq",
-      "Duration": 0,
-      "Value": "302000"
-    },
     {
       "PowerHint": "CAMERA_STREAMING_LOW",
       "Node": "MemFreq",
@@ -963,6 +939,18 @@
       "Duration": 0,
       "Value": "0"
     },
+    {
+      "PowerHint": "CAMERA_GPU_HIGH",
+      "Node": "GPUMinFreq",
+      "Duration": 0,
+      "Value": "572000"
+    },
+    {
+      "PowerHint": "CAMERA_GPU_STANDARD",
+      "Node": "GPUMinFreq",
+      "Duration": 0,
+      "Value": "302000"
+    },
     {
       "PowerHint": "FIXED_PERFORMANCE",
       "Node": "CPUBigClusterMaxFreq",
diff --git a/powerhint-panther-a0.json b/powerhint-panther-a0.json
index e6dc622..d1e52c4 100644
--- a/powerhint-panther-a0.json
+++ b/powerhint-panther-a0.json
@@ -844,12 +844,6 @@
       "Duration": 0,
       "Value": "1"
     },
-    {
-      "PowerHint": "CAMERA_STREAMING_EXTREME",
-      "Node": "GPUMinFreq",
-      "Duration": 0,
-      "Value": "302000"
-    },
     {
       "PowerHint": "CAMERA_STREAMING_EXTREME",
       "Node": "MemFreq",
@@ -928,12 +922,6 @@
       "Duration": 0,
       "Value": "1401000"
     },
-    {
-      "PowerHint": "CAMERA_STREAMING_HIGH",
-      "Node": "GPUMinFreq",
-      "Duration": 0,
-      "Value": "302000"
-    },
     {
       "PowerHint": "CAMERA_STREAMING_HIGH",
       "Node": "MemFreq",
@@ -1012,12 +1000,6 @@
       "Duration": 0,
       "Value": "1401000"
     },
-    {
-      "PowerHint": "CAMERA_STREAMING_STANDARD",
-      "Node": "GPUMinFreq",
-      "Duration": 0,
-      "Value": "302000"
-    },
     {
       "PowerHint": "CAMERA_STREAMING_STANDARD",
       "Node": "MemFreq",
@@ -1090,12 +1072,6 @@
       "Duration": 0,
       "Value": "1401000"
     },
-    {
-      "PowerHint": "CAMERA_STREAMING_LOW",
-      "Node": "GPUMinFreq",
-      "Duration": 0,
-      "Value": "302000"
-    },
     {
       "PowerHint": "CAMERA_STREAMING_LOW",
       "Node": "MemFreq",
@@ -1132,6 +1108,18 @@
       "Duration": 0,
       "Value": "0"
     },
+    {
+      "PowerHint": "CAMERA_GPU_HIGH",
+      "Node": "GPUMinFreq",
+      "Duration": 0,
+      "Value": "572000"
+    },
+    {
+      "PowerHint": "CAMERA_GPU_STANDARD",
+      "Node": "GPUMinFreq",
+      "Duration": 0,
+      "Value": "302000"
+    },
     {
       "PowerHint": "FIXED_PERFORMANCE",
       "Node": "CPUBigClusterMaxFreq",
diff --git a/powerhint-panther.json b/powerhint-panther.json
index dd13615..77aba7e 100644
--- a/powerhint-panther.json
+++ b/powerhint-panther.json
@@ -844,12 +844,6 @@
       "Duration": 0,
       "Value": "1"
     },
-    {
-      "PowerHint": "CAMERA_STREAMING_EXTREME",
-      "Node": "GPUMinFreq",
-      "Duration": 0,
-      "Value": "302000"
-    },
     {
       "PowerHint": "CAMERA_STREAMING_EXTREME",
       "Node": "MemFreq",
@@ -928,12 +922,6 @@
       "Duration": 0,
       "Value": "1401000"
     },
-    {
-      "PowerHint": "CAMERA_STREAMING_HIGH",
-      "Node": "GPUMinFreq",
-      "Duration": 0,
-      "Value": "302000"
-    },
     {
       "PowerHint": "CAMERA_STREAMING_HIGH",
       "Node": "MemFreq",
@@ -1012,12 +1000,6 @@
       "Duration": 0,
       "Value": "1401000"
     },
-    {
-      "PowerHint": "CAMERA_STREAMING_STANDARD",
-      "Node": "GPUMinFreq",
-      "Duration": 0,
-      "Value": "302000"
-    },
     {
       "PowerHint": "CAMERA_STREAMING_STANDARD",
       "Node": "MemFreq",
@@ -1090,12 +1072,6 @@
       "Duration": 0,
       "Value": "1401000"
     },
-    {
-      "PowerHint": "CAMERA_STREAMING_LOW",
-      "Node": "GPUMinFreq",
-      "Duration": 0,
-      "Value": "302000"
-    },
     {
       "PowerHint": "CAMERA_STREAMING_LOW",
       "Node": "MemFreq",
@@ -1132,6 +1108,18 @@
       "Duration": 0,
       "Value": "0"
     },
+    {
+      "PowerHint": "CAMERA_GPU_HIGH",
+      "Node": "GPUMinFreq",
+      "Duration": 0,
+      "Value": "572000"
+    },
+    {
+      "PowerHint": "CAMERA_GPU_STANDARD",
+      "Node": "GPUMinFreq",
+      "Duration": 0,
+      "Value": "302000"
+    },
     {
       "PowerHint": "FIXED_PERFORMANCE",
       "Node": "CPUBigClusterMaxFreq",
diff --git a/powerhint-ravenclaw.json b/powerhint-ravenclaw.json
index 4a12911..2cd08a8 100644
--- a/powerhint-ravenclaw.json
+++ b/powerhint-ravenclaw.json
@@ -675,12 +675,6 @@
       "Duration": 0,
       "Value": "1"
     },
-    {
-      "PowerHint": "CAMERA_STREAMING_EXTREME",
-      "Node": "GPUMinFreq",
-      "Duration": 0,
-      "Value": "302000"
-    },
     {
       "PowerHint": "CAMERA_STREAMING_EXTREME",
       "Node": "MemFreq",
@@ -759,12 +753,6 @@
       "Duration": 0,
       "Value": "1401000"
     },
-    {
-      "PowerHint": "CAMERA_STREAMING_HIGH",
-      "Node": "GPUMinFreq",
-      "Duration": 0,
-      "Value": "302000"
-    },
     {
       "PowerHint": "CAMERA_STREAMING_HIGH",
       "Node": "MemFreq",
@@ -843,12 +831,6 @@
       "Duration": 0,
       "Value": "1401000"
     },
-    {
-      "PowerHint": "CAMERA_STREAMING_STANDARD",
-      "Node": "GPUMinFreq",
-      "Duration": 0,
-      "Value": "302000"
-    },
     {
       "PowerHint": "CAMERA_STREAMING_STANDARD",
       "Node": "MemFreq",
@@ -921,12 +903,6 @@
       "Duration": 0,
       "Value": "1401000"
     },
-    {
-      "PowerHint": "CAMERA_STREAMING_LOW",
-      "Node": "GPUMinFreq",
-      "Duration": 0,
-      "Value": "302000"
-    },
     {
       "PowerHint": "CAMERA_STREAMING_LOW",
       "Node": "MemFreq",
@@ -963,6 +939,18 @@
       "Duration": 0,
       "Value": "0"
     },
+    {
+      "PowerHint": "CAMERA_GPU_HIGH",
+      "Node": "GPUMinFreq",
+      "Duration": 0,
+      "Value": "572000"
+    },
+    {
+      "PowerHint": "CAMERA_GPU_STANDARD",
+      "Node": "GPUMinFreq",
+      "Duration": 0,
+      "Value": "302000"
+    },
     {
       "PowerHint": "FIXED_PERFORMANCE",
       "Node": "CPUBigClusterMaxFreq",