diff --git a/vrclient_x64/gen_wrapper.py b/vrclient_x64/gen_wrapper.py
index 8b953115..50f0627b 100755
--- a/vrclient_x64/gen_wrapper.py
+++ b/vrclient_x64/gen_wrapper.py
@@ -514,7 +514,7 @@ def handle_method_c(klass, method, winclassname, cppname, out):
     path_conv_wtou = PATH_CONV_METHODS_WTOU.get(f'{klass.spelling}_{method.spelling}', {})
 
     for name in filter(lambda x: x in names, sorted(path_conv_wtou)):
-        out(f'    const char *u_{name} = vrclient_dos_to_unix_path( {name} );\n')
+        out(f'    params.{name} = vrclient_dos_to_unix_path( {name} );\n')
 
     out(u'    TRACE("%p\\n", _this);\n')
 
@@ -530,7 +530,7 @@ def handle_method_c(klass, method, winclassname, cppname, out):
         out(f'vrclient_unix_path_to_dos_path( params._ret, {name}, {name}, {conv["len"]} );\n')
 
     for name in filter(lambda x: x in names, sorted(path_conv_wtou)):
-        out(f'    vrclient_free_path( u_{name} );\n')
+        out(f'    vrclient_free_path( params.{name} );\n')
 
     if not returns_void:
         out(u'    return params._ret;\n')
diff --git a/vrclient_x64/vrclient_x64/winIVRApplications.c b/vrclient_x64/vrclient_x64/winIVRApplications.c
index a0588679..24c6ac1a 100644
--- a/vrclient_x64/vrclient_x64/winIVRApplications.c
+++ b/vrclient_x64/vrclient_x64/winIVRApplications.c
@@ -48,10 +48,10 @@ EVRApplicationError __thiscall winIVRApplications_IVRApplications_001_AddApplica
         .pchApplicationManifestFullPath = pchApplicationManifestFullPath,
         .bTemporary = bTemporary,
     };
-    const char *u_pchApplicationManifestFullPath = vrclient_dos_to_unix_path( pchApplicationManifestFullPath );
+    params.pchApplicationManifestFullPath = vrclient_dos_to_unix_path( pchApplicationManifestFullPath );
     TRACE("%p\n", _this);
     cppIVRApplications_IVRApplications_001_AddApplicationManifest( &params );
-    vrclient_free_path( u_pchApplicationManifestFullPath );
+    vrclient_free_path( params.pchApplicationManifestFullPath );
     return params._ret;
 }
 
@@ -62,10 +62,10 @@ EVRApplicationError __thiscall winIVRApplications_IVRApplications_001_RemoveAppl
         .linux_side = _this->u_iface,
         .pchApplicationManifestFullPath = pchApplicationManifestFullPath,
     };
-    const char *u_pchApplicationManifestFullPath = vrclient_dos_to_unix_path( pchApplicationManifestFullPath );
+    params.pchApplicationManifestFullPath = vrclient_dos_to_unix_path( pchApplicationManifestFullPath );
     TRACE("%p\n", _this);
     cppIVRApplications_IVRApplications_001_RemoveApplicationManifest( &params );
-    vrclient_free_path( u_pchApplicationManifestFullPath );
+    vrclient_free_path( params.pchApplicationManifestFullPath );
     return params._ret;
 }
 
@@ -431,10 +431,10 @@ EVRApplicationError __thiscall winIVRApplications_IVRApplications_002_AddApplica
         .pchApplicationManifestFullPath = pchApplicationManifestFullPath,
         .bTemporary = bTemporary,
     };
-    const char *u_pchApplicationManifestFullPath = vrclient_dos_to_unix_path( pchApplicationManifestFullPath );
+    params.pchApplicationManifestFullPath = vrclient_dos_to_unix_path( pchApplicationManifestFullPath );
     TRACE("%p\n", _this);
     cppIVRApplications_IVRApplications_002_AddApplicationManifest( &params );
-    vrclient_free_path( u_pchApplicationManifestFullPath );
+    vrclient_free_path( params.pchApplicationManifestFullPath );
     return params._ret;
 }
 
@@ -445,10 +445,10 @@ EVRApplicationError __thiscall winIVRApplications_IVRApplications_002_RemoveAppl
         .linux_side = _this->u_iface,
         .pchApplicationManifestFullPath = pchApplicationManifestFullPath,
     };
-    const char *u_pchApplicationManifestFullPath = vrclient_dos_to_unix_path( pchApplicationManifestFullPath );
+    params.pchApplicationManifestFullPath = vrclient_dos_to_unix_path( pchApplicationManifestFullPath );
     TRACE("%p\n", _this);
     cppIVRApplications_IVRApplications_002_RemoveApplicationManifest( &params );
-    vrclient_free_path( u_pchApplicationManifestFullPath );
+    vrclient_free_path( params.pchApplicationManifestFullPath );
     return params._ret;
 }
 
@@ -799,10 +799,10 @@ EVRApplicationError __thiscall winIVRApplications_IVRApplications_003_AddApplica
         .pchApplicationManifestFullPath = pchApplicationManifestFullPath,
         .bTemporary = bTemporary,
     };
