diff --git a/Projects/Governance/Icons/tokens-switch.png b/Projects/Governance/Icons/pool-class.png
similarity index 100%
rename from Projects/Governance/Icons/tokens-switch.png
rename to Projects/Governance/Icons/pool-class.png
diff --git a/Projects/Governance/Schemas/App-Schema/pool-class.json b/Projects/Governance/Schemas/App-Schema/pool-class.json
index 84e4ff7b1..4ba67142c 100644
--- a/Projects/Governance/Schemas/App-Schema/pool-class.json
+++ b/Projects/Governance/Schemas/App-Schema/pool-class.json
@@ -1,5 +1,5 @@
 {
-    "type": "Tokens Switch",
+    "type": "Pool Class",
     "menuItems": [
         {
             "action": "Configure",
@@ -11,8 +11,8 @@
         {
             "action": "Add UI Object",
             "actionFunction": "payload.executeAction",
-            "label": "Add Tokens Switch",
-            "relatedUiObject": "Tokens Switch"
+            "label": "Add Pool Class",
+            "relatedUiObject": "Pool Class"
         },
         {
             "action": "Add UI Object",
@@ -39,17 +39,17 @@
     "addLeftIcons": true,
     "level": 2,
     "attachingRules": {
-        "compatibleTypes": "->Pools->Tokens Switch->"
+        "compatibleTypes": "->Pools->Pool Class->"
     },
     "referencingRules": {
         "compatibleTypes": "->Position Class->Position->"
     },
-    "propertyNameAtParent": "tokensSwitches",
+    "propertyNameAtParent": "poolClasses",
     "childrenNodesProperties": [
         {
-            "name": "tokensSwitches",
+            "name": "poolClasses",
             "type": "array",
-            "childType": "Tokens Switch",
+            "childType": "Pool Class",
             "autoAdd": false
         },
         {
diff --git a/Projects/Governance/Schemas/App-Schema/pool-weight-vote.json b/Projects/Governance/Schemas/App-Schema/pool-weight-vote.json
index 05a8deeeb..59b68b56f 100644
--- a/Projects/Governance/Schemas/App-Schema/pool-weight-vote.json
+++ b/Projects/Governance/Schemas/App-Schema/pool-weight-vote.json
@@ -34,7 +34,7 @@
         "compatibleTypes": "->Votes Switch->"
     },
     "referencingRules": {
-        "compatibleTypes": "->Tokens Switch->Pool->"
+        "compatibleTypes": "->Pool Class->Pool->"
     },
     "propertyNameAtParent": "poolWeightVotes"
 }
\ No newline at end of file
diff --git a/Projects/Governance/Schemas/App-Schema/pool.json b/Projects/Governance/Schemas/App-Schema/pool.json
index 8eb58308d..2f8a5cea2 100644
--- a/Projects/Governance/Schemas/App-Schema/pool.json
+++ b/Projects/Governance/Schemas/App-Schema/pool.json
@@ -11,8 +11,8 @@
         {
             "action": "Add UI Object",
             "actionFunction": "payload.executeAction",
-            "label": "Add Tokens Switch",
-            "relatedUiObject": "Tokens Switch"
+            "label": "Add Pool Class",
+            "relatedUiObject": "Pool Class"
         },
         {
             "action": "Add UI Object",
@@ -39,7 +39,7 @@
     "addLeftIcons": true,
     "level": 2,
     "attachingRules": {
-        "compatibleTypes": "->Tokens Switch->Pool->"
+        "compatibleTypes": "->Pool Class->Pool->"
     },
     "referencingRules": {
         "compatibleTypes": "->Positions->Assets->Features->"
@@ -47,9 +47,9 @@
     "propertyNameAtParent": "pools",
     "childrenNodesProperties": [
         {
-            "name": "tokensSwitches",
+            "name": "poolClasses",
             "type": "array",
-            "childType": "Tokens Switch",
+            "childType": "Pool Class",
             "autoAdd": false
         },
         {
diff --git a/Projects/Governance/Schemas/App-Schema/pools.json b/Projects/Governance/Schemas/App-Schema/pools.json
index 6f0c78625..bdecce6f7 100644
--- a/Projects/Governance/Schemas/App-Schema/pools.json
+++ b/Projects/Governance/Schemas/App-Schema/pools.json
@@ -11,8 +11,8 @@
         {
             "action": "Add UI Object",
             "actionFunction": "payload.executeAction",
-            "label": "Add Tokens Switch",
-            "relatedUiObject": "Tokens Switch"
+            "label": "Add Pool Class",
+            "relatedUiObject": "Pool Class"
         },
         {
             "action": "Add UI Object",
@@ -41,9 +41,9 @@
     "level": 0,
     "childrenNodesProperties": [
         {
-            "name": "tokensSwitches",
+            "name": "poolClasses",
             "type": "array",
-            "childType": "Tokens Switch",
+            "childType": "Pool Class",
             "autoAdd": false
         },
         {
diff --git a/Projects/Governance/UI/Spaces/Pools-Space/Pools.js b/Projects/Governance/UI/Spaces/Pools-Space/Pools.js
index d4fc6b3ae..62ddd3fcc 100644
--- a/Projects/Governance/UI/Spaces/Pools-Space/Pools.js
+++ b/Projects/Governance/UI/Spaces/Pools-Space/Pools.js
@@ -78,7 +78,6 @@ function newGovernancePoolsSpace() {
         token flow.
         */
         if (
-            node.type === 'Position' ||
             node.type === 'Asset' ||
             node.type === 'Feature'
         ) { return }
diff --git a/Projects/Governance/UI/Spaces/User-Profile-Space/UserProfile.js b/Projects/Governance/UI/Spaces/User-Profile-Space/UserProfile.js
index 8fe109aa6..507d76a67 100644
--- a/Projects/Governance/UI/Spaces/User-Profile-Space/UserProfile.js
+++ b/Projects/Governance/UI/Spaces/User-Profile-Space/UserProfile.js
@@ -188,7 +188,10 @@ function newGovernanceUserProfileSpace() {
                 node.type === 'Asset' ||
                 node.type === 'Asset Class' ||
                 node.type === 'Feature' ||
-                node.type === 'Feature Class'
+                node.type === 'Feature Class' ||
+                node.type === 'Position Contribution Claim' ||
+                node.type === 'Asset Contribution Claim' ||
+                node.type === 'Feature Contribution Claim'
             ) { 
                 node.payload.uiObject.valueAngleOffset = 0
                 node.payload.uiObject.valueAtAngle = false