diff --git a/Bindings/JSON/JsonAddToObject.cs b/Bindings/JSON/JsonAddToObject.cs
index ebb2a6f..e2265bb 100644
--- a/Bindings/JSON/JsonAddToObject.cs
+++ b/Bindings/JSON/JsonAddToObject.cs
@@ -9,15 +9,15 @@
 
 
     [Category(new string[] { "ProtoFlux/Runtimes/Execution/Nodes/Obsidian/Json" })]
-    public class JsonAddToObjectBinding<T> : FrooxEngine.ProtoFlux.Runtimes.Execution.ObjectFunctionNode<FrooxEngineContext, JObject>
+    public class JsonAddToObject<T> : FrooxEngine.ProtoFlux.Runtimes.Execution.ObjectFunctionNode<FrooxEngineContext, JObject>
     {
         public readonly SyncRef<INodeObjectOutput<JObject>> Input;
         public readonly SyncRef<INodeObjectOutput<string>> Tag;
         public readonly SyncRef<INodeObjectOutput<T>> Object;
 
-        public override Type NodeType => typeof(JsonAddToObject<T>);
+        public override Type NodeType => typeof(JsonAddToObjectNode<T>);
 
-        public JsonAddToObject<T> TypedNodeInstance { get; private set; }
+        public JsonAddToObjectNode<T> TypedNodeInstance { get; private set; }
 
         public override INode NodeInstance => TypedNodeInstance;
 
@@ -29,18 +29,18 @@ public override N Instantiate<N>()
             {
                 throw new InvalidOperationException("Node has already been instantiated");
             }
-            JsonAddToObject<T> jsonAddToObjectInstance = (TypedNodeInstance = new JsonAddToObject<T>());
+        JsonAddToObjectNode<T> jsonAddToObjectInstance = (TypedNodeInstance = new JsonAddToObjectNode<T>());
             return jsonAddToObjectInstance as N;
         }
 
         protected override void AssociateInstanceInternal(INode node)
         {
-            if (node is JsonAddToObject<T> typedNodeInstance)
+            if (node is JsonAddToObjectNode<T> typedNodeInstance)
             {
                 TypedNodeInstance = typedNodeInstance;
                 return;
             }
-            throw new ArgumentException("Node instance is not of type " + typeof(JsonAddToObject<T>));
+            throw new ArgumentException("Node instance is not of type " + typeof(JsonAddToObjectNode<T>));
         }
 
         public override void ClearInstance()
diff --git a/Bindings/JSON/JsonAppendToArrayBinding.cs b/Bindings/JSON/JsonAppendToArrayBinding.cs
index e025a99..1cbfeac 100644
--- a/Bindings/JSON/JsonAppendToArrayBinding.cs
+++ b/Bindings/JSON/JsonAppendToArrayBinding.cs
@@ -8,14 +8,14 @@
 using FrooxEngine.ProtoFlux;
 
     [Category(new string[] { "ProtoFlux/Runtimes/Execution/Nodes/Obsidian/Json" })]
-    public class JsonAppendToArrayBinding<T> : FrooxEngine.ProtoFlux.Runtimes.Execution.ObjectFunctionNode<ExecutionContext, JArray>
+    public class JsonAppendToArray<T> : FrooxEngine.ProtoFlux.Runtimes.Execution.ObjectFunctionNode<ExecutionContext, JArray>
     {
         public readonly SyncRef<INodeObjectOutput<JArray>> Array;
         public readonly SyncRef<INodeObjectOutput<T>> Object;
 
-        public override Type NodeType => typeof(JsonAppendToArray<T>);
+        public override Type NodeType => typeof(JsonAppendToArrayNode<T>);
 
-        public JsonAppendToArray<T> TypedNodeInstance { get; private set; }
+        public JsonAppendToArrayNode<T> TypedNodeInstance { get; private set; }
 
         public override INode NodeInstance => TypedNodeInstance;
 
@@ -27,18 +27,18 @@ public override N Instantiate<N>()
             {
                 throw new InvalidOperationException("Node has already been instantiated");
             }
-            JsonAppendToArray<T> jsonAppendToArrayInstance = (TypedNodeInstance = new JsonAppendToArray<T>());
+        JsonAppendToArrayNode<T> jsonAppendToArrayInstance = (TypedNodeInstance = new JsonAppendToArrayNode<T>());
             return jsonAppendToArrayInstance as N;
         }
 
         protected override void AssociateInstanceInternal(INode node)
         {
-            if (node is JsonAppendToArray<T> typedNodeInstance)
+            if (node is JsonAppendToArrayNode<T> typedNodeInstance)
             {
                 TypedNodeInstance = typedNodeInstance;
                 return;
             }
-            throw new ArgumentException("Node instance is not of type " + typeof(JsonAppendToArray<T>));
+            throw new ArgumentException("Node instance is not of type " + typeof(JsonAppendToArrayNode<T>));
         }
 
         public override void ClearInstance()