-    const char *u_pchApplicationManifestFullPath = vrclient_dos_to_unix_path( pchApplicationManifestFullPath );
+    params.pchApplicationManifestFullPath = vrclient_dos_to_unix_path( pchApplicationManifestFullPath );
     TRACE("%p\n", _this);
     cppIVRApplications_IVRApplications_003_AddApplicationManifest( &params );
-    vrclient_free_path( u_pchApplicationManifestFullPath );
+    vrclient_free_path( params.pchApplicationManifestFullPath );
     return params._ret;
 }
 
@@ -813,10 +813,10 @@ EVRApplicationError __thiscall winIVRApplications_IVRApplications_003_RemoveAppl
         .linux_side = _this->u_iface,
         .pchApplicationManifestFullPath = pchApplicationManifestFullPath,
     };
-    const char *u_pchApplicationManifestFullPath = vrclient_dos_to_unix_path( pchApplicationManifestFullPath );
+    params.pchApplicationManifestFullPath = vrclient_dos_to_unix_path( pchApplicationManifestFullPath );
     TRACE("%p\n", _this);
     cppIVRApplications_IVRApplications_003_RemoveApplicationManifest( &params );
-    vrclient_free_path( u_pchApplicationManifestFullPath );
+    vrclient_free_path( params.pchApplicationManifestFullPath );
     return params._ret;
 }
 
@@ -1185,10 +1185,10 @@ EVRApplicationError __thiscall winIVRApplications_IVRApplications_004_AddApplica
         .pchApplicationManifestFullPath = pchApplicationManifestFullPath,
         .bTemporary = bTemporary,
     };
-    const char *u_pchApplicationManifestFullPath = vrclient_dos_to_unix_path( pchApplicationManifestFullPath );
+    params.pchApplicationManifestFullPath = vrclient_dos_to_unix_path( pchApplicationManifestFullPath );
     TRACE("%p\n", _this);
     cppIVRApplications_IVRApplications_004_AddApplicationManifest( &params );
-    vrclient_free_path( u_pchApplicationManifestFullPath );
+    vrclient_free_path( params.pchApplicationManifestFullPath );
     return params._ret;
 }
 
@@ -1199,10 +1199,10 @@ EVRApplicationError __thiscall winIVRApplications_IVRApplications_004_RemoveAppl
         .linux_side = _this->u_iface,
         .pchApplicationManifestFullPath = pchApplicationManifestFullPath,
     };
-    const char *u_pchApplicationManifestFullPath = vrclient_dos_to_unix_path( pchApplicationManifestFullPath );
+    params.pchApplicationManifestFullPath = vrclient_dos_to_unix_path( pchApplicationManifestFullPath );
     TRACE("%p\n", _this);
     cppIVRApplications_IVRApplications_004_RemoveApplicationManifest( &params );
-    vrclient_free_path( u_pchApplicationManifestFullPath );
+    vrclient_free_path( params.pchApplicationManifestFullPath );
     return params._ret;
 }
 
@@ -1602,10 +1602,10 @@ EVRApplicationError __thiscall winIVRApplications_IVRApplications_005_AddApplica
         .pchApplicationManifestFullPath = pchApplicationManifestFullPath,
         .bTemporary = bTemporary,
     };
-    const char *u_pchApplicationManifestFullPath = vrclient_dos_to_unix_path( pchApplicationManifestFullPath );
+    params.pchApplicationManifestFullPath = vrclient_dos_to_unix_path( pchApplicationManifestFullPath );
     TRACE("%p\n", _this);
     cppIVRApplications_IVRApplications_005_AddApplicationManifest( &params );
-    vrclient_free_path( u_pchApplicationManifestFullPath );
+    vrclient_free_path( params.pchApplicationManifestFullPath );
     return params._ret;
 }
 
@@ -1616,10 +1616,10 @@ EVRApplicationError __thiscall winIVRApplications_IVRApplications_005_RemoveAppl
         .linux_side = _this->u_iface,
         .pchApplicationManifestFullPath = pchApplicationManifestFullPath,
     };
-    const char *u_pchApplicationManifestFullPath = vrclient_dos_to_unix_path( pchApplicationManifestFullPath );
+    params.pchApplicationManifestFullPath = vrclient_dos_to_unix_path( pchApplicationManifestFullPath );
     TRACE("%p\n", _this);
     cppIVRApplications_IVRApplications_005_RemoveApplicationManifest( &params );
-    vrclient_free_path( u_pchApplicationManifestFullPath );
+    vrclient_free_path( params.pchApplicationManifestFullPath );
     return params._ret;
 }
 
@@ -2043,10 +2043,10 @@ EVRApplicationError __thiscall winIVRApplications_IVRApplications_006_AddApplica
         .pchApplicationManifestFullPath = pchApplicationManifestFullPath,
         .bTemporary = bTemporary,
     };
-    const char *u_pchApplicationManifestFullPath = vrclient_dos_to_unix_path( pchApplicationManifestFullPath );
+    params.pchApplicationManifestFullPath = vrclient_dos_to_unix_path( pchApplicationManifestFullPath );
     TRACE("%p\n", _this);
     cppIVRApplications_IVRApplications_006_AddApplicationManifest( &params );
-    vrclient_free_path( u_pchApplicationManifestFullPath );
+    vrclient_free_path( params.pchApplicationManifestFullPath );
     return params._ret;
 }
 
@@ -2057,10 +2057,10 @@ EVRApplicationError __thiscall winIVRApplications_IVRApplications_006_RemoveAppl
         .linux_side = _this->u_iface,
         .pchApplicationManifestFullPath = pchApplicationManifestFullPath,
     };
-    const char *u_pchApplicationManifestFullPath = vrclient_dos_to_unix_path( pchApplicationManifestFullPath );
+    params.pchApplicationManifestFullPath = vrclient_dos_to_unix_path( pchApplicationManifestFullPath );
     TRACE("%p\n", _this);
     cppIVRApplications_IVRApplications_006_RemoveApplicationManifest( &params );
-    vrclient_free_path( u_pchApplicationManifestFullPath );
+    vrclient_free_path( params.pchApplicationManifestFullPath );
     return params._ret;
 }
 
@@ -2590,10 +2590,10 @@ EVRApplicationError __thiscall winIVRApplications_IVRApplications_007_AddApplica
         .pchApplicationManifestFullPath = pchApplicationManifestFullPath,
         .bTemporary = bTemporary,
     };
-    const char *u_pchApplicationManifestFullPath = vrclient_dos_to_unix_path( pchApplicationManifestFullPath );
+    params.pchApplicationManifestFullPath = vrclient_dos_to_unix_path( pchApplicationManifestFullPath );
     TRACE("%p\n", _this);
     cppIVRApplications_IVRApplications_007_AddApplicationManifest( &params );
-    vrclient_free_path( u_pchApplicationManifestFullPath );
+    vrclient_free_path( params.pchApplicationManifestFullPath );
     return params._ret;
 }
 
@@ -2604,10 +2604,10 @@ EVRApplicationError __thiscall winIVRApplications_IVRApplications_007_RemoveAppl
         .linux_side = _this->u_iface,
         .pchApplicationManifestFullPath = pchApplicationManifestFullPath,
     };
-    const char *u_pchApplicationManifestFullPath = vrclient_dos_to_unix_path( pchApplicationManifestFullPath );
+    params.pchApplicationManifestFullPath = vrclient_dos_to_unix_path( pchApplicationManifestFullPath );
     TRACE("%p\n", _this);
     cppIVRApplications_IVRApplications_007_RemoveApplicationManifest( &params );
-    vrclient_free_path( u_pchApplicationManifestFullPath );
+    vrclient_free_path( params.pchApplicationManifestFullPath );
     return params._ret;
 }
 
diff --git a/vrclient_x64/vrclient_x64/winIVRCompositor.c b/vrclient_x64/vrclient_x64/winIVRCompositor.c
index dd5273f8..6a1a46ab 100644
--- a/vrclient_x64/vrclient_x64/winIVRCompositor.c
+++ b/vrclient_x64/vrclient_x64/winIVRCompositor.c
@@ -193,10 +193,10 @@ void __thiscall winIVRCompositor_IVRCompositor_005_SetOverlayFromFile(struct w_s
         .pchFilePath = pchFilePath,
         .pSettings = pSettings,
     };
-    const char *u_pchFilePath = vrclient_dos_to_unix_path( pchFilePath );
+    params.pchFilePath = vrclient_dos_to_unix_path( pchFilePath );
     TRACE("%p\n", _this);
     cppIVRCompositor_IVRCompositor_005_SetOverlayFromFile( &params );
-    vrclient_free_path( u_pchFilePath );
+    vrclient_free_path( params.pchFilePath );
 }
 
 void __thiscall winIVRCompositor_IVRCompositor_005_ClearOverlay(struct w_steam_iface *_this)
@@ -9129,10 +9129,10 @@ EVRCompositorError __thiscall winIVRCompositor_IVRCompositor_024_SetStageOverrid
         .pRenderSettings = pRenderSettings,
         .nSizeOfRenderSettings = nSizeOfRenderSettings,
     };
-    const char *u_pchRenderModelPath = vrclient_dos_to_unix_path( pchRenderModelPath );
+    params.pchRenderModelPath = vrclient_dos_to_unix_path( pchRenderModelPath );
     TRACE("%p\n", _this);
     cppIVRCompositor_IVRCompositor_024_SetStageOverride_Async( &params );
-    vrclient_free_path( u_pchRenderModelPath );
+    vrclient_free_path( params.pchRenderModelPath );
     return params._ret;
 }
 
@@ -9837,10 +9837,10 @@ EVRCompositorError __thiscall winIVRCompositor_IVRCompositor_026_SetStageOverrid
         .pRenderSettings = pRenderSettings,
         .nSizeOfRenderSettings = nSizeOfRenderSettings,
     };
-    const char *u_pchRenderModelPath = vrclient_dos_to_unix_path( pchRenderModelPath );
+    params.pchRenderModelPath = vrclient_dos_to_unix_path( pchRenderModelPath );
     TRACE("%p\n", _this);
     cppIVRCompositor_IVRCompositor_026_SetStageOverride_Async( &params );
-    vrclient_free_path( u_pchRenderModelPath );
+    vrclient_free_path( params.pchRenderModelPath );
     return params._ret;
 }
 
@@ -10604,10 +10604,10 @@ EVRCompositorError __thiscall winIVRCompositor_IVRCompositor_027_SetStageOverrid
         .pRenderSettings = pRenderSettings,
         .nSizeOfRenderSettings = nSizeOfRenderSettings,
     };