diff --git a/Bindings/JSON/JsonCountArrayChildrenBinding.cs b/Bindings/JSON/JsonCountArrayChildrenBinding.cs
index 06bec6b..9ca7a75 100644
--- a/Bindings/JSON/JsonCountArrayChildrenBinding.cs
+++ b/Bindings/JSON/JsonCountArrayChildrenBinding.cs
@@ -8,7 +8,7 @@
 using FrooxEngine.ProtoFlux;
 
     [Category(new string[] { "ProtoFlux/Runtimes/Execution/Nodes/Obsidian/Json" })]
-    public class JsonCountArrayChildrenBinding : FrooxEngine.ProtoFlux.Runtimes.Execution.ValueFunctionNode<ExecutionContext, int>
+    public class JsonCountArrayChildren : FrooxEngine.ProtoFlux.Runtimes.Execution.ValueFunctionNode<ExecutionContext, int>
     {
         public readonly SyncRef<INodeObjectOutput<JArray>> Input;
 
diff --git a/Bindings/JSON/JsonCountObjectChildrenBinding.cs b/Bindings/JSON/JsonCountObjectChildrenBinding.cs
index 6a9a4bb..d51f428 100644
--- a/Bindings/JSON/JsonCountObjectChildrenBinding.cs
+++ b/Bindings/JSON/JsonCountObjectChildrenBinding.cs
@@ -9,7 +9,7 @@
 
 
     [Category(new string[] { "ProtoFlux/Runtimes/Execution/Nodes/Obsidian/Json" })]
-    public class JsonCountObjectChildrenBinding : FrooxEngine.ProtoFlux.Runtimes.Execution.ValueFunctionNode<ExecutionContext, int>
+    public class JsonCountObjectChildren : FrooxEngine.ProtoFlux.Runtimes.Execution.ValueFunctionNode<ExecutionContext, int>
     {
         public readonly SyncRef<INodeObjectOutput<JObject>> Input;
 
diff --git a/Bindings/JSON/JsonEmptyArrayBinding.cs b/Bindings/JSON/JsonEmptyArrayBinding.cs
index c454615..4e26034 100644
--- a/Bindings/JSON/JsonEmptyArrayBinding.cs
+++ b/Bindings/JSON/JsonEmptyArrayBinding.cs
@@ -7,7 +7,7 @@
 using ProtoFlux.Runtimes.Execution.Nodes.Obsidian.Json;
 
 [Category(new string[] { "ProtoFlux/Runtimes/Execution/Nodes/Obsidian/Json" })]
-    public class JsonEmptyArrayBinding : FrooxEngine.ProtoFlux.Runtimes.Execution.ObjectFunctionNode<ExecutionContext, JArray>
+    public class JsonEmptyArray : FrooxEngine.ProtoFlux.Runtimes.Execution.ObjectFunctionNode<ExecutionContext, JArray>
     {
         public override Type NodeType => typeof(JsonEmptyArrayNode);
 
diff --git a/Bindings/JSON/JsonEmptyObjectBinding.cs b/Bindings/JSON/JsonEmptyObjectBinding.cs
index ca4997c..2851624 100644
--- a/Bindings/JSON/JsonEmptyObjectBinding.cs
+++ b/Bindings/JSON/JsonEmptyObjectBinding.cs
@@ -7,7 +7,7 @@
 using ProtoFlux.Runtimes.Execution.Nodes.Obsidian.Json;
 
 [Category(new string[] { "ProtoFlux/Runtimes/Execution/Nodes/Obsidian/Json" })]
-    public class JsonEmptyObjectBinding : FrooxEngine.ProtoFlux.Runtimes.Execution.ObjectFunctionNode<ExecutionContext, JObject>
+    public class JsonEmptyObject : FrooxEngine.ProtoFlux.Runtimes.Execution.ObjectFunctionNode<ExecutionContext, JObject>
     {
         public override Type NodeType => typeof(JsonEmptyObjectNode);
 
diff --git a/Bindings/JSON/JsonGetFromArrayBinding.cs b/Bindings/JSON/JsonGetFromArrayBinding.cs
index d4835ae..1c24a57 100644
--- a/Bindings/JSON/JsonGetFromArrayBinding.cs
+++ b/Bindings/JSON/JsonGetFromArrayBinding.cs
@@ -9,7 +9,7 @@
 
 
     [Category(new string[] { "ProtoFlux/Runtimes/Execution/Nodes/Obsidian/Json" })]
-    public class JsonGetFromArrayBinding<T> : FrooxEngine.ProtoFlux.Runtimes.Execution.ObjectFunctionNode<ExecutionContext, T>
+    public class JsonGetFromArray<T> : FrooxEngine.ProtoFlux.Runtimes.Execution.ObjectFunctionNode<ExecutionContext, T>
     {
         public readonly SyncRef<INodeObjectOutput<JArray>> Input;
         public readonly SyncRef<INodeObjectOutput<int>> Index;
diff --git a/Bindings/JSON/JsonGetFromObjectBinding.cs b/Bindings/JSON/JsonGetFromObjectBinding.cs
index 91fec2a..a5c51e6 100644
--- a/Bindings/JSON/JsonGetFromObjectBinding.cs
+++ b/Bindings/JSON/JsonGetFromObjectBinding.cs
@@ -9,7 +9,7 @@
 
 
     [Category(new string[] { "ProtoFlux/Runtimes/Execution/Nodes/Obsidian/Json" })]
-    public class JsonGetFromObjectBinding<T> : FrooxEngine.ProtoFlux.Runtimes.Execution.ObjectFunctionNode<ExecutionContext, T>
+    public class JsonGetFromObject<T> : FrooxEngine.ProtoFlux.Runtimes.Execution.ObjectFunctionNode<ExecutionContext, T>
     {
         public readonly SyncRef<INodeObjectOutput<JObject>> Input;
         public readonly SyncRef<INodeObjectOutput<string>> Tag;
diff --git a/Bindings/JSON/JsonInsertToArrayBinding.cs b/Bindings/JSON/JsonInsertToArrayBinding.cs
index e63a605..85b5999 100644
--- a/Bindings/JSON/JsonInsertToArrayBinding.cs
+++ b/Bindings/JSON/JsonInsertToArrayBinding.cs
@@ -9,7 +9,7 @@
 
 
     [Category(new string[] { "ProtoFlux/Runtimes/Execution/Nodes/Obsidian/Json" })]
-    public class JsonInsertToArrayBinding<T> : FrooxEngine.ProtoFlux.Runtimes.Execution.ObjectFunctionNode<ExecutionContext, JArray>
+    public class JsonInsertToArray<T> : FrooxEngine.ProtoFlux.Runtimes.Execution.ObjectFunctionNode<ExecutionContext, JArray>
     {
         public readonly SyncRef<INodeObjectOutput<JArray>> Array;
         public readonly SyncRef<INodeObjectOutput<T>> Object;
diff --git a/Bindings/JSON/JsonNullValueBinding.cs b/Bindings/JSON/JsonNullValueBinding.cs
index a716b5d..5e04255 100644
--- a/Bindings/JSON/JsonNullValueBinding.cs
+++ b/Bindings/JSON/JsonNullValueBinding.cs
@@ -7,7 +7,7 @@
 using ProtoFlux.Runtimes.Execution.Nodes.Obsidian.Json;
 
 [Category(new string[] { "ProtoFlux/Runtimes/Execution/Nodes/Obsidian/Json" })]
-    public class JsonNullValueBinding : FrooxEngine.ProtoFlux.Runtimes.Execution.ObjectFunctionNode<ExecutionContext, JToken>
+    public class JsonNullValue : FrooxEngine.ProtoFlux.Runtimes.Execution.ObjectFunctionNode<ExecutionContext, JToken>
     {
         public override Type NodeType => typeof(JsonNullValueNode);
 
diff --git a/Bindings/JSON/JsonParseStringArrayBinding.cs b/Bindings/JSON/JsonParseStringArrayBinding.cs
index c706250..3382a19 100644
--- a/Bindings/JSON/JsonParseStringArrayBinding.cs
+++ b/Bindings/JSON/JsonParseStringArrayBinding.cs
@@ -9,7 +9,7 @@
 
 
     [Category(new string[] { "ProtoFlux/Runtimes/Execution/Nodes/Obsidian/Json" })]
-    public class JsonParseStringArrayBinding : FrooxEngine.ProtoFlux.Runtimes.Execution.ObjectFunctionNode<ExecutionContext, JArray>
+    public class JsonParseStringArray : FrooxEngine.ProtoFlux.Runtimes.Execution.ObjectFunctionNode<ExecutionContext, JArray>
     {
         public readonly SyncRef<INodeObjectOutput<string>> Input;
 
diff --git a/Bindings/JSON/JsonParseStringBinding.cs b/Bindings/JSON/JsonParseStringBinding.cs
index 5079e2a..69e9578 100644
--- a/Bindings/JSON/JsonParseStringBinding.cs
+++ b/Bindings/JSON/JsonParseStringBinding.cs
@@ -9,7 +9,7 @@
 
 
 [Category(new string[] { "ProtoFlux/Runtimes/Execution/Nodes/Obsidian/Json" })]
-public class JsonParseStringBinding : FrooxEngine.ProtoFlux.Runtimes.Execution.ObjectFunctionNode<ExecutionContext, JArray>
+public class JsonParseString : FrooxEngine.ProtoFlux.Runtimes.Execution.ObjectFunctionNode<ExecutionContext, JArray>
 {
     public readonly SyncRef<INodeObjectOutput<string>> Input;
 
diff --git a/Bindings/JSON/JsonQuickGetFromObjectBinding.cs b/Bindings/JSON/JsonQuickGetFromObjectBinding.cs
index 0c0e2ce..2a3257e 100644
--- a/Bindings/JSON/JsonQuickGetFromObjectBinding.cs
+++ b/Bindings/JSON/JsonQuickGetFromObjectBinding.cs
@@ -9,7 +9,7 @@
 
 
     [Category(new string[] { "ProtoFlux/Runtimes/Execution/Nodes/Obsidian/Json" })]
-    public class JsonQuickGetFromObjectBinding<T> : FrooxEngine.ProtoFlux.Runtimes.Execution.ObjectFunctionNode<ExecutionContext, T>
+    public class JsonQuickGetFromObject<T> : FrooxEngine.ProtoFlux.Runtimes.Execution.ObjectFunctionNode<ExecutionContext, T>
     {
         public readonly SyncRef<INodeObjectOutput<string>> Input;
         public readonly SyncRef<INodeObjectOutput<string>> Tag;
diff --git a/Bindings/JSON/JsonRemoveFromArrayBinding.cs b/Bindings/JSON/JsonRemoveFromArrayBinding.cs
index c02665c..02147dc 100644
--- a/Bindings/JSON/JsonRemoveFromArrayBinding.cs
+++ b/Bindings/JSON/JsonRemoveFromArrayBinding.cs
@@ -9,7 +9,7 @@
 
 
 [Category(new string[] { "ProtoFlux/Runtimes/Execution/Nodes/Obsidian/Json" })]
-public class JsonRemoveFromArrayBinding : FrooxEngine.ProtoFlux.Runtimes.Execution.ObjectFunctionNode<FrooxEngineContext, JObject>
+public class JsonRemoveFromArray : FrooxEngine.ProtoFlux.Runtimes.Execution.ObjectFunctionNode<FrooxEngineContext, JObject>
 {
     public readonly SyncRef<INodeObjectOutput<JArray>> Array;
     public readonly SyncRef<INodeObjectOutput<int>> Index;
diff --git a/Bindings/JSON/JsonRemoveFromObjectBinding.cs b/Bindings/JSON/JsonRemoveFromObjectBinding.cs
index 66ddfa8..bf5cdcc 100644
--- a/Bindings/JSON/JsonRemoveFromObjectBinding.cs
+++ b/Bindings/JSON/JsonRemoveFromObjectBinding.cs
@@ -9,7 +9,7 @@
 
 
 [Category(new string[] { "ProtoFlux/Runtimes/Execution/Nodes/Obsidian/Json" })]
-public class JsonRemoveFromObjectBinding : FrooxEngine.ProtoFlux.Runtimes.Execution.ObjectFunctionNode<FrooxEngineContext, JObject>
+public class JsonRemoveFromObject : FrooxEngine.ProtoFlux.Runtimes.Execution.ObjectFunctionNode<FrooxEngineContext, JObject>
 {
     public readonly SyncRef<INodeObjectOutput<JObject>> Input;
     public readonly SyncRef<INodeObjectOutput<int>> Tag;
diff --git a/Bindings/JSON/JsonToStringBinding.cs b/Bindings/JSON/JsonToStringBinding.cs
index 56783d3..4299455 100644
--- a/Bindings/JSON/JsonToStringBinding.cs
+++ b/Bindings/JSON/JsonToStringBinding.cs
@@ -9,7 +9,7 @@
 
 
     [Category(new string[] { "ProtoFlux/Runtimes/Execution/Nodes/Obsidian/Json" })]
-    public class JsonToStringBinding<T> : FrooxEngine.ProtoFlux.Runtimes.Execution.ObjectFunctionNode<ExecutionContext, string> where T : JToken
+    public class JsonToString<T> : FrooxEngine.ProtoFlux.Runtimes.Execution.ObjectFunctionNode<ExecutionContext, string> where T : JToken
     {
         public readonly SyncRef<INodeObjectOutput<T>> Input;
 
diff --git a/Bindings/Math/Physics/DragCalculationBinding.cs b/Bindings/Math/Physics/DragCalculationBinding.cs
index 0412d45..2587be9 100644
--- a/Bindings/Math/Physics/DragCalculationBinding.cs
+++ b/Bindings/Math/Physics/DragCalculationBinding.cs
@@ -7,7 +7,7 @@
 using ProtoFlux.Runtimes.Execution.Nodes.Obsidian.Math.Physics;
 
 [Category(new string[] { "ProtoFlux/Runtimes/Execution/Nodes/Obsidian/Math/Physics" })]
-public class DragCalculationNodeBinding : FrooxEngine.ProtoFlux.Runtimes.Execution.ValueFunctionNode<ExecutionContext, float3>
+public class DragCalculation : FrooxEngine.ProtoFlux.Runtimes.Execution.ValueFunctionNode<ExecutionContext, float3>
 {
     public readonly SyncRef<INodeValueOutput<float>> FluidDensity;
     public readonly SyncRef<INodeValueOutput<float3>> ObjectVelocity;
diff --git a/Bindings/Math/Physics/KineticFrictionBinding.cs b/Bindings/Math/Physics/KineticFrictionBinding.cs
index 5331208..c17666c 100644
--- a/Bindings/Math/Physics/KineticFrictionBinding.cs
+++ b/Bindings/Math/Physics/KineticFrictionBinding.cs
@@ -7,7 +7,7 @@
 using ProtoFlux.Runtimes.Execution.Nodes.Obsidian.Math.Physics;
 
 [Category(new string[] { "ProtoFlux/Runtimes/Execution/Nodes/Obsidian/Math/Physics" })]
-public class KineticFrictionNodeBinding : FrooxEngine.ProtoFlux.Runtimes.Execution.ValueFunctionNode<ExecutionContext, float3>
+public class KineticFriction : FrooxEngine.ProtoFlux.Runtimes.Execution.ValueFunctionNode<ExecutionContext, float3>
 {
     public readonly SyncRef<INodeValueOutput<float3>> NormalForce;
     public readonly SyncRef<INodeValueOutput<float>> KineticFrictionCoefficient;
diff --git a/Bindings/Math/Physics/RefractNodeBinding.cs b/Bindings/Math/Physics/RefractNodeBinding.cs
index 84c3fbf..bb20a43 100644
--- a/Bindings/Math/Physics/RefractNodeBinding.cs
+++ b/Bindings/Math/Physics/RefractNodeBinding.cs
@@ -7,7 +7,7 @@
 using ProtoFlux.Runtimes.Execution.Nodes.Obsidian.Math.Physics;
 
 [Category(new string[] { "ProtoFlux/Runtimes/Execution/Nodes/Obsidian/Math/Physics" })]
-public class RefractionNodeBinding : FrooxEngine.ProtoFlux.Runtimes.Execution.ValueFunctionNode<ExecutionContext, float>
+public class Refraction : FrooxEngine.ProtoFlux.Runtimes.Execution.ValueFunctionNode<ExecutionContext, float>
 {
     public readonly SyncRef<INodeValueOutput<float>> RefractiveIndex1;
     public readonly SyncRef<INodeValueOutput<float>> RefractiveIndex2;
diff --git a/Bindings/Strings/CountSubstringBinding.cs b/Bindings/Strings/CountSubstringBinding.cs
index daf45af..f831371 100644
--- a/Bindings/Strings/CountSubstringBinding.cs
+++ b/Bindings/Strings/CountSubstringBinding.cs
@@ -7,7 +7,7 @@
 using ProtoFlux.Runtimes.Execution.Nodes.Strings;
 
 [Category(new string[] { "ProtoFlux/Runtimes/Execution/Nodes/Obsidian/String" })]
-public class CountSubstringBinding : FrooxEngine.ProtoFlux.Runtimes.Execution.ValueFunctionNode<ExecutionContext, int>
+public class CountSubstring : FrooxEngine.ProtoFlux.Runtimes.Execution.ValueFunctionNode<ExecutionContext, int>
 {
     public readonly SyncRef<INodeObjectOutput<string>> String;
     public readonly SyncRef<INodeObjectOutput<string>> Pattern;
diff --git a/Bindings/Strings/DecodeBase64.cs b/Bindings/Strings/DecodeBase64.cs
index 62b4724..0ca8124 100644
--- a/Bindings/Strings/DecodeBase64.cs
+++ b/Bindings/Strings/DecodeBase64.cs
@@ -7,7 +7,7 @@
 using ProtoFlux.Runtimes.Execution.Nodes.Strings;
 
 [Category(new string[] { "ProtoFlux/Runtimes/Execution/Nodes/Obsidian/String" })]
-public class DecodeBase64Binding : FrooxEngine.ProtoFlux.Runtimes.Execution.ObjectFunctionNode<ExecutionContext, string>
+public class DecodeBase64 : FrooxEngine.ProtoFlux.Runtimes.Execution.ObjectFunctionNode<ExecutionContext, string>
 {
     public readonly SyncRef<INodeObjectOutput<string>> Input;
 
diff --git a/Bindings/Strings/EncodeSHA256.cs b/Bindings/Strings/EncodeSHA256.cs
index 23c7142..cbdaeea 100644
--- a/Bindings/Strings/EncodeSHA256.cs
+++ b/Bindings/Strings/EncodeSHA256.cs
@@ -7,7 +7,7 @@
 using ProtoFlux.Runtimes.Execution.Nodes.Strings;
 
 [Category(new string[] { "ProtoFlux/Runtimes/Execution/Nodes/Obsidian/String" })]
-public class EncodeSha256Binding : FrooxEngine.ProtoFlux.Runtimes.Execution.ObjectFunctionNode<ExecutionContext, string>
+public class EncodeSha256 : FrooxEngine.ProtoFlux.Runtimes.Execution.ObjectFunctionNode<ExecutionContext, string>
 {
     public readonly SyncRef<INodeObjectOutput<string>> Input;
 
diff --git a/Bindings/Strings/HammingDistance.cs b/Bindings/Strings/HammingDistance.cs
index fbaae3c..22576c9 100644
--- a/Bindings/Strings/HammingDistance.cs
+++ b/Bindings/Strings/HammingDistance.cs
@@ -7,7 +7,7 @@
 using ProtoFlux.Runtimes.Execution.Nodes.Strings;
 
 [Category(new string[] { "ProtoFlux/Runtimes/Execution/Nodes/Obsidian/String" })]
-public class HammingDistanceBinding : FrooxEngine.ProtoFlux.Runtimes.Execution.ObjectFunctionNode<FrooxEngineContext, int?>
+public class HammingDistance : FrooxEngine.ProtoFlux.Runtimes.Execution.ObjectFunctionNode<FrooxEngineContext, int?>
 {
     public readonly SyncRef<INodeObjectOutput<string>> String1;
     public readonly SyncRef<INodeObjectOutput<string>> String2;
diff --git a/Bindings/User/IsUserInNoclipBinding.cs b/Bindings/User/IsUserInNoclipBinding.cs
index 3be4145..11e9d00 100644
--- a/Bindings/User/IsUserInNoclipBinding.cs
+++ b/Bindings/User/IsUserInNoclipBinding.cs
@@ -7,7 +7,7 @@
 using FrooxEngine.ProtoFlux.Locomotion;
 
 [Category(new string[] { "ProtoFlux/Runtimes/Execution/Nodes/Obsidian/Locomotion" })]
-public class IsUserInNoClipBinding : FrooxEngine.ProtoFlux.Runtimes.Execution.ValueFunctionNode<ExecutionContext, bool>
+public class IsUserInNoClip : FrooxEngine.ProtoFlux.Runtimes.Execution.ValueFunctionNode<ExecutionContext, bool>
 {
     public readonly SyncRef<INodeObjectOutput<User>> User;
 
diff --git a/Bindings/Utility/writetolog.cs b/Bindings/Utility/writetolog.cs
index d40c26b..1608e88 100644
--- a/Bindings/Utility/writetolog.cs
+++ b/Bindings/Utility/writetolog.cs
@@ -7,7 +7,7 @@
 
 
 [Category(new string[] { "ProtoFlux/Runtimes/Execution/Nodes/Obsidian/Utility" })]
-public class WriteToLogBinding : AsyncActionNode<FrooxEngineContext>
+public class WriteToLog : AsyncActionNode<FrooxEngineContext>
 {
     public readonly SyncRef<INodeObjectOutput<string>> Value;
     public readonly SyncRef<INodeValueOutput<LogSeverity>> Severity;
diff --git a/ProjectObsidian.csproj b/ProjectObsidian.csproj
index 0f55af4..5617696 100644
--- a/ProjectObsidian.csproj
+++ b/ProjectObsidian.csproj
@@ -12,6 +12,7 @@
     <ResonitePath Condition="Exists('C:\Program Files (x86)\Steam\steamapps\common\Resonite\')">C:\Program Files (x86)\Steam\steamapps\common\Resonite\</ResonitePath>
     <ResonitePath Condition="Exists('$(HOME)/.steam/steam/steamapps/common/Resonite/')">$(HOME)/.steam/steam/steamapps/common/Resonite/</ResonitePath>
     <ResonitePath Condition="Exists('/mnt/LocalDisk2/SteamLibrary/steamapps/common/Resonite/')">/mnt/LocalDisk2/SteamLibrary/steamapps/common/Resonite/</ResonitePath>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <ItemGroup>
     <Compile Remove="ProtoFlux\Bindings\Networking\**" />
@@ -26,7 +27,7 @@
       <HintPath>$(ResonitePath)Resonite_Data/Managed/FrooxEngine.dll</HintPath>
     </Reference>
     <Reference Include="Newtonsoft.Json">
-      <HintPath>..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\Resonite\Resonite_Data\Managed\Newtonsoft.Json.dll</HintPath>
+      <HintPath>$(ResonitePath)Resonite_Data/Managed/Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="ProtoFlux.Core">
       <HintPath>$(ResonitePath)Resonite_Data/Managed/ProtoFlux.Core.dll</HintPath>
@@ -43,6 +44,9 @@
 	  <Reference Include="Elements.Assets">
 		  <HintPath>$(ResonitePath)Resonite_Data/Managed/Elements.Assets.dll</HintPath>
 	  </Reference>
+	  <Reference Include="SteamVR">
+	    <HintPath>$(ResonitePath)/Resonite_Data/Managed/SteamVR.dll</HintPath>
+	  </Reference>
 	  <Reference Include="System.Net.Http" />  
   </ItemGroup>
 </Project>
diff --git a/ProtoFlux/Hardware/OpenVR/TrackerBatteryBase.cs b/ProtoFlux/Hardware/OpenVR/Tracker/TrackerBatteryBase.cs
similarity index 100%
rename from ProtoFlux/Hardware/OpenVR/TrackerBatteryBase.cs
rename to ProtoFlux/Hardware/OpenVR/Tracker/TrackerBatteryBase.cs
diff --git a/ProtoFlux/JSON/JsonAddToObject.cs b/ProtoFlux/JSON/JsonAddToObject.cs
index 2751ef2..96f8ac4 100644
--- a/ProtoFlux/JSON/JsonAddToObject.cs
+++ b/ProtoFlux/JSON/JsonAddToObject.cs
@@ -13,7 +13,7 @@ namespace ProtoFlux.Runtimes.Execution.Nodes.Obsidian.Json
     [GenericTypes(typeof(byte), typeof(sbyte), typeof(short), typeof(ushort), typeof(int), typeof(uint),
                   typeof(long), typeof(ulong), typeof(float), typeof(double), typeof(string), typeof(Uri),
                   typeof(JToken), typeof(JObject), typeof(JArray))]
-    public class JsonAddToObject<T> : ObjectFunctionNode<FrooxEngineContext, JObject>
+    public class JsonAddToObjectNode<T> : ObjectFunctionNode<FrooxEngineContext, JObject>
     {
         public readonly ObjectInput<JObject> Input;
         public readonly ObjectInput<string> Tag;
diff --git a/ProtoFlux/JSON/JsonAppendToArray.cs b/ProtoFlux/JSON/JsonAppendToArray.cs
index 36efd24..2e221b2 100644
--- a/ProtoFlux/JSON/JsonAppendToArray.cs
+++ b/ProtoFlux/JSON/JsonAppendToArray.cs
@@ -11,7 +11,7 @@ namespace ProtoFlux.Runtimes.Execution.Nodes.Obsidian.Json
     [GenericTypes(typeof(byte), typeof(sbyte), typeof(short), typeof(ushort), typeof(int), typeof(uint), typeof(long),
                   typeof(ulong), typeof(float), typeof(double), typeof(string), typeof(Uri), typeof(JToken), typeof(JObject),
                   typeof(JArray))]
-    public class JsonAppendToArray<T> : ObjectFunctionNode<ExecutionContext, JArray>
+    public class JsonAppendToArrayNode<T> : ObjectFunctionNode<ExecutionContext, JArray>
     {
         public readonly ObjectInput<JArray> Array;
         public readonly ObjectInput<T> Object;