-    const char *u_pchRenderModelPath = vrclient_dos_to_unix_path( pchRenderModelPath );
+    params.pchRenderModelPath = vrclient_dos_to_unix_path( pchRenderModelPath );
     TRACE("%p\n", _this);
     cppIVRCompositor_IVRCompositor_027_SetStageOverride_Async( &params );
-    vrclient_free_path( u_pchRenderModelPath );
+    vrclient_free_path( params.pchRenderModelPath );
     return params._ret;
 }
 
diff --git a/vrclient_x64/vrclient_x64/winIVRControlPanel.c b/vrclient_x64/vrclient_x64/winIVRControlPanel.c
index ba4ecc39..a230eda2 100644
--- a/vrclient_x64/vrclient_x64/winIVRControlPanel.c
+++ b/vrclient_x64/vrclient_x64/winIVRControlPanel.c
@@ -316,10 +316,10 @@ bool __thiscall winIVRControlPanel_IVRControlPanel_006_undoc23(struct w_steam_if
         .linux_side = _this->u_iface,
         .a = a,
     };
-    const char *u_a = vrclient_dos_to_unix_path( a );
+    params.a = vrclient_dos_to_unix_path( a );
     TRACE("%p\n", _this);
     cppIVRControlPanel_IVRControlPanel_006_undoc23( &params );
-    vrclient_free_path( u_a );
+    vrclient_free_path( params.a );
     return params._ret;
 }
 
@@ -364,10 +364,10 @@ EVRCompositorError __thiscall winIVRControlPanel_IVRControlPanel_006_undoc27(str
         .linux_side = _this->u_iface,
         .a = a,
     };
-    const char *u_a = vrclient_dos_to_unix_path( a );
+    params.a = vrclient_dos_to_unix_path( a );
     TRACE("%p\n", _this);
     cppIVRControlPanel_IVRControlPanel_006_undoc27( &params );
-    vrclient_free_path( u_a );
+    vrclient_free_path( params.a );
     return params._ret;
 }
 
diff --git a/vrclient_x64/vrclient_x64/winIVRInput.c b/vrclient_x64/vrclient_x64/winIVRInput.c
index 5462a5e2..c34e9e56 100644
--- a/vrclient_x64/vrclient_x64/winIVRInput.c
+++ b/vrclient_x64/vrclient_x64/winIVRInput.c
@@ -43,10 +43,10 @@ EVRInputError __thiscall winIVRInput_IVRInput_003_SetActionManifestPath(struct w
         .linux_side = _this->u_iface,
         .pchActionManifestPath = pchActionManifestPath,
     };
-    const char *u_pchActionManifestPath = vrclient_dos_to_unix_path( pchActionManifestPath );
+    params.pchActionManifestPath = vrclient_dos_to_unix_path( pchActionManifestPath );
     TRACE("%p\n", _this);
     cppIVRInput_IVRInput_003_SetActionManifestPath( &params );
-    vrclient_free_path( u_pchActionManifestPath );
+    vrclient_free_path( params.pchActionManifestPath );
     return params._ret;
 }
 
@@ -396,10 +396,10 @@ EVRInputError __thiscall winIVRInput_IVRInput_004_SetActionManifestPath(struct w
         .linux_side = _this->u_iface,
         .pchActionManifestPath = pchActionManifestPath,
     };
-    const char *u_pchActionManifestPath = vrclient_dos_to_unix_path( pchActionManifestPath );
+    params.pchActionManifestPath = vrclient_dos_to_unix_path( pchActionManifestPath );
     TRACE("%p\n", _this);
     cppIVRInput_IVRInput_004_SetActionManifestPath( &params );
-    vrclient_free_path( u_pchActionManifestPath );
+    vrclient_free_path( params.pchActionManifestPath );
     return params._ret;
 }
 
@@ -764,10 +764,10 @@ EVRInputError __thiscall winIVRInput_IVRInput_005_SetActionManifestPath(struct w
         .linux_side = _this->u_iface,
         .pchActionManifestPath = pchActionManifestPath,
     };
-    const char *u_pchActionManifestPath = vrclient_dos_to_unix_path( pchActionManifestPath );
+    params.pchActionManifestPath = vrclient_dos_to_unix_path( pchActionManifestPath );
     TRACE("%p\n", _this);
     cppIVRInput_IVRInput_005_SetActionManifestPath( &params );
-    vrclient_free_path( u_pchActionManifestPath );
+    vrclient_free_path( params.pchActionManifestPath );
     return params._ret;
 }
 
@@ -1239,10 +1239,10 @@ EVRInputError __thiscall winIVRInput_IVRInput_006_SetActionManifestPath(struct w
         .linux_side = _this->u_iface,
         .pchActionManifestPath = pchActionManifestPath,
     };
-    const char *u_pchActionManifestPath = vrclient_dos_to_unix_path( pchActionManifestPath );
+    params.pchActionManifestPath = vrclient_dos_to_unix_path( pchActionManifestPath );
     TRACE("%p\n", _this);
     cppIVRInput_IVRInput_006_SetActionManifestPath( &params );
-    vrclient_free_path( u_pchActionManifestPath );
+    vrclient_free_path( params.pchActionManifestPath );
     return params._ret;
 }
 
@@ -1735,10 +1735,10 @@ EVRInputError __thiscall winIVRInput_IVRInput_007_SetActionManifestPath(struct w
         .linux_side = _this->u_iface,
         .pchActionManifestPath = pchActionManifestPath,
     };
-    const char *u_pchActionManifestPath = vrclient_dos_to_unix_path( pchActionManifestPath );
+    params.pchActionManifestPath = vrclient_dos_to_unix_path( pchActionManifestPath );
     TRACE("%p\n", _this);
     cppIVRInput_IVRInput_007_SetActionManifestPath( &params );
-    vrclient_free_path( u_pchActionManifestPath );
+    vrclient_free_path( params.pchActionManifestPath );
     return params._ret;
 }
 
@@ -2270,10 +2270,10 @@ EVRInputError __thiscall winIVRInput_IVRInput_010_SetActionManifestPath(struct w
         .linux_side = _this->u_iface,
         .pchActionManifestPath = pchActionManifestPath,
     };
-    const char *u_pchActionManifestPath = vrclient_dos_to_unix_path( pchActionManifestPath );
+    params.pchActionManifestPath = vrclient_dos_to_unix_path( pchActionManifestPath );
     TRACE("%p\n", _this);
     cppIVRInput_IVRInput_010_SetActionManifestPath( &params );
-    vrclient_free_path( u_pchActionManifestPath );
+    vrclient_free_path( params.pchActionManifestPath );
     return params._ret;
 }
 
diff --git a/vrclient_x64/vrclient_x64/winIVROverlay.c b/vrclient_x64/vrclient_x64/winIVROverlay.c
index a91570dc..10c4efaa 100644
--- a/vrclient_x64/vrclient_x64/winIVROverlay.c
+++ b/vrclient_x64/vrclient_x64/winIVROverlay.c
@@ -514,10 +514,10 @@ VROverlayError __thiscall winIVROverlay_IVROverlay_001_SetOverlayFromFile(struct
         .ulOverlayHandle = ulOverlayHandle,
         .pchFilePath = pchFilePath,
     };
-    const char *u_pchFilePath = vrclient_dos_to_unix_path( pchFilePath );
+    params.pchFilePath = vrclient_dos_to_unix_path( pchFilePath );
     TRACE("%p\n", _this);
     cppIVROverlay_IVROverlay_001_SetOverlayFromFile( &params );
-    vrclient_free_path( u_pchFilePath );
+    vrclient_free_path( params.pchFilePath );
     return params._ret;
 }
 
@@ -1215,10 +1215,10 @@ VROverlayError __thiscall winIVROverlay_IVROverlay_002_SetOverlayFromFile(struct
         .ulOverlayHandle = ulOverlayHandle,
         .pchFilePath = pchFilePath,
     };
-    const char *u_pchFilePath = vrclient_dos_to_unix_path( pchFilePath );
+    params.pchFilePath = vrclient_dos_to_unix_path( pchFilePath );
     TRACE("%p\n", _this);
     cppIVROverlay_IVROverlay_002_SetOverlayFromFile( &params );
-    vrclient_free_path( u_pchFilePath );
+    vrclient_free_path( params.pchFilePath );
     return params._ret;
 }
 
@@ -1985,10 +1985,10 @@ VROverlayError __thiscall winIVROverlay_IVROverlay_003_SetOverlayFromFile(struct
         .ulOverlayHandle = ulOverlayHandle,
         .pchFilePath = pchFilePath,
     };
-    const char *u_pchFilePath = vrclient_dos_to_unix_path( pchFilePath );
+    params.pchFilePath = vrclient_dos_to_unix_path( pchFilePath );
     TRACE("%p\n", _this);
     cppIVROverlay_IVROverlay_003_SetOverlayFromFile( &params );
-    vrclient_free_path( u_pchFilePath );
+    vrclient_free_path( params.pchFilePath );
     return params._ret;
 }
 
@@ -2804,10 +2804,10 @@ VROverlayError __thiscall winIVROverlay_IVROverlay_004_SetOverlayFromFile(struct
         .ulOverlayHandle = ulOverlayHandle,
         .pchFilePath = pchFilePath,
     };
-    const char *u_pchFilePath = vrclient_dos_to_unix_path( pchFilePath );
+    params.pchFilePath = vrclient_dos_to_unix_path( pchFilePath );
     TRACE("%p\n", _this);
     cppIVROverlay_IVROverlay_004_SetOverlayFromFile( &params );
-    vrclient_free_path( u_pchFilePath );
+    vrclient_free_path( params.pchFilePath );
     return params._ret;
 }
 
@@ -3643,10 +3643,10 @@ VROverlayError __thiscall winIVROverlay_IVROverlay_005_SetOverlayFromFile(struct
         .ulOverlayHandle = ulOverlayHandle,
         .pchFilePath = pchFilePath,
     };
-    const char *u_pchFilePath = vrclient_dos_to_unix_path( pchFilePath );
+    params.pchFilePath = vrclient_dos_to_unix_path( pchFilePath );
     TRACE("%p\n", _this);
     cppIVROverlay_IVROverlay_005_SetOverlayFromFile( &params );
-    vrclient_free_path( u_pchFilePath );
+    vrclient_free_path( params.pchFilePath );
     return params._ret;
 }
 
@@ -4585,10 +4585,10 @@ EVROverlayError __thiscall winIVROverlay_IVROverlay_007_SetOverlayFromFile(struc
         .ulOverlayHandle = ulOverlayHandle,
         .pchFilePath = pchFilePath,
     };
-    const char *u_pchFilePath = vrclient_dos_to_unix_path( pchFilePath );
+    params.pchFilePath = vrclient_dos_to_unix_path( pchFilePath );
     TRACE("%p\n", _this);
     cppIVROverlay_IVROverlay_007_SetOverlayFromFile( &params );
-    vrclient_free_path( u_pchFilePath );
+    vrclient_free_path( params.pchFilePath );
     return params._ret;
 }
 
@@ -5575,10 +5575,10 @@ EVROverlayError __thiscall winIVROverlay_IVROverlay_008_SetOverlayFromFile(struc
         .ulOverlayHandle = ulOverlayHandle,
         .pchFilePath = pchFilePath,
     };
-    const char *u_pchFilePath = vrclient_dos_to_unix_path( pchFilePath );
+    params.pchFilePath = vrclient_dos_to_unix_path( pchFilePath );
     TRACE("%p\n", _this);
     cppIVROverlay_IVROverlay_008_SetOverlayFromFile( &params );
-    vrclient_free_path( u_pchFilePath );
+    vrclient_free_path( params.pchFilePath );
     return params._ret;
 }
 
@@ -6628,10 +6628,10 @@ EVROverlayError __thiscall winIVROverlay_IVROverlay_010_SetOverlayFromFile(struc
         .ulOverlayHandle = ulOverlayHandle,
         .pchFilePath = pchFilePath,
     };
-    const char *u_pchFilePath = vrclient_dos_to_unix_path( pchFilePath );
+    params.pchFilePath = vrclient_dos_to_unix_path( pchFilePath );
     TRACE("%p\n", _this);
     cppIVROverlay_IVROverlay_010_SetOverlayFromFile( &params );
-    vrclient_free_path( u_pchFilePath );
+    vrclient_free_path( params.pchFilePath );
     return params._ret;
 }
 
@@ -7727,10 +7727,10 @@ EVROverlayError __thiscall winIVROverlay_IVROverlay_011_SetOverlayFromFile(struc
         .ulOverlayHandle = ulOverlayHandle,
         .pchFilePath = pchFilePath,
     };
-    const char *u_pchFilePath = vrclient_dos_to_unix_path( pchFilePath );
+    params.pchFilePath = vrclient_dos_to_unix_path( pchFilePath );
     TRACE("%p\n", _this);
     cppIVROverlay_IVROverlay_011_SetOverlayFromFile( &params );
-    vrclient_free_path( u_pchFilePath );
+    vrclient_free_path( params.pchFilePath );
     return params._ret;
 }
 
@@ -8867,10 +8867,10 @@ EVROverlayError __thiscall winIVROverlay_IVROverlay_012_SetOverlayFromFile(struc
         .ulOverlayHandle = ulOverlayHandle,
         .pchFilePath = pchFilePath,
     };
-    const char *u_pchFilePath = vrclient_dos_to_unix_path( pchFilePath );
+    params.pchFilePath = vrclient_dos_to_unix_path( pchFilePath );
     TRACE("%p\n", _this);
     cppIVROverlay_IVROverlay_012_SetOverlayFromFile( &params );
-    vrclient_free_path( u_pchFilePath );
+    vrclient_free_path( params.pchFilePath );
     return params._ret;
 }
 
@@ -10080,10 +10080,10 @@ EVROverlayError __thiscall winIVROverlay_IVROverlay_013_SetOverlayFromFile(struc
         .ulOverlayHandle = ulOverlayHandle,
         .pchFilePath = pchFilePath,
     };
-    const char *u_pchFilePath = vrclient_dos_to_unix_path( pchFilePath );
+    params.pchFilePath = vrclient_dos_to_unix_path( pchFilePath );
     TRACE("%p\n", _this);
     cppIVROverlay_IVROverlay_013_SetOverlayFromFile( &params );
-    vrclient_free_path( u_pchFilePath );
+    vrclient_free_path( params.pchFilePath );
     return params._ret;
 }
 
@@ -11320,10 +11320,10 @@ EVROverlayError __thiscall winIVROverlay_IVROverlay_014_SetOverlayFromFile(struc
         .ulOverlayHandle = ulOverlayHandle,
         .pchFilePath = pchFilePath,
     };
-    const char *u_pchFilePath = vrclient_dos_to_unix_path( pchFilePath );
+    params.pchFilePath = vrclient_dos_to_unix_path( pchFilePath );
     TRACE("%p\n", _this);
     cppIVROverlay_IVROverlay_014_SetOverlayFromFile( &params );
-    vrclient_free_path( u_pchFilePath );
+    vrclient_free_path( params.pchFilePath );
     return params._ret;
 }
 
@@ -12672,10 +12672,10 @@ EVROverlayError __thiscall winIVROverlay_IVROverlay_016_SetOverlayFromFile(struc
         .ulOverlayHandle = ulOverlayHandle,
         .pchFilePath = pchFilePath,
     };
-    const char *u_pchFilePath = vrclient_dos_to_unix_path( pchFilePath );
+    params.pchFilePath = vrclient_dos_to_unix_path( pchFilePath );
     TRACE("%p\n", _this);
     cppIVROverlay_IVROverlay_016_SetOverlayFromFile( &params );
-    vrclient_free_path( u_pchFilePath );
+    vrclient_free_path( params.pchFilePath );
     return params._ret;
 }
 
@@ -14078,10 +14078,10 @@ EVROverlayError __thiscall winIVROverlay_IVROverlay_017_SetOverlayFromFile(struc
         .ulOverlayHandle = ulOverlayHandle,
         .pchFilePath = pchFilePath,
     };
-    const char *u_pchFilePath = vrclient_dos_to_unix_path( pchFilePath );
+    params.pchFilePath = vrclient_dos_to_unix_path( pchFilePath );
     TRACE("%p\n", _this);
     cppIVROverlay_IVROverlay_017_SetOverlayFromFile( &params );
-    vrclient_free_path( u_pchFilePath );
+    vrclient_free_path( params.pchFilePath );
     return params._ret;
 }
 
@@ -15474,10 +15474,10 @@ EVROverlayError __thiscall winIVROverlay_IVROverlay_018_SetOverlayFromFile(struc
         .ulOverlayHandle = ulOverlayHandle,
         .pchFilePath = pchFilePath,
     };
-    const char *u_pchFilePath = vrclient_dos_to_unix_path( pchFilePath );
+    params.pchFilePath = vrclient_dos_to_unix_path( pchFilePath );
     TRACE("%p\n", _this);
     cppIVROverlay_IVROverlay_018_SetOverlayFromFile( &params );
-    vrclient_free_path( u_pchFilePath );
+    vrclient_free_path( params.pchFilePath );
     return params._ret;
 }
 
@@ -16868,10 +16868,10 @@ EVROverlayError __thiscall winIVROverlay_IVROverlay_019_SetOverlayFromFile(struc
         .ulOverlayHandle = ulOverlayHandle,
         .pchFilePath = pchFilePath,
     };
-    const char *u_pchFilePath = vrclient_dos_to_unix_path( pchFilePath );
+    params.pchFilePath = vrclient_dos_to_unix_path( pchFilePath );
     TRACE("%p\n", _this);
     cppIVROverlay_IVROverlay_019_SetOverlayFromFile( &params );
-    vrclient_free_path( u_pchFilePath );
+    vrclient_free_path( params.pchFilePath );
     return params._ret;
 }
 
@@ -18237,10 +18237,10 @@ EVROverlayError __thiscall winIVROverlay_IVROverlay_020_SetOverlayFromFile(struc
         .ulOverlayHandle = ulOverlayHandle,
         .pchFilePath = pchFilePath,
     };
-    const char *u_pchFilePath = vrclient_dos_to_unix_path( pchFilePath );
+    params.pchFilePath = vrclient_dos_to_unix_path( pchFilePath );
     TRACE("%p\n", _this);
     cppIVROverlay_IVROverlay_020_SetOverlayFromFile( &params );
-    vrclient_free_path( u_pchFilePath );
+    vrclient_free_path( params.pchFilePath );
     return params._ret;
 }
 
@@ -19546,10 +19546,10 @@ EVROverlayError __thiscall winIVROverlay_IVROverlay_021_SetOverlayFromFile(struc
         .ulOverlayHandle = ulOverlayHandle,
         .pchFilePath = pchFilePath,
     };
-    const char *u_pchFilePath = vrclient_dos_to_unix_path( pchFilePath );
+    params.pchFilePath = vrclient_dos_to_unix_path( pchFilePath );
     TRACE("%p\n", _this);
     cppIVROverlay_IVROverlay_021_SetOverlayFromFile( &params );
-    vrclient_free_path( u_pchFilePath );
+    vrclient_free_path( params.pchFilePath );
     return params._ret;
 }
 
@@ -20960,10 +20960,10 @@ EVROverlayError __thiscall winIVROverlay_IVROverlay_022_SetOverlayFromFile(struc
         .ulOverlayHandle = ulOverlayHandle,
         .pchFilePath = pchFilePath,
     };
-    const char *u_pchFilePath = vrclient_dos_to_unix_path( pchFilePath );
+    params.pchFilePath = vrclient_dos_to_unix_path( pchFilePath );
     TRACE("%p\n", _this);
     cppIVROverlay_IVROverlay_022_SetOverlayFromFile( &params );
-    vrclient_free_path( u_pchFilePath );
+    vrclient_free_path( params.pchFilePath );
     return params._ret;
 }
 
@@ -22294,10 +22294,10 @@ EVROverlayError __thiscall winIVROverlay_IVROverlay_024_SetOverlayFromFile(struc
         .ulOverlayHandle = ulOverlayHandle,
         .pchFilePath = pchFilePath,
     };
-    const char *u_pchFilePath = vrclient_dos_to_unix_path( pchFilePath );
+    params.pchFilePath = vrclient_dos_to_unix_path( pchFilePath );
     TRACE("%p\n", _this);
     cppIVROverlay_IVROverlay_024_SetOverlayFromFile( &params );
-    vrclient_free_path( u_pchFilePath );
+    vrclient_free_path( params.pchFilePath );
     return params._ret;
 }
 
@@ -23637,10 +23637,10 @@ EVROverlayError __thiscall winIVROverlay_IVROverlay_025_SetOverlayFromFile(struc
         .ulOverlayHandle = ulOverlayHandle,
         .pchFilePath = pchFilePath,
     };
-    const char *u_pchFilePath = vrclient_dos_to_unix_path( pchFilePath );
+    params.pchFilePath = vrclient_dos_to_unix_path( pchFilePath );
     TRACE("%p\n", _this);
     cppIVROverlay_IVROverlay_025_SetOverlayFromFile( &params );
-    vrclient_free_path( u_pchFilePath );
+    vrclient_free_path( params.pchFilePath );
     return params._ret;
 }
 
@@ -25023,10 +25023,10 @@ EVROverlayError __thiscall winIVROverlay_IVROverlay_026_SetOverlayFromFile(struc
         .ulOverlayHandle = ulOverlayHandle,
         .pchFilePath = pchFilePath,
     };
-    const char *u_pchFilePath = vrclient_dos_to_unix_path( pchFilePath );
+    params.pchFilePath = vrclient_dos_to_unix_path( pchFilePath );
     TRACE("%p\n", _this);
     cppIVROverlay_IVROverlay_026_SetOverlayFromFile( &params );
-    vrclient_free_path( u_pchFilePath );
+    vrclient_free_path( params.pchFilePath );
     return params._ret;
 }
 
@@ -26385,10 +26385,10 @@ EVROverlayError __thiscall winIVROverlay_IVROverlay_027_SetOverlayFromFile(struc
         .ulOverlayHandle = ulOverlayHandle,
         .pchFilePath = pchFilePath,
     };
-    const char *u_pchFilePath = vrclient_dos_to_unix_path( pchFilePath );
+    params.pchFilePath = vrclient_dos_to_unix_path( pchFilePath );
     TRACE("%p\n", _this);
     cppIVROverlay_IVROverlay_027_SetOverlayFromFile( &params );
-    vrclient_free_path( u_pchFilePath );
+    vrclient_free_path( params.pchFilePath );
     return params._ret;
 }
 
diff --git a/vrclient_x64/vrclient_x64/winIVRScreenshots.c b/vrclient_x64/vrclient_x64/winIVRScreenshots.c
index 92a87650..365406e6 100644
--- a/vrclient_x64/vrclient_x64/winIVRScreenshots.c
+++ b/vrclient_x64/vrclient_x64/winIVRScreenshots.c
@@ -36,12 +36,12 @@ EVRScreenshotError __thiscall winIVRScreenshots_IVRScreenshots_001_RequestScreen
         .pchPreviewFilename = pchPreviewFilename,
         .pchVRFilename = pchVRFilename,
     };
-    const char *u_pchPreviewFilename = vrclient_dos_to_unix_path( pchPreviewFilename );
-    const char *u_pchVRFilename = vrclient_dos_to_unix_path( pchVRFilename );
+    params.pchPreviewFilename = vrclient_dos_to_unix_path( pchPreviewFilename );
+    params.pchVRFilename = vrclient_dos_to_unix_path( pchVRFilename );
     TRACE("%p\n", _this);
     cppIVRScreenshots_IVRScreenshots_001_RequestScreenshot( &params );
-    vrclient_free_path( u_pchPreviewFilename );
-    vrclient_free_path( u_pchVRFilename );
+    vrclient_free_path( params.pchPreviewFilename );
+    vrclient_free_path( params.pchVRFilename );
     return params._ret;
 }
 
@@ -110,12 +110,12 @@ EVRScreenshotError __thiscall winIVRScreenshots_IVRScreenshots_001_TakeStereoScr
         .pchPreviewFilename = pchPreviewFilename,
         .pchVRFilename = pchVRFilename,
     };
-    const char *u_pchPreviewFilename = vrclient_dos_to_unix_path( pchPreviewFilename );
-    const char *u_pchVRFilename = vrclient_dos_to_unix_path( pchVRFilename );
+    params.pchPreviewFilename = vrclient_dos_to_unix_path( pchPreviewFilename );
+    params.pchVRFilename = vrclient_dos_to_unix_path( pchVRFilename );
     TRACE("%p\n", _this);
     cppIVRScreenshots_IVRScreenshots_001_TakeStereoScreenshot( &params );
-    vrclient_free_path( u_pchPreviewFilename );
-    vrclient_free_path( u_pchVRFilename );
+    vrclient_free_path( params.pchPreviewFilename );
+    vrclient_free_path( params.pchVRFilename );
     return params._ret;
 }
 
@@ -129,12 +129,12 @@ EVRScreenshotError __thiscall winIVRScreenshots_IVRScreenshots_001_SubmitScreens
         .pchSourcePreviewFilename = pchSourcePreviewFilename,
         .pchSourceVRFilename = pchSourceVRFilename,
     };
-    const char *u_pchSourcePreviewFilename = vrclient_dos_to_unix_path( pchSourcePreviewFilename );
-    const char *u_pchSourceVRFilename = vrclient_dos_to_unix_path( pchSourceVRFilename );
+    params.pchSourcePreviewFilename = vrclient_dos_to_unix_path( pchSourcePreviewFilename );
+    params.pchSourceVRFilename = vrclient_dos_to_unix_path( pchSourceVRFilename );
     TRACE("%p\n", _this);
     cppIVRScreenshots_IVRScreenshots_001_SubmitScreenshot( &params );
-    vrclient_free_path( u_pchSourcePreviewFilename );
-    vrclient_free_path( u_pchSourceVRFilename );
+    vrclient_free_path( params.pchSourcePreviewFilename );
+    vrclient_free_path( params.pchSourceVRFilename );
     return params._ret;
 }