From b6dc199993c792ff00283f2dca1533c459a2d376 Mon Sep 17 00:00:00 2001
From: Lea Anthony <lea.anthony@gmail.com>
Date: Sun, 7 Jan 2024 20:11:34 +1100
Subject: [PATCH] Update bindings tests

---
 v3/internal/parser/bindings.go                |  2 +-
 v3/internal/parser/bindings_test.go           | 27 +++---
 .../frontend/bindings/main/GreetService.js    |  5 +-
 .../bindings/main/GreetService.name.ts        |  5 +-
 .../frontend/bindings/main/GreetService.ts    |  5 +-
 .../frontend/bindings/main/GreetService.js    |  3 +-
 .../bindings/main/GreetService.name.js        |  3 +-
 .../bindings/main/GreetService.name.ts        |  3 +-
 .../frontend/bindings/main/GreetService.ts    |  3 +-
 .../boundmethods.got.json                     |  1 -
 .../frontend/bindings/main/GreetService.js    |  5 +-
 .../bindings/main/GreetService.name.js        |  5 +-
 .../bindings/main/GreetService.name.ts        |  5 +-
 .../frontend/bindings/main/GreetService.ts    |  5 +-
 .../bindings/services/OtherService.js         |  3 +-
 .../bindings/services/OtherService.name.js    |  3 +-
 .../bindings/services/OtherService.name.ts    |  3 +-
 .../bindings/services/OtherService.ts         |  3 +-
 .../frontend/bindings/main/GreetService.js    |  5 +-
 .../bindings/main/GreetService.name.js        |  5 +-
 .../bindings/main/GreetService.name.ts        |  5 +-
 .../frontend/bindings/main/GreetService.ts    |  5 +-
 .../bindings/services/other/OtherService.js   |  3 +-
 .../services/other/OtherService.name.js       |  3 +-
 .../services/other/OtherService.name.ts       |  3 +-
 .../bindings/services/other/OtherService.ts   |  3 +-
 .../frontend/bindings/main/GreetService.js    |  3 +-
 .../bindings/main/GreetService.name.js        |  3 +-
 .../bindings/main/GreetService.name.ts        |  3 +-
 .../frontend/bindings/main/GreetService.ts    |  3 +-
 .../frontend/bindings/main/GreetService.js    |  3 +-
 .../bindings/main/GreetService.name.js        |  3 +-
 .../frontend/bindings/main/OtherService.js    |  3 +-
 .../bindings/main/OtherService.name.js        |  3 +-
 .../frontend/bindings/main/GreetService.js    |  3 +-
 .../bindings/main/GreetService.name.js        |  3 +-
 .../bindings/main/GreetService.name.ts        |  3 +-
 .../frontend/bindings/main/GreetService.ts    |  3 +-
 .../frontend/bindings/main/OtherService.js    |  3 +-
 .../bindings/main/OtherService.name.js        |  3 +-
 .../bindings/main/OtherService.name.ts        |  3 +-
 .../frontend/bindings/main/OtherService.ts    |  3 +-
 .../frontend/bindings/main/GreetService.js    |  5 +-
 .../bindings/main/GreetService.name.js        |  5 +-
 .../bindings/main/GreetService.name.ts        |  5 +-
 .../frontend/bindings/main/GreetService.ts    |  5 +-
 .../bindings/services/OtherService.js         |  3 +-
 .../bindings/services/OtherService.name.js    |  3 +-
 .../bindings/services/OtherService.name.ts    |  3 +-
 .../bindings/services/OtherService.ts         |  3 +-
 .../frontend/bindings/main/GreetService.js    | 87 ++++++++++---------
 .../bindings/main/GreetService.name.js        | 87 ++++++++++---------
 .../bindings/main/GreetService.name.ts        | 87 ++++++++++---------
 .../frontend/bindings/main/GreetService.ts    | 87 ++++++++++---------
 .../frontend/bindings/main/GreetService.js    | 87 ++++++++++---------
 .../bindings/main/GreetService.name.js        | 87 ++++++++++---------
 .../bindings/main/GreetService.name.ts        | 87 ++++++++++---------
 .../frontend/bindings/main/GreetService.ts    | 87 ++++++++++---------
 .../frontend/bindings/main/GreetService.js    |  3 +-
 .../bindings/main/GreetService.name.js        |  3 +-
 .../bindings/main/GreetService.name.ts        |  3 +-
 .../frontend/bindings/main/GreetService.ts    |  3 +-
 .../frontend/bindings/main/GreetService.js    |  3 +-
 .../bindings/main/GreetService.name.js        |  3 +-
 .../bindings/main/GreetService.name.ts        |  3 +-
 .../frontend/bindings/main/GreetService.ts    |  3 +-
 .../frontend/bindings/main/GreetService.js    |  5 +-
 .../bindings/main/GreetService.name.js        |  5 +-
 .../bindings/main/GreetService.name.ts        |  5 +-
 .../frontend/bindings/main/GreetService.ts    |  5 +-
 .../bindings/services/OtherService.js         |  3 +-
 .../bindings/services/OtherService.name.js    |  3 +-
 .../bindings/services/OtherService.name.ts    |  3 +-
 .../bindings/services/OtherService.ts         |  3 +-
 74 files changed, 509 insertions(+), 444 deletions(-)
 delete mode 100644 v3/internal/parser/testdata/function_from_imported_package/boundmethods.got.json

diff --git a/v3/internal/parser/bindings.go b/v3/internal/parser/bindings.go
index e3304207b88..854238b011f 100644
--- a/v3/internal/parser/bindings.go
+++ b/v3/internal/parser/bindings.go
@@ -366,7 +366,7 @@ func (p *Project) GenerateBindings(bindings map[string]map[string][]*BoundMethod
 			var models []string
 			var mainImports = ""
 			if len(methods) > 0 {
-				mainImports = "import { Call } from '@wailsio/runtime';\n"
+				mainImports = "import {Call} from '@wailsio/runtime';\n"
 			}
 			for _, method := range methods {
 				if useTypescript {
diff --git a/v3/internal/parser/bindings_test.go b/v3/internal/parser/bindings_test.go
index bd0675a1081..8a1447b0318 100644
--- a/v3/internal/parser/bindings_test.go
+++ b/v3/internal/parser/bindings_test.go
@@ -62,15 +62,6 @@ func TestGenerateBindings(t *testing.T) {
 			useIDs:        false,
 			useTypescript: true,
 		},
-		{
-			name: "enum",
-			dir:  "testdata/enum",
-			want: map[string]map[string]string{
-				"main": {
-					"GreetService": getFile("testdata/enum/frontend/bindings/main/GreetService.name.js"),
-				},
-			},
-		},
 		{
 			name: "enum_from_imported_package",
 			dir:  "testdata/enum_from_imported_package",
@@ -690,15 +681,19 @@ func TestGenerateBindings(t *testing.T) {
 
 					if diff := cmp.Diff(expected, binding); diff != "" {
 						outFileName := name + ".got.js"
-						originalFilename := name + ".js"
+						originalFilename := name
+						if !tt.useIDs {
+							originalFilename += ".name"
+						}
+						outFileName = originalFilename + ".got"
 						if tt.useTypescript {
-							if tt.useIDs {
-								originalFilename = name + ".ts"
-							} else {
-								originalFilename = name + ".name.ts"
-							}
-							outFileName = name + ".got.ts"
+							originalFilename += ".ts"
+							outFileName += ".ts"
+						} else {
+							originalFilename += ".js"
+							outFileName += ".js"
 						}
+
 						originalFile := filepath.Join(tt.dir, project.outputDirectory, dirName, originalFilename)
 						// Check if file exists
 						if _, err := os.Stat(originalFile); err != nil {
diff --git a/v3/internal/parser/testdata/enum/frontend/bindings/main/GreetService.js b/v3/internal/parser/testdata/enum/frontend/bindings/main/GreetService.js
index adaa08635fb..736cd809176 100644
--- a/v3/internal/parser/testdata/enum/frontend/bindings/main/GreetService.js
+++ b/v3/internal/parser/testdata/enum/frontend/bindings/main/GreetService.js
@@ -2,6 +2,7 @@
 // Cynhyrchwyd y ffeil hon yn awtomatig. PEIDIWCH Â MODIWL
 // This file is automatically generated. DO NOT EDIT
 
+import {Call} from '@wailsio/runtime';
 /**
  * @typedef {import('./models').Person} Person
  * @typedef {import('./models').Title} Title
@@ -15,7 +16,7 @@
  * @returns {Promise<string>}
  **/
 export async function Greet(name, title) {
-	return wails.CallByID(1411160069, ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByID(1411160069, ...Array.prototype.slice.call(arguments, 0));
 }
 
 /**
@@ -25,5 +26,5 @@ export async function Greet(name, title) {
  * @returns {Promise<Person>}
  **/
 export async function NewPerson(name) {
-	return wails.CallByID(1661412647, ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByID(1661412647, ...Array.prototype.slice.call(arguments, 0));
 }
diff --git a/v3/internal/parser/testdata/enum/frontend/bindings/main/GreetService.name.ts b/v3/internal/parser/testdata/enum/frontend/bindings/main/GreetService.name.ts
index 45e0d291594..896096f7846 100644
--- a/v3/internal/parser/testdata/enum/frontend/bindings/main/GreetService.name.ts
+++ b/v3/internal/parser/testdata/enum/frontend/bindings/main/GreetService.name.ts
@@ -1,16 +1,17 @@
 // Cynhyrchwyd y ffeil hon yn awtomatig. PEIDIWCH Â MODIWL
 // This file is automatically generated. DO NOT EDIT
 
+import {Call} from '@wailsio/runtime';
 import {Person} from './models';
 import {Title} from './models';
 
 // Greet does XYZ
 export async function Greet(name: string, title: Title) : Promise<string> {
-	return wails.CallByName("main.GreetService.Greet", name, title);
+	return Call.ByName("main.GreetService.Greet", name, title);
 }
 
 // NewPerson creates a new person
 export async function NewPerson(name: string) : Promise<Person> {
-	return wails.CallByName("main.GreetService.NewPerson", name);
+	return Call.ByName("main.GreetService.NewPerson", name);
 }
 
diff --git a/v3/internal/parser/testdata/enum/frontend/bindings/main/GreetService.ts b/v3/internal/parser/testdata/enum/frontend/bindings/main/GreetService.ts
index abec1c6bc7e..8d24df2d6f8 100644
--- a/v3/internal/parser/testdata/enum/frontend/bindings/main/GreetService.ts
+++ b/v3/internal/parser/testdata/enum/frontend/bindings/main/GreetService.ts
@@ -1,16 +1,17 @@
 // Cynhyrchwyd y ffeil hon yn awtomatig. PEIDIWCH Â MODIWL
 // This file is automatically generated. DO NOT EDIT
 
+import {Call} from '@wailsio/runtime';
 import {Person} from './models';
 import {Title} from './models';
 
 // Greet does XYZ
 export async function Greet(name: string, title: Title) : Promise<string> {
-	return wails.CallByID(1411160069, name, title);
+	return Call.ByID(1411160069, name, title);
 }
 
 // NewPerson creates a new person
 export async function NewPerson(name: string) : Promise<Person> {
-	return wails.CallByID(1661412647, name);
+	return Call.ByID(1661412647, name);
 }
 
diff --git a/v3/internal/parser/testdata/enum_from_imported_package/frontend/bindings/main/GreetService.js b/v3/internal/parser/testdata/enum_from_imported_package/frontend/bindings/main/GreetService.js
index f6caa4762f1..c1574fa46a8 100644
--- a/v3/internal/parser/testdata/enum_from_imported_package/frontend/bindings/main/GreetService.js
+++ b/v3/internal/parser/testdata/enum_from_imported_package/frontend/bindings/main/GreetService.js
@@ -2,6 +2,7 @@
 // Cynhyrchwyd y ffeil hon yn awtomatig. PEIDIWCH Â MODIWL
 // This file is automatically generated. DO NOT EDIT
 
+import {Call} from '@wailsio/runtime';
 /**
  * @typedef {import('../services/models').Title} servicesTitle
  */
@@ -14,5 +15,5 @@
  * @returns {Promise<string>}
  **/
 export async function Greet(name, title) {
-	return wails.CallByID(1411160069, ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByID(1411160069, ...Array.prototype.slice.call(arguments, 0));
 }
diff --git a/v3/internal/parser/testdata/enum_from_imported_package/frontend/bindings/main/GreetService.name.js b/v3/internal/parser/testdata/enum_from_imported_package/frontend/bindings/main/GreetService.name.js
index 57f1fbc521c..672f859e1be 100644
--- a/v3/internal/parser/testdata/enum_from_imported_package/frontend/bindings/main/GreetService.name.js
+++ b/v3/internal/parser/testdata/enum_from_imported_package/frontend/bindings/main/GreetService.name.js
@@ -2,6 +2,7 @@
 // Cynhyrchwyd y ffeil hon yn awtomatig. PEIDIWCH Â MODIWL
 // This file is automatically generated. DO NOT EDIT
 
+import {Call} from '@wailsio/runtime';
 /**
  * @typedef {import('../services/models').Title} servicesTitle
  */
@@ -14,5 +15,5 @@
  * @returns {Promise<string>}
  **/
 export async function Greet(name, title) {
-	return wails.CallByName("main.GreetService.Greet", ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByName("main.GreetService.Greet", ...Array.prototype.slice.call(arguments, 0));
 }
diff --git a/v3/internal/parser/testdata/enum_from_imported_package/frontend/bindings/main/GreetService.name.ts b/v3/internal/parser/testdata/enum_from_imported_package/frontend/bindings/main/GreetService.name.ts
index 90a7c0f55a8..71846bc5c85 100644
--- a/v3/internal/parser/testdata/enum_from_imported_package/frontend/bindings/main/GreetService.name.ts
+++ b/v3/internal/parser/testdata/enum_from_imported_package/frontend/bindings/main/GreetService.name.ts
@@ -1,10 +1,11 @@
 // Cynhyrchwyd y ffeil hon yn awtomatig. PEIDIWCH Â MODIWL
 // This file is automatically generated. DO NOT EDIT
 
+import {Call} from '@wailsio/runtime';
 import {Title as servicesTitle} from '../services/models';
 
 // Greet does XYZ
 export async function Greet(name: string, title: servicesTitle) : Promise<string> {
-	return wails.CallByName("main.GreetService.Greet", name, title);
+	return Call.ByName("main.GreetService.Greet", name, title);
 }
 
diff --git a/v3/internal/parser/testdata/enum_from_imported_package/frontend/bindings/main/GreetService.ts b/v3/internal/parser/testdata/enum_from_imported_package/frontend/bindings/main/GreetService.ts
index 0a98016754a..a4e52e9e856 100644
--- a/v3/internal/parser/testdata/enum_from_imported_package/frontend/bindings/main/GreetService.ts
+++ b/v3/internal/parser/testdata/enum_from_imported_package/frontend/bindings/main/GreetService.ts
@@ -1,10 +1,11 @@
 // Cynhyrchwyd y ffeil hon yn awtomatig. PEIDIWCH Â MODIWL
 // This file is automatically generated. DO NOT EDIT
 
+import {Call} from '@wailsio/runtime';
 import {Title as servicesTitle} from '../services/models';
 
 // Greet does XYZ
 export async function Greet(name: string, title: servicesTitle) : Promise<string> {
-	return wails.CallByID(1411160069, name, title);
+	return Call.ByID(1411160069, name, title);
 }
 
diff --git a/v3/internal/parser/testdata/function_from_imported_package/boundmethods.got.json b/v3/internal/parser/testdata/function_from_imported_package/boundmethods.got.json
deleted file mode 100644
index a3502e53c1f..00000000000
--- a/v3/internal/parser/testdata/function_from_imported_package/boundmethods.got.json
+++ /dev/null
@@ -1 +0,0 @@
-map[string]map[string][]*parser.BoundMethod{"github.com/wailsapp/wails/v3/internal/parser/testdata/function_from_imported_package/services":map[string][]*parser.BoundMethod{"OtherService":[]*parser.BoundMethod{(*parser.BoundMethod)(0xc000148000)}}, "main":map[string][]*parser.BoundMethod{"GreetService":[]*parser.BoundMethod{(*parser.BoundMethod)(0xc0000c8a80), (*parser.BoundMethod)(0xc0000c8b00)}}}
\ No newline at end of file
diff --git a/v3/internal/parser/testdata/function_from_imported_package/frontend/bindings/main/GreetService.js b/v3/internal/parser/testdata/function_from_imported_package/frontend/bindings/main/GreetService.js
index dee2ada333a..7d9510b20ed 100644
--- a/v3/internal/parser/testdata/function_from_imported_package/frontend/bindings/main/GreetService.js
+++ b/v3/internal/parser/testdata/function_from_imported_package/frontend/bindings/main/GreetService.js
@@ -2,6 +2,7 @@
 // Cynhyrchwyd y ffeil hon yn awtomatig. PEIDIWCH Â MODIWL
 // This file is automatically generated. DO NOT EDIT
 
+import {Call} from '@wailsio/runtime';
 /**
  * @typedef {import('./models').Person} Person
  */
@@ -13,7 +14,7 @@
  * @returns {Promise<string>}
  **/
 export async function Greet(name) {
-	return wails.CallByID(1411160069, ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByID(1411160069, ...Array.prototype.slice.call(arguments, 0));
 }
 
 /**
@@ -23,5 +24,5 @@ export async function Greet(name) {
  * @returns {Promise<Person>}
  **/
 export async function NewPerson(name) {
-	return wails.CallByID(1661412647, ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByID(1661412647, ...Array.prototype.slice.call(arguments, 0));
 }
diff --git a/v3/internal/parser/testdata/function_from_imported_package/frontend/bindings/main/GreetService.name.js b/v3/internal/parser/testdata/function_from_imported_package/frontend/bindings/main/GreetService.name.js
index 9c4f2666956..38558e41c9c 100644
--- a/v3/internal/parser/testdata/function_from_imported_package/frontend/bindings/main/GreetService.name.js
+++ b/v3/internal/parser/testdata/function_from_imported_package/frontend/bindings/main/GreetService.name.js
@@ -2,6 +2,7 @@
 // Cynhyrchwyd y ffeil hon yn awtomatig. PEIDIWCH Â MODIWL
 // This file is automatically generated. DO NOT EDIT
 
+import {Call} from '@wailsio/runtime';
 /**
  * @typedef {import('./models').Person} Person
  */
@@ -13,7 +14,7 @@
  * @returns {Promise<string>}
  **/
 export async function Greet(name) {
-	return wails.CallByName("main.GreetService.Greet", ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByName("main.GreetService.Greet", ...Array.prototype.slice.call(arguments, 0));
 }
 
 /**
@@ -23,5 +24,5 @@ export async function Greet(name) {
  * @returns {Promise<Person>}
  **/
 export async function NewPerson(name) {
-	return wails.CallByName("main.GreetService.NewPerson", ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByName("main.GreetService.NewPerson", ...Array.prototype.slice.call(arguments, 0));
 }
diff --git a/v3/internal/parser/testdata/function_from_imported_package/frontend/bindings/main/GreetService.name.ts b/v3/internal/parser/testdata/function_from_imported_package/frontend/bindings/main/GreetService.name.ts
index e7cc3292f38..b5753395d13 100644
--- a/v3/internal/parser/testdata/function_from_imported_package/frontend/bindings/main/GreetService.name.ts
+++ b/v3/internal/parser/testdata/function_from_imported_package/frontend/bindings/main/GreetService.name.ts
@@ -1,15 +1,16 @@
 // Cynhyrchwyd y ffeil hon yn awtomatig. PEIDIWCH Â MODIWL
 // This file is automatically generated. DO NOT EDIT
 
+import {Call} from '@wailsio/runtime';
 import {Person} from './models';
 
 // Greet does XYZ
 export async function Greet(name: string) : Promise<string> {
-	return wails.CallByName("main.GreetService.Greet", name);
+	return Call.ByName("main.GreetService.Greet", name);
 }
 
 // NewPerson creates a new person
 export async function NewPerson(name: string) : Promise<Person> {
-	return wails.CallByName("main.GreetService.NewPerson", name);
+	return Call.ByName("main.GreetService.NewPerson", name);
 }
 
diff --git a/v3/internal/parser/testdata/function_from_imported_package/frontend/bindings/main/GreetService.ts b/v3/internal/parser/testdata/function_from_imported_package/frontend/bindings/main/GreetService.ts
index a66bf118b64..0b2c57590b6 100644
--- a/v3/internal/parser/testdata/function_from_imported_package/frontend/bindings/main/GreetService.ts
+++ b/v3/internal/parser/testdata/function_from_imported_package/frontend/bindings/main/GreetService.ts
@@ -1,15 +1,16 @@
 // Cynhyrchwyd y ffeil hon yn awtomatig. PEIDIWCH Â MODIWL
 // This file is automatically generated. DO NOT EDIT
 
+import {Call} from '@wailsio/runtime';
 import {Person} from './models';
 
 // Greet does XYZ
 export async function Greet(name: string) : Promise<string> {
-	return wails.CallByID(1411160069, name);
+	return Call.ByID(1411160069, name);
 }
 
 // NewPerson creates a new person
 export async function NewPerson(name: string) : Promise<Person> {
-	return wails.CallByID(1661412647, name);
+	return Call.ByID(1661412647, name);
 }
 
diff --git a/v3/internal/parser/testdata/function_from_imported_package/frontend/bindings/services/OtherService.js b/v3/internal/parser/testdata/function_from_imported_package/frontend/bindings/services/OtherService.js
index 31320da977d..b633616da1b 100644
--- a/v3/internal/parser/testdata/function_from_imported_package/frontend/bindings/services/OtherService.js
+++ b/v3/internal/parser/testdata/function_from_imported_package/frontend/bindings/services/OtherService.js
@@ -2,6 +2,7 @@
 // Cynhyrchwyd y ffeil hon yn awtomatig. PEIDIWCH Â MODIWL
 // This file is automatically generated. DO NOT EDIT
 
+import {Call} from '@wailsio/runtime';
 /**
  * @typedef {import('./models').Address} Address
  */
@@ -12,5 +13,5 @@
  * @returns {Promise<Address>}
  **/
 export async function Yay() {
-	return wails.CallByID(1592414782, ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByID(1592414782, ...Array.prototype.slice.call(arguments, 0));
 }
diff --git a/v3/internal/parser/testdata/function_from_imported_package/frontend/bindings/services/OtherService.name.js b/v3/internal/parser/testdata/function_from_imported_package/frontend/bindings/services/OtherService.name.js
index f6af59d6ede..4d3d71c5b4a 100644
--- a/v3/internal/parser/testdata/function_from_imported_package/frontend/bindings/services/OtherService.name.js
+++ b/v3/internal/parser/testdata/function_from_imported_package/frontend/bindings/services/OtherService.name.js
@@ -2,6 +2,7 @@
 // Cynhyrchwyd y ffeil hon yn awtomatig. PEIDIWCH Â MODIWL
 // This file is automatically generated. DO NOT EDIT
 
+import {Call} from '@wailsio/runtime';
 /**
  * @typedef {import('./models').Address} Address
  */
@@ -12,5 +13,5 @@
  * @returns {Promise<Address>}
  **/
 export async function Yay() {
-	return wails.CallByName("services.OtherService.Yay", ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByName("services.OtherService.Yay", ...Array.prototype.slice.call(arguments, 0));
 }
diff --git a/v3/internal/parser/testdata/function_from_imported_package/frontend/bindings/services/OtherService.name.ts b/v3/internal/parser/testdata/function_from_imported_package/frontend/bindings/services/OtherService.name.ts
index bc71aefc828..44612231689 100644
--- a/v3/internal/parser/testdata/function_from_imported_package/frontend/bindings/services/OtherService.name.ts
+++ b/v3/internal/parser/testdata/function_from_imported_package/frontend/bindings/services/OtherService.name.ts
@@ -1,10 +1,11 @@
 // Cynhyrchwyd y ffeil hon yn awtomatig. PEIDIWCH Â MODIWL
 // This file is automatically generated. DO NOT EDIT
 
+import {Call} from '@wailsio/runtime';
 import {Address} from './models';
 
 // Yay does this and that
 export async function Yay() : Promise<Address> {
-	return wails.CallByName("services.OtherService.Yay");
+	return Call.ByName("services.OtherService.Yay");
 }
 
diff --git a/v3/internal/parser/testdata/function_from_imported_package/frontend/bindings/services/OtherService.ts b/v3/internal/parser/testdata/function_from_imported_package/frontend/bindings/services/OtherService.ts
index b4aa3137294..0d09f187783 100644
--- a/v3/internal/parser/testdata/function_from_imported_package/frontend/bindings/services/OtherService.ts
+++ b/v3/internal/parser/testdata/function_from_imported_package/frontend/bindings/services/OtherService.ts
@@ -1,10 +1,11 @@
 // Cynhyrchwyd y ffeil hon yn awtomatig. PEIDIWCH Â MODIWL
 // This file is automatically generated. DO NOT EDIT
 
+import {Call} from '@wailsio/runtime';
 import {Address} from './models';
 
 // Yay does this and that
 export async function Yay() : Promise<Address> {
-	return wails.CallByID(1592414782);
+	return Call.ByID(1592414782);
 }
 
diff --git a/v3/internal/parser/testdata/function_from_nested_imported_package/frontend/bindings/main/GreetService.js b/v3/internal/parser/testdata/function_from_nested_imported_package/frontend/bindings/main/GreetService.js
index dee2ada333a..7d9510b20ed 100644
--- a/v3/internal/parser/testdata/function_from_nested_imported_package/frontend/bindings/main/GreetService.js
+++ b/v3/internal/parser/testdata/function_from_nested_imported_package/frontend/bindings/main/GreetService.js
@@ -2,6 +2,7 @@
 // Cynhyrchwyd y ffeil hon yn awtomatig. PEIDIWCH Â MODIWL
 // This file is automatically generated. DO NOT EDIT
 
+import {Call} from '@wailsio/runtime';
 /**
  * @typedef {import('./models').Person} Person
  */
@@ -13,7 +14,7 @@
  * @returns {Promise<string>}
  **/
 export async function Greet(name) {
-	return wails.CallByID(1411160069, ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByID(1411160069, ...Array.prototype.slice.call(arguments, 0));
 }
 
 /**
@@ -23,5 +24,5 @@ export async function Greet(name) {
  * @returns {Promise<Person>}
  **/
 export async function NewPerson(name) {
-	return wails.CallByID(1661412647, ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByID(1661412647, ...Array.prototype.slice.call(arguments, 0));
 }
diff --git a/v3/internal/parser/testdata/function_from_nested_imported_package/frontend/bindings/main/GreetService.name.js b/v3/internal/parser/testdata/function_from_nested_imported_package/frontend/bindings/main/GreetService.name.js
index 9c4f2666956..38558e41c9c 100644
--- a/v3/internal/parser/testdata/function_from_nested_imported_package/frontend/bindings/main/GreetService.name.js
+++ b/v3/internal/parser/testdata/function_from_nested_imported_package/frontend/bindings/main/GreetService.name.js
@@ -2,6 +2,7 @@
 // Cynhyrchwyd y ffeil hon yn awtomatig. PEIDIWCH Â MODIWL
 // This file is automatically generated. DO NOT EDIT
 
+import {Call} from '@wailsio/runtime';
 /**
  * @typedef {import('./models').Person} Person
  */
@@ -13,7 +14,7 @@
  * @returns {Promise<string>}
  **/
 export async function Greet(name) {
-	return wails.CallByName("main.GreetService.Greet", ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByName("main.GreetService.Greet", ...Array.prototype.slice.call(arguments, 0));
 }
 
 /**
@@ -23,5 +24,5 @@ export async function Greet(name) {
  * @returns {Promise<Person>}
  **/
 export async function NewPerson(name) {
-	return wails.CallByName("main.GreetService.NewPerson", ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByName("main.GreetService.NewPerson", ...Array.prototype.slice.call(arguments, 0));
 }
diff --git a/v3/internal/parser/testdata/function_from_nested_imported_package/frontend/bindings/main/GreetService.name.ts b/v3/internal/parser/testdata/function_from_nested_imported_package/frontend/bindings/main/GreetService.name.ts
index e7cc3292f38..b5753395d13 100644
--- a/v3/internal/parser/testdata/function_from_nested_imported_package/frontend/bindings/main/GreetService.name.ts
+++ b/v3/internal/parser/testdata/function_from_nested_imported_package/frontend/bindings/main/GreetService.name.ts
@@ -1,15 +1,16 @@
 // Cynhyrchwyd y ffeil hon yn awtomatig. PEIDIWCH Â MODIWL
 // This file is automatically generated. DO NOT EDIT
 
+import {Call} from '@wailsio/runtime';
 import {Person} from './models';
 
 // Greet does XYZ
 export async function Greet(name: string) : Promise<string> {
-	return wails.CallByName("main.GreetService.Greet", name);
+	return Call.ByName("main.GreetService.Greet", name);
 }
 
 // NewPerson creates a new person
 export async function NewPerson(name: string) : Promise<Person> {
-	return wails.CallByName("main.GreetService.NewPerson", name);
+	return Call.ByName("main.GreetService.NewPerson", name);
 }
 
diff --git a/v3/internal/parser/testdata/function_from_nested_imported_package/frontend/bindings/main/GreetService.ts b/v3/internal/parser/testdata/function_from_nested_imported_package/frontend/bindings/main/GreetService.ts
index a66bf118b64..0b2c57590b6 100644
--- a/v3/internal/parser/testdata/function_from_nested_imported_package/frontend/bindings/main/GreetService.ts
+++ b/v3/internal/parser/testdata/function_from_nested_imported_package/frontend/bindings/main/GreetService.ts
@@ -1,15 +1,16 @@
 // Cynhyrchwyd y ffeil hon yn awtomatig. PEIDIWCH Â MODIWL
 // This file is automatically generated. DO NOT EDIT
 
+import {Call} from '@wailsio/runtime';
 import {Person} from './models';
 
 // Greet does XYZ
 export async function Greet(name: string) : Promise<string> {
-	return wails.CallByID(1411160069, name);
+	return Call.ByID(1411160069, name);
 }
 
 // NewPerson creates a new person
 export async function NewPerson(name: string) : Promise<Person> {
-	return wails.CallByID(1661412647, name);
+	return Call.ByID(1661412647, name);
 }
 
diff --git a/v3/internal/parser/testdata/function_from_nested_imported_package/frontend/bindings/services/other/OtherService.js b/v3/internal/parser/testdata/function_from_nested_imported_package/frontend/bindings/services/other/OtherService.js
index 21ebd90b682..c15665231fa 100644
--- a/v3/internal/parser/testdata/function_from_nested_imported_package/frontend/bindings/services/other/OtherService.js
+++ b/v3/internal/parser/testdata/function_from_nested_imported_package/frontend/bindings/services/other/OtherService.js
@@ -2,6 +2,7 @@
 // Cynhyrchwyd y ffeil hon yn awtomatig. PEIDIWCH Â MODIWL
 // This file is automatically generated. DO NOT EDIT
 
+import {Call} from '@wailsio/runtime';
 /**
  * @typedef {import('./models').Address} Address
  */
@@ -12,5 +13,5 @@
  * @returns {Promise<Address>}
  **/
 export async function Yay() {
-	return wails.CallByID(2189323817, ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByID(2189323817, ...Array.prototype.slice.call(arguments, 0));
 }
diff --git a/v3/internal/parser/testdata/function_from_nested_imported_package/frontend/bindings/services/other/OtherService.name.js b/v3/internal/parser/testdata/function_from_nested_imported_package/frontend/bindings/services/other/OtherService.name.js
index 8b3d9c0a6b6..bb8f1abb7ac 100644
--- a/v3/internal/parser/testdata/function_from_nested_imported_package/frontend/bindings/services/other/OtherService.name.js
+++ b/v3/internal/parser/testdata/function_from_nested_imported_package/frontend/bindings/services/other/OtherService.name.js
@@ -2,6 +2,7 @@
 // Cynhyrchwyd y ffeil hon yn awtomatig. PEIDIWCH Â MODIWL
 // This file is automatically generated. DO NOT EDIT
 
+import {Call} from '@wailsio/runtime';
 /**
  * @typedef {import('./models').Address} Address
  */
@@ -12,5 +13,5 @@
  * @returns {Promise<Address>}
  **/
 export async function Yay() {
-	return wails.CallByName("other.OtherService.Yay", ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByName("other.OtherService.Yay", ...Array.prototype.slice.call(arguments, 0));
 }
diff --git a/v3/internal/parser/testdata/function_from_nested_imported_package/frontend/bindings/services/other/OtherService.name.ts b/v3/internal/parser/testdata/function_from_nested_imported_package/frontend/bindings/services/other/OtherService.name.ts
index 699ad3e7935..229d58e702c 100644
--- a/v3/internal/parser/testdata/function_from_nested_imported_package/frontend/bindings/services/other/OtherService.name.ts
+++ b/v3/internal/parser/testdata/function_from_nested_imported_package/frontend/bindings/services/other/OtherService.name.ts
@@ -1,10 +1,11 @@
 // Cynhyrchwyd y ffeil hon yn awtomatig. PEIDIWCH Â MODIWL
 // This file is automatically generated. DO NOT EDIT
 
+import {Call} from '@wailsio/runtime';
 import {Address} from './models';
 
 // Yay does this and that
 export async function Yay() : Promise<Address> {
-	return wails.CallByName("other.OtherService.Yay");
+	return Call.ByName("other.OtherService.Yay");
 }
 
diff --git a/v3/internal/parser/testdata/function_from_nested_imported_package/frontend/bindings/services/other/OtherService.ts b/v3/internal/parser/testdata/function_from_nested_imported_package/frontend/bindings/services/other/OtherService.ts
index e80ce6b59f0..6ba459391a4 100644
--- a/v3/internal/parser/testdata/function_from_nested_imported_package/frontend/bindings/services/other/OtherService.ts
+++ b/v3/internal/parser/testdata/function_from_nested_imported_package/frontend/bindings/services/other/OtherService.ts
@@ -1,10 +1,11 @@
 // Cynhyrchwyd y ffeil hon yn awtomatig. PEIDIWCH Â MODIWL
 // This file is automatically generated. DO NOT EDIT
 
+import {Call} from '@wailsio/runtime';
 import {Address} from './models';
 
 // Yay does this and that
 export async function Yay() : Promise<Address> {
-	return wails.CallByID(2189323817);
+	return Call.ByID(2189323817);
 }
 
diff --git a/v3/internal/parser/testdata/function_single/frontend/bindings/main/GreetService.js b/v3/internal/parser/testdata/function_single/frontend/bindings/main/GreetService.js
index a6214ec03ff..6e4ed88f979 100644
--- a/v3/internal/parser/testdata/function_single/frontend/bindings/main/GreetService.js
+++ b/v3/internal/parser/testdata/function_single/frontend/bindings/main/GreetService.js
@@ -2,6 +2,7 @@
 // Cynhyrchwyd y ffeil hon yn awtomatig. PEIDIWCH Â MODIWL
 // This file is automatically generated. DO NOT EDIT
 
+import {Call} from '@wailsio/runtime';
 
 /**
  * Greet someone 
@@ -10,5 +11,5 @@
  * @returns {Promise<string>}
  **/
 export async function Greet(name) {
-	return wails.CallByID(1411160069, ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByID(1411160069, ...Array.prototype.slice.call(arguments, 0));
 }
diff --git a/v3/internal/parser/testdata/function_single/frontend/bindings/main/GreetService.name.js b/v3/internal/parser/testdata/function_single/frontend/bindings/main/GreetService.name.js
index 28e42b26896..020458d0bb3 100644
--- a/v3/internal/parser/testdata/function_single/frontend/bindings/main/GreetService.name.js
+++ b/v3/internal/parser/testdata/function_single/frontend/bindings/main/GreetService.name.js
@@ -2,6 +2,7 @@
 // Cynhyrchwyd y ffeil hon yn awtomatig. PEIDIWCH Â MODIWL
 // This file is automatically generated. DO NOT EDIT
 
+import {Call} from '@wailsio/runtime';
 
 /**
  * Greet someone 
@@ -10,5 +11,5 @@
  * @returns {Promise<string>}
  **/
 export async function Greet(name) {
-	return wails.CallByName("main.GreetService.Greet", ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByName("main.GreetService.Greet", ...Array.prototype.slice.call(arguments, 0));
 }
diff --git a/v3/internal/parser/testdata/function_single/frontend/bindings/main/GreetService.name.ts b/v3/internal/parser/testdata/function_single/frontend/bindings/main/GreetService.name.ts
index 4078d56c682..e7884a90c3d 100644
--- a/v3/internal/parser/testdata/function_single/frontend/bindings/main/GreetService.name.ts
+++ b/v3/internal/parser/testdata/function_single/frontend/bindings/main/GreetService.name.ts
@@ -1,8 +1,9 @@
 // Cynhyrchwyd y ffeil hon yn awtomatig. PEIDIWCH Â MODIWL
 // This file is automatically generated. DO NOT EDIT
 
+import {Call} from '@wailsio/runtime';
 // Greet someone
 export async function Greet(name: string) : Promise<string> {
-	return wails.CallByName("main.GreetService.Greet", name);
+	return Call.ByName("main.GreetService.Greet", name);
 }
 
diff --git a/v3/internal/parser/testdata/function_single/frontend/bindings/main/GreetService.ts b/v3/internal/parser/testdata/function_single/frontend/bindings/main/GreetService.ts
index d16dfd2b5bc..497e17d2bf6 100644
--- a/v3/internal/parser/testdata/function_single/frontend/bindings/main/GreetService.ts
+++ b/v3/internal/parser/testdata/function_single/frontend/bindings/main/GreetService.ts
@@ -1,8 +1,9 @@
 // Cynhyrchwyd y ffeil hon yn awtomatig. PEIDIWCH Â MODIWL
 // This file is automatically generated. DO NOT EDIT
 
+import {Call} from '@wailsio/runtime';
 // Greet someone
 export async function Greet(name: string) : Promise<string> {
-	return wails.CallByID(1411160069, name);
+	return Call.ByID(1411160069, name);
 }
 
diff --git a/v3/internal/parser/testdata/struct_literal_multiple/frontend/bindings/main/GreetService.js b/v3/internal/parser/testdata/struct_literal_multiple/frontend/bindings/main/GreetService.js
index 9dcfc2bb1d4..e105b2c6edb 100644
--- a/v3/internal/parser/testdata/struct_literal_multiple/frontend/bindings/main/GreetService.js
+++ b/v3/internal/parser/testdata/struct_literal_multiple/frontend/bindings/main/GreetService.js
@@ -2,6 +2,7 @@
 // Cynhyrchwyd y ffeil hon yn awtomatig. PEIDIWCH Â MODIWL
 // This file is automatically generated. DO NOT EDIT
 
+import {Call} from '@wailsio/runtime';
 
 /** 
  * @function Greet
@@ -9,5 +10,5 @@
  * @returns {Promise<string>}
  **/
 export async function Greet(name) {
-	return wails.CallByID(1411160069, ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByID(1411160069, ...Array.prototype.slice.call(arguments, 0));
 }
diff --git a/v3/internal/parser/testdata/struct_literal_multiple/frontend/bindings/main/GreetService.name.js b/v3/internal/parser/testdata/struct_literal_multiple/frontend/bindings/main/GreetService.name.js
index 2019a460491..e6ca9f6d440 100644
--- a/v3/internal/parser/testdata/struct_literal_multiple/frontend/bindings/main/GreetService.name.js
+++ b/v3/internal/parser/testdata/struct_literal_multiple/frontend/bindings/main/GreetService.name.js
@@ -2,6 +2,7 @@
 // Cynhyrchwyd y ffeil hon yn awtomatig. PEIDIWCH Â MODIWL
 // This file is automatically generated. DO NOT EDIT
 
+import {Call} from '@wailsio/runtime';
 
 /** 
  * @function Greet
@@ -9,5 +10,5 @@
  * @returns {Promise<string>}
  **/
 export async function Greet(name) {
-	return wails.CallByName("main.GreetService.Greet", ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByName("main.GreetService.Greet", ...Array.prototype.slice.call(arguments, 0));
 }
diff --git a/v3/internal/parser/testdata/struct_literal_multiple/frontend/bindings/main/OtherService.js b/v3/internal/parser/testdata/struct_literal_multiple/frontend/bindings/main/OtherService.js
index b01c4e5727e..fcbe321c92c 100644
--- a/v3/internal/parser/testdata/struct_literal_multiple/frontend/bindings/main/OtherService.js
+++ b/v3/internal/parser/testdata/struct_literal_multiple/frontend/bindings/main/OtherService.js
@@ -2,11 +2,12 @@
 // Cynhyrchwyd y ffeil hon yn awtomatig. PEIDIWCH Â MODIWL
 // This file is automatically generated. DO NOT EDIT
 
+import {Call} from '@wailsio/runtime';
 
 /** 
  * @function Hello
  * @returns {Promise<void>}
  **/
 export async function Hello() {
-	return wails.CallByID(4249972365, ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByID(4249972365, ...Array.prototype.slice.call(arguments, 0));
 }
diff --git a/v3/internal/parser/testdata/struct_literal_multiple/frontend/bindings/main/OtherService.name.js b/v3/internal/parser/testdata/struct_literal_multiple/frontend/bindings/main/OtherService.name.js
index 2480d3249fc..8844c0c559a 100644
--- a/v3/internal/parser/testdata/struct_literal_multiple/frontend/bindings/main/OtherService.name.js
+++ b/v3/internal/parser/testdata/struct_literal_multiple/frontend/bindings/main/OtherService.name.js
@@ -2,11 +2,12 @@
 // Cynhyrchwyd y ffeil hon yn awtomatig. PEIDIWCH Â MODIWL
 // This file is automatically generated. DO NOT EDIT
 
+import {Call} from '@wailsio/runtime';
 
 /** 
  * @function Hello
  * @returns {Promise<void>}
  **/
 export async function Hello() {
-	return wails.CallByName("main.OtherService.Hello", ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByName("main.OtherService.Hello", ...Array.prototype.slice.call(arguments, 0));
 }
diff --git a/v3/internal/parser/testdata/struct_literal_multiple_files/frontend/bindings/main/GreetService.js b/v3/internal/parser/testdata/struct_literal_multiple_files/frontend/bindings/main/GreetService.js
index 9dcfc2bb1d4..e105b2c6edb 100644
--- a/v3/internal/parser/testdata/struct_literal_multiple_files/frontend/bindings/main/GreetService.js
+++ b/v3/internal/parser/testdata/struct_literal_multiple_files/frontend/bindings/main/GreetService.js
@@ -2,6 +2,7 @@
 // Cynhyrchwyd y ffeil hon yn awtomatig. PEIDIWCH Â MODIWL
 // This file is automatically generated. DO NOT EDIT
 
+import {Call} from '@wailsio/runtime';
 
 /** 
  * @function Greet
@@ -9,5 +10,5 @@
  * @returns {Promise<string>}
  **/
 export async function Greet(name) {
-	return wails.CallByID(1411160069, ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByID(1411160069, ...Array.prototype.slice.call(arguments, 0));
 }
diff --git a/v3/internal/parser/testdata/struct_literal_multiple_files/frontend/bindings/main/GreetService.name.js b/v3/internal/parser/testdata/struct_literal_multiple_files/frontend/bindings/main/GreetService.name.js
index 2019a460491..e6ca9f6d440 100644
--- a/v3/internal/parser/testdata/struct_literal_multiple_files/frontend/bindings/main/GreetService.name.js
+++ b/v3/internal/parser/testdata/struct_literal_multiple_files/frontend/bindings/main/GreetService.name.js
@@ -2,6 +2,7 @@
 // Cynhyrchwyd y ffeil hon yn awtomatig. PEIDIWCH Â MODIWL
 // This file is automatically generated. DO NOT EDIT
 
+import {Call} from '@wailsio/runtime';
 
 /** 
  * @function Greet
@@ -9,5 +10,5 @@
  * @returns {Promise<string>}
  **/
 export async function Greet(name) {
-	return wails.CallByName("main.GreetService.Greet", ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByName("main.GreetService.Greet", ...Array.prototype.slice.call(arguments, 0));
 }
diff --git a/v3/internal/parser/testdata/struct_literal_multiple_files/frontend/bindings/main/GreetService.name.ts b/v3/internal/parser/testdata/struct_literal_multiple_files/frontend/bindings/main/GreetService.name.ts
index e256210d3d3..e4b770fe876 100644
--- a/v3/internal/parser/testdata/struct_literal_multiple_files/frontend/bindings/main/GreetService.name.ts
+++ b/v3/internal/parser/testdata/struct_literal_multiple_files/frontend/bindings/main/GreetService.name.ts
@@ -1,7 +1,8 @@
 // Cynhyrchwyd y ffeil hon yn awtomatig. PEIDIWCH Â MODIWL
 // This file is automatically generated. DO NOT EDIT
 
+import {Call} from '@wailsio/runtime';
 export async function Greet(name: string) : Promise<string> {
-	return wails.CallByName("main.GreetService.Greet", name);
+	return Call.ByName("main.GreetService.Greet", name);
 }
 
diff --git a/v3/internal/parser/testdata/struct_literal_multiple_files/frontend/bindings/main/GreetService.ts b/v3/internal/parser/testdata/struct_literal_multiple_files/frontend/bindings/main/GreetService.ts
index 9b05eb4543b..4622844335f 100644
--- a/v3/internal/parser/testdata/struct_literal_multiple_files/frontend/bindings/main/GreetService.ts
+++ b/v3/internal/parser/testdata/struct_literal_multiple_files/frontend/bindings/main/GreetService.ts
@@ -1,7 +1,8 @@
 // Cynhyrchwyd y ffeil hon yn awtomatig. PEIDIWCH Â MODIWL
 // This file is automatically generated. DO NOT EDIT
 
+import {Call} from '@wailsio/runtime';
 export async function Greet(name: string) : Promise<string> {
-	return wails.CallByID(1411160069, name);
+	return Call.ByID(1411160069, name);
 }
 
diff --git a/v3/internal/parser/testdata/struct_literal_multiple_files/frontend/bindings/main/OtherService.js b/v3/internal/parser/testdata/struct_literal_multiple_files/frontend/bindings/main/OtherService.js
index b01c4e5727e..fcbe321c92c 100644
--- a/v3/internal/parser/testdata/struct_literal_multiple_files/frontend/bindings/main/OtherService.js
+++ b/v3/internal/parser/testdata/struct_literal_multiple_files/frontend/bindings/main/OtherService.js
@@ -2,11 +2,12 @@
 // Cynhyrchwyd y ffeil hon yn awtomatig. PEIDIWCH Â MODIWL
 // This file is automatically generated. DO NOT EDIT
 
+import {Call} from '@wailsio/runtime';
 
 /** 
  * @function Hello
  * @returns {Promise<void>}
  **/
 export async function Hello() {
-	return wails.CallByID(4249972365, ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByID(4249972365, ...Array.prototype.slice.call(arguments, 0));
 }
diff --git a/v3/internal/parser/testdata/struct_literal_multiple_files/frontend/bindings/main/OtherService.name.js b/v3/internal/parser/testdata/struct_literal_multiple_files/frontend/bindings/main/OtherService.name.js
index 2480d3249fc..8844c0c559a 100644
--- a/v3/internal/parser/testdata/struct_literal_multiple_files/frontend/bindings/main/OtherService.name.js
+++ b/v3/internal/parser/testdata/struct_literal_multiple_files/frontend/bindings/main/OtherService.name.js
@@ -2,11 +2,12 @@
 // Cynhyrchwyd y ffeil hon yn awtomatig. PEIDIWCH Â MODIWL
 // This file is automatically generated. DO NOT EDIT
 
+import {Call} from '@wailsio/runtime';
 
 /** 
  * @function Hello
  * @returns {Promise<void>}
  **/
 export async function Hello() {
-	return wails.CallByName("main.OtherService.Hello", ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByName("main.OtherService.Hello", ...Array.prototype.slice.call(arguments, 0));
 }
diff --git a/v3/internal/parser/testdata/struct_literal_multiple_files/frontend/bindings/main/OtherService.name.ts b/v3/internal/parser/testdata/struct_literal_multiple_files/frontend/bindings/main/OtherService.name.ts
index 3d20ab2657b..c336f0a7fa3 100644
--- a/v3/internal/parser/testdata/struct_literal_multiple_files/frontend/bindings/main/OtherService.name.ts
+++ b/v3/internal/parser/testdata/struct_literal_multiple_files/frontend/bindings/main/OtherService.name.ts
@@ -1,7 +1,8 @@
 // Cynhyrchwyd y ffeil hon yn awtomatig. PEIDIWCH Â MODIWL
 // This file is automatically generated. DO NOT EDIT
 
+import {Call} from '@wailsio/runtime';
 export async function Hello() : Promise<void> {
-	return wails.CallByName("main.OtherService.Hello");
+	return Call.ByName("main.OtherService.Hello");
 }
 
diff --git a/v3/internal/parser/testdata/struct_literal_multiple_files/frontend/bindings/main/OtherService.ts b/v3/internal/parser/testdata/struct_literal_multiple_files/frontend/bindings/main/OtherService.ts
index 211c351a629..b2edab58af3 100644
--- a/v3/internal/parser/testdata/struct_literal_multiple_files/frontend/bindings/main/OtherService.ts
+++ b/v3/internal/parser/testdata/struct_literal_multiple_files/frontend/bindings/main/OtherService.ts
@@ -1,7 +1,8 @@
 // Cynhyrchwyd y ffeil hon yn awtomatig. PEIDIWCH Â MODIWL
 // This file is automatically generated. DO NOT EDIT
 
+import {Call} from '@wailsio/runtime';
 export async function Hello() : Promise<void> {
-	return wails.CallByID(4249972365);
+	return Call.ByID(4249972365);
 }
 
diff --git a/v3/internal/parser/testdata/struct_literal_multiple_other/frontend/bindings/main/GreetService.js b/v3/internal/parser/testdata/struct_literal_multiple_other/frontend/bindings/main/GreetService.js
index dee2ada333a..7d9510b20ed 100644
--- a/v3/internal/parser/testdata/struct_literal_multiple_other/frontend/bindings/main/GreetService.js
+++ b/v3/internal/parser/testdata/struct_literal_multiple_other/frontend/bindings/main/GreetService.js
@@ -2,6 +2,7 @@
 // Cynhyrchwyd y ffeil hon yn awtomatig. PEIDIWCH Â MODIWL
 // This file is automatically generated. DO NOT EDIT
 
+import {Call} from '@wailsio/runtime';
 /**
  * @typedef {import('./models').Person} Person
  */
@@ -13,7 +14,7 @@
  * @returns {Promise<string>}
  **/
 export async function Greet(name) {
-	return wails.CallByID(1411160069, ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByID(1411160069, ...Array.prototype.slice.call(arguments, 0));
 }
 
 /**
@@ -23,5 +24,5 @@ export async function Greet(name) {
  * @returns {Promise<Person>}
  **/
 export async function NewPerson(name) {
-	return wails.CallByID(1661412647, ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByID(1661412647, ...Array.prototype.slice.call(arguments, 0));
 }
diff --git a/v3/internal/parser/testdata/struct_literal_multiple_other/frontend/bindings/main/GreetService.name.js b/v3/internal/parser/testdata/struct_literal_multiple_other/frontend/bindings/main/GreetService.name.js
index 9c4f2666956..38558e41c9c 100644
--- a/v3/internal/parser/testdata/struct_literal_multiple_other/frontend/bindings/main/GreetService.name.js
+++ b/v3/internal/parser/testdata/struct_literal_multiple_other/frontend/bindings/main/GreetService.name.js
@@ -2,6 +2,7 @@
 // Cynhyrchwyd y ffeil hon yn awtomatig. PEIDIWCH Â MODIWL
 // This file is automatically generated. DO NOT EDIT
 
+import {Call} from '@wailsio/runtime';
 /**
  * @typedef {import('./models').Person} Person
  */
@@ -13,7 +14,7 @@
  * @returns {Promise<string>}
  **/
 export async function Greet(name) {
-	return wails.CallByName("main.GreetService.Greet", ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByName("main.GreetService.Greet", ...Array.prototype.slice.call(arguments, 0));
 }
 
 /**
@@ -23,5 +24,5 @@ export async function Greet(name) {
  * @returns {Promise<Person>}
  **/
 export async function NewPerson(name) {
-	return wails.CallByName("main.GreetService.NewPerson", ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByName("main.GreetService.NewPerson", ...Array.prototype.slice.call(arguments, 0));
 }
diff --git a/v3/internal/parser/testdata/struct_literal_multiple_other/frontend/bindings/main/GreetService.name.ts b/v3/internal/parser/testdata/struct_literal_multiple_other/frontend/bindings/main/GreetService.name.ts
index e7cc3292f38..b5753395d13 100644
--- a/v3/internal/parser/testdata/struct_literal_multiple_other/frontend/bindings/main/GreetService.name.ts
+++ b/v3/internal/parser/testdata/struct_literal_multiple_other/frontend/bindings/main/GreetService.name.ts
@@ -1,15 +1,16 @@
 // Cynhyrchwyd y ffeil hon yn awtomatig. PEIDIWCH Â MODIWL
 // This file is automatically generated. DO NOT EDIT
 
+import {Call} from '@wailsio/runtime';
 import {Person} from './models';
 
 // Greet does XYZ
 export async function Greet(name: string) : Promise<string> {
-	return wails.CallByName("main.GreetService.Greet", name);
+	return Call.ByName("main.GreetService.Greet", name);
 }
 
 // NewPerson creates a new person
 export async function NewPerson(name: string) : Promise<Person> {
-	return wails.CallByName("main.GreetService.NewPerson", name);
+	return Call.ByName("main.GreetService.NewPerson", name);
 }
 
diff --git a/v3/internal/parser/testdata/struct_literal_multiple_other/frontend/bindings/main/GreetService.ts b/v3/internal/parser/testdata/struct_literal_multiple_other/frontend/bindings/main/GreetService.ts
index a66bf118b64..0b2c57590b6 100644
--- a/v3/internal/parser/testdata/struct_literal_multiple_other/frontend/bindings/main/GreetService.ts
+++ b/v3/internal/parser/testdata/struct_literal_multiple_other/frontend/bindings/main/GreetService.ts
@@ -1,15 +1,16 @@
 // Cynhyrchwyd y ffeil hon yn awtomatig. PEIDIWCH Â MODIWL
 // This file is automatically generated. DO NOT EDIT
 
+import {Call} from '@wailsio/runtime';
 import {Person} from './models';
 
 // Greet does XYZ
 export async function Greet(name: string) : Promise<string> {
-	return wails.CallByID(1411160069, name);
+	return Call.ByID(1411160069, name);
 }
 
 // NewPerson creates a new person
 export async function NewPerson(name: string) : Promise<Person> {
-	return wails.CallByID(1661412647, name);
+	return Call.ByID(1661412647, name);
 }
 
diff --git a/v3/internal/parser/testdata/struct_literal_multiple_other/frontend/bindings/services/OtherService.js b/v3/internal/parser/testdata/struct_literal_multiple_other/frontend/bindings/services/OtherService.js
index a6b67d2ae99..5634540378b 100644
--- a/v3/internal/parser/testdata/struct_literal_multiple_other/frontend/bindings/services/OtherService.js
+++ b/v3/internal/parser/testdata/struct_literal_multiple_other/frontend/bindings/services/OtherService.js
@@ -2,6 +2,7 @@
 // Cynhyrchwyd y ffeil hon yn awtomatig. PEIDIWCH Â MODIWL
 // This file is automatically generated. DO NOT EDIT
 
+import {Call} from '@wailsio/runtime';
 /**
  * @typedef {import('./models').Address} Address
  */
@@ -12,5 +13,5 @@
  * @returns {Promise<Address>}
  **/
 export async function Yay() {
-	return wails.CallByID(469445984, ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByID(469445984, ...Array.prototype.slice.call(arguments, 0));
 }
diff --git a/v3/internal/parser/testdata/struct_literal_multiple_other/frontend/bindings/services/OtherService.name.js b/v3/internal/parser/testdata/struct_literal_multiple_other/frontend/bindings/services/OtherService.name.js
index f6af59d6ede..4d3d71c5b4a 100644
--- a/v3/internal/parser/testdata/struct_literal_multiple_other/frontend/bindings/services/OtherService.name.js
+++ b/v3/internal/parser/testdata/struct_literal_multiple_other/frontend/bindings/services/OtherService.name.js
@@ -2,6 +2,7 @@
 // Cynhyrchwyd y ffeil hon yn awtomatig. PEIDIWCH Â MODIWL
 // This file is automatically generated. DO NOT EDIT
 
+import {Call} from '@wailsio/runtime';
 /**
  * @typedef {import('./models').Address} Address
  */
@@ -12,5 +13,5 @@
  * @returns {Promise<Address>}
  **/
 export async function Yay() {
-	return wails.CallByName("services.OtherService.Yay", ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByName("services.OtherService.Yay", ...Array.prototype.slice.call(arguments, 0));
 }
diff --git a/v3/internal/parser/testdata/struct_literal_multiple_other/frontend/bindings/services/OtherService.name.ts b/v3/internal/parser/testdata/struct_literal_multiple_other/frontend/bindings/services/OtherService.name.ts
index bc71aefc828..44612231689 100644
--- a/v3/internal/parser/testdata/struct_literal_multiple_other/frontend/bindings/services/OtherService.name.ts
+++ b/v3/internal/parser/testdata/struct_literal_multiple_other/frontend/bindings/services/OtherService.name.ts
@@ -1,10 +1,11 @@
 // Cynhyrchwyd y ffeil hon yn awtomatig. PEIDIWCH Â MODIWL
 // This file is automatically generated. DO NOT EDIT
 
+import {Call} from '@wailsio/runtime';
 import {Address} from './models';
 
 // Yay does this and that
 export async function Yay() : Promise<Address> {
-	return wails.CallByName("services.OtherService.Yay");
+	return Call.ByName("services.OtherService.Yay");
 }
 
diff --git a/v3/internal/parser/testdata/struct_literal_multiple_other/frontend/bindings/services/OtherService.ts b/v3/internal/parser/testdata/struct_literal_multiple_other/frontend/bindings/services/OtherService.ts
index fc36f869178..ba53fc1b10a 100644
--- a/v3/internal/parser/testdata/struct_literal_multiple_other/frontend/bindings/services/OtherService.ts
+++ b/v3/internal/parser/testdata/struct_literal_multiple_other/frontend/bindings/services/OtherService.ts
@@ -1,10 +1,11 @@
 // Cynhyrchwyd y ffeil hon yn awtomatig. PEIDIWCH Â MODIWL
 // This file is automatically generated. DO NOT EDIT
 
+import {Call} from '@wailsio/runtime';
 import {Address} from './models';
 
 // Yay does this and that
 export async function Yay() : Promise<Address> {
-	return wails.CallByID(469445984);
+	return Call.ByID(469445984);
 }
 
diff --git a/v3/internal/parser/testdata/struct_literal_non_pointer_single/frontend/bindings/main/GreetService.js b/v3/internal/parser/testdata/struct_literal_non_pointer_single/frontend/bindings/main/GreetService.js
index 6f884468ea8..66d3c141559 100644
--- a/v3/internal/parser/testdata/struct_literal_non_pointer_single/frontend/bindings/main/GreetService.js
+++ b/v3/internal/parser/testdata/struct_literal_non_pointer_single/frontend/bindings/main/GreetService.js
@@ -2,6 +2,7 @@
 // Cynhyrchwyd y ffeil hon yn awtomatig. PEIDIWCH Â MODIWL
 // This file is automatically generated. DO NOT EDIT
 
+import {Call} from '@wailsio/runtime';
 /**
  * @typedef {import('./models').Person} Person
  */
@@ -12,7 +13,7 @@
  * @returns {Promise<void>}
  **/
 export async function ArrayInt(_in) {
-	return wails.CallByID(3862002418, ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByID(3862002418, ...Array.prototype.slice.call(arguments, 0));
 }
 
 /** 
@@ -21,7 +22,7 @@ export async function ArrayInt(_in) {
  * @returns {Promise<boolean>}
  **/
 export async function BoolInBoolOut(_in) {
-	return wails.CallByID(2424639793, ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByID(2424639793, ...Array.prototype.slice.call(arguments, 0));
 }
 
 /** 
@@ -30,7 +31,7 @@ export async function BoolInBoolOut(_in) {
  * @returns {Promise<number>}
  **/
 export async function Float32InFloat32Out(_in) {
-	return wails.CallByID(3132595881, ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByID(3132595881, ...Array.prototype.slice.call(arguments, 0));
 }
 
 /** 
@@ -39,7 +40,7 @@ export async function Float32InFloat32Out(_in) {
  * @returns {Promise<number>}
  **/
 export async function Float64InFloat64Out(_in) {
-	return wails.CallByID(2182412247, ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByID(2182412247, ...Array.prototype.slice.call(arguments, 0));
 }
 
 /**
@@ -49,7 +50,7 @@ export async function Float64InFloat64Out(_in) {
  * @returns {Promise<string>}
  **/
 export async function Greet(name) {
-	return wails.CallByID(1411160069, ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByID(1411160069, ...Array.prototype.slice.call(arguments, 0));
 }
 
 /** 
@@ -58,7 +59,7 @@ export async function Greet(name) {
  * @returns {Promise<number>}
  **/
 export async function Int16InIntOut(_in) {
-	return wails.CallByID(3306292566, ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByID(3306292566, ...Array.prototype.slice.call(arguments, 0));
 }
 
 /** 
@@ -67,7 +68,7 @@ export async function Int16InIntOut(_in) {
  * @returns {Promise<number | null>}
  **/
 export async function Int16PointerInAndOutput(_in) {
-	return wails.CallByID(1754277916, ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByID(1754277916, ...Array.prototype.slice.call(arguments, 0));
 }
 
 /** 
@@ -76,7 +77,7 @@ export async function Int16PointerInAndOutput(_in) {
  * @returns {Promise<number>}
  **/
 export async function Int32InIntOut(_in) {
-	return wails.CallByID(1909469092, ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByID(1909469092, ...Array.prototype.slice.call(arguments, 0));
 }
 
 /** 
@@ -85,7 +86,7 @@ export async function Int32InIntOut(_in) {
  * @returns {Promise<number | null>}
  **/
 export async function Int32PointerInAndOutput(_in) {
-	return wails.CallByID(4251088558, ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByID(4251088558, ...Array.prototype.slice.call(arguments, 0));
 }
 
 /** 
@@ -94,7 +95,7 @@ export async function Int32PointerInAndOutput(_in) {
  * @returns {Promise<number>}
  **/
 export async function Int64InIntOut(_in) {
-	return wails.CallByID(1343888303, ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByID(1343888303, ...Array.prototype.slice.call(arguments, 0));
 }
 
 /** 
@@ -103,7 +104,7 @@ export async function Int64InIntOut(_in) {
  * @returns {Promise<number | null>}
  **/
 export async function Int64PointerInAndOutput(_in) {
-	return wails.CallByID(2205561041, ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByID(2205561041, ...Array.prototype.slice.call(arguments, 0));
 }
 
 /** 
@@ -112,7 +113,7 @@ export async function Int64PointerInAndOutput(_in) {
  * @returns {Promise<number>}
  **/
 export async function Int8InIntOut(_in) {
-	return wails.CallByID(572240879, ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByID(572240879, ...Array.prototype.slice.call(arguments, 0));
 }
 
 /** 
@@ -121,7 +122,7 @@ export async function Int8InIntOut(_in) {
  * @returns {Promise<number | null>}
  **/
 export async function Int8PointerInAndOutput(_in) {
-	return wails.CallByID(2189402897, ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByID(2189402897, ...Array.prototype.slice.call(arguments, 0));
 }
 
 /** 
@@ -130,7 +131,7 @@ export async function Int8PointerInAndOutput(_in) {
  * @returns {Promise<number>}
  **/
 export async function IntInIntOut(_in) {
-	return wails.CallByID(642881729, ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByID(642881729, ...Array.prototype.slice.call(arguments, 0));
 }
 
 /** 
@@ -139,7 +140,7 @@ export async function IntInIntOut(_in) {
  * @returns {Promise<number | null>}
  **/
 export async function IntPointerInAndOutput(_in) {
-	return wails.CallByID(1066151743, ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByID(1066151743, ...Array.prototype.slice.call(arguments, 0));
 }
 
 /** 
@@ -148,7 +149,7 @@ export async function IntPointerInAndOutput(_in) {
  * @returns {Promise<number | null, void>}
  **/
 export async function IntPointerInputNamedOutputs(_in) {
-	return wails.CallByID(2718999663, ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByID(2718999663, ...Array.prototype.slice.call(arguments, 0));
 }
 
 /** 
@@ -157,7 +158,7 @@ export async function IntPointerInputNamedOutputs(_in) {
  * @returns {Promise<void>}
  **/
 export async function MapIntInt(_in) {
-	return wails.CallByID(2386486356, ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByID(2386486356, ...Array.prototype.slice.call(arguments, 0));
 }
 
 /** 
@@ -166,7 +167,7 @@ export async function MapIntInt(_in) {
  * @returns {Promise<void>}
  **/
 export async function MapIntPointerInt(_in) {
-	return wails.CallByID(550413585, ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByID(550413585, ...Array.prototype.slice.call(arguments, 0));
 }
 
 /** 
@@ -175,7 +176,7 @@ export async function MapIntPointerInt(_in) {
  * @returns {Promise<void>}
  **/
 export async function MapIntSliceInt(_in) {
-	return wails.CallByID(2900172572, ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByID(2900172572, ...Array.prototype.slice.call(arguments, 0));
 }
 
 /** 
@@ -184,7 +185,7 @@ export async function MapIntSliceInt(_in) {
  * @returns {Promise<map>}
  **/
 export async function MapIntSliceIntInMapIntSliceIntOut(_in) {
-	return wails.CallByID(881980169, ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByID(881980169, ...Array.prototype.slice.call(arguments, 0));
 }
 
 /** 
@@ -192,7 +193,7 @@ export async function MapIntSliceIntInMapIntSliceIntOut(_in) {
  * @returns {Promise<string>}
  **/
 export async function NoInputsStringOut() {
-	return wails.CallByID(1075577233, ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByID(1075577233, ...Array.prototype.slice.call(arguments, 0));
 }
 
 /** 
@@ -201,7 +202,7 @@ export async function NoInputsStringOut() {
  * @returns {Promise<boolean | null>}
  **/
 export async function PointerBoolInBoolOut(_in) {
-	return wails.CallByID(3589606958, ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByID(3589606958, ...Array.prototype.slice.call(arguments, 0));
 }
 
 /** 
@@ -210,7 +211,7 @@ export async function PointerBoolInBoolOut(_in) {
  * @returns {Promise<number | null>}
  **/
 export async function PointerFloat32InFloat32Out(_in) {
-	return wails.CallByID(224675106, ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByID(224675106, ...Array.prototype.slice.call(arguments, 0));
 }
 
 /** 
@@ -219,7 +220,7 @@ export async function PointerFloat32InFloat32Out(_in) {
  * @returns {Promise<number | null>}
  **/
 export async function PointerFloat64InFloat64Out(_in) {
-	return wails.CallByID(2124953624, ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByID(2124953624, ...Array.prototype.slice.call(arguments, 0));
 }
 
 /** 
@@ -228,7 +229,7 @@ export async function PointerFloat64InFloat64Out(_in) {
  * @returns {Promise<void>}
  **/
 export async function PointerMapIntInt(_in) {
-	return wails.CallByID(3516977899, ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByID(3516977899, ...Array.prototype.slice.call(arguments, 0));
 }
 
 /** 
@@ -237,7 +238,7 @@ export async function PointerMapIntInt(_in) {
  * @returns {Promise<string | null>}
  **/
 export async function PointerStringInStringOut(_in) {
-	return wails.CallByID(229603958, ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByID(229603958, ...Array.prototype.slice.call(arguments, 0));
 }
 
 /** 
@@ -246,7 +247,7 @@ export async function PointerStringInStringOut(_in) {
  * @returns {Promise<string[]>}
  **/
 export async function StringArrayInputNamedOutput(_in) {
-	return wails.CallByID(3678582682, ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByID(3678582682, ...Array.prototype.slice.call(arguments, 0));
 }
 
 /** 
@@ -255,7 +256,7 @@ export async function StringArrayInputNamedOutput(_in) {
  * @returns {Promise<string[], void>}
  **/
 export async function StringArrayInputNamedOutputs(_in) {
-	return wails.CallByID(319259595, ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByID(319259595, ...Array.prototype.slice.call(arguments, 0));
 }
 
 /** 
@@ -264,7 +265,7 @@ export async function StringArrayInputNamedOutputs(_in) {
  * @returns {Promise<string[]>}
  **/
 export async function StringArrayInputStringArrayOut(_in) {
-	return wails.CallByID(383995060, ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByID(383995060, ...Array.prototype.slice.call(arguments, 0));
 }
 
 /** 
@@ -273,7 +274,7 @@ export async function StringArrayInputStringArrayOut(_in) {
  * @returns {Promise<string>}
  **/
 export async function StringArrayInputStringOut(_in) {
-	return wails.CallByID(1091960237, ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByID(1091960237, ...Array.prototype.slice.call(arguments, 0));
 }
 
 /** 
@@ -282,7 +283,7 @@ export async function StringArrayInputStringOut(_in) {
  * @returns {Promise<Person>}
  **/
 export async function StructInputStructOutput(_in) {
-	return wails.CallByID(3835643147, ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByID(3835643147, ...Array.prototype.slice.call(arguments, 0));
 }
 
 /** 
@@ -291,7 +292,7 @@ export async function StructInputStructOutput(_in) {
  * @returns {Promise<void>}
  **/
 export async function StructPointerInputErrorOutput(_in) {
-	return wails.CallByID(2447692557, ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByID(2447692557, ...Array.prototype.slice.call(arguments, 0));
 }
 
 /** 
@@ -300,7 +301,7 @@ export async function StructPointerInputErrorOutput(_in) {
  * @returns {Promise<Person>}
  **/
 export async function StructPointerInputStructPointerOutput(_in) {
-	return wails.CallByID(2943477349, ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByID(2943477349, ...Array.prototype.slice.call(arguments, 0));
 }
 
 /** 
@@ -309,7 +310,7 @@ export async function StructPointerInputStructPointerOutput(_in) {
  * @returns {Promise<number>}
  **/
 export async function UInt16InUIntOut(_in) {
-	return wails.CallByID(3401034892, ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByID(3401034892, ...Array.prototype.slice.call(arguments, 0));
 }
 
 /** 
@@ -318,7 +319,7 @@ export async function UInt16InUIntOut(_in) {
  * @returns {Promise<number | null>}
  **/
 export async function UInt16PointerInAndOutput(_in) {
-	return wails.CallByID(1236957573, ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByID(1236957573, ...Array.prototype.slice.call(arguments, 0));
 }
 
 /** 
@@ -327,7 +328,7 @@ export async function UInt16PointerInAndOutput(_in) {
  * @returns {Promise<number>}
  **/
 export async function UInt32InUIntOut(_in) {
-	return wails.CallByID(1160383782, ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByID(1160383782, ...Array.prototype.slice.call(arguments, 0));
 }
 
 /** 
@@ -336,7 +337,7 @@ export async function UInt32InUIntOut(_in) {
  * @returns {Promise<number | null>}
  **/
 export async function UInt32PointerInAndOutput(_in) {
-	return wails.CallByID(1739300671, ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByID(1739300671, ...Array.prototype.slice.call(arguments, 0));
 }
 
 /** 
@@ -345,7 +346,7 @@ export async function UInt32PointerInAndOutput(_in) {
  * @returns {Promise<number>}
  **/
 export async function UInt64InUIntOut(_in) {
-	return wails.CallByID(793803239, ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByID(793803239, ...Array.prototype.slice.call(arguments, 0));
 }
 
 /** 
@@ -354,7 +355,7 @@ export async function UInt64InUIntOut(_in) {
  * @returns {Promise<number | null>}
  **/
 export async function UInt64PointerInAndOutput(_in) {
-	return wails.CallByID(1403757716, ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByID(1403757716, ...Array.prototype.slice.call(arguments, 0));
 }
 
 /** 
@@ -363,7 +364,7 @@ export async function UInt64PointerInAndOutput(_in) {
  * @returns {Promise<number>}
  **/
 export async function UInt8InUIntOut(_in) {
-	return wails.CallByID(2988345717, ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByID(2988345717, ...Array.prototype.slice.call(arguments, 0));
 }
 
 /** 
@@ -372,7 +373,7 @@ export async function UInt8InUIntOut(_in) {
  * @returns {Promise<number | null>}
  **/
 export async function UInt8PointerInAndOutput(_in) {
-	return wails.CallByID(518250834, ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByID(518250834, ...Array.prototype.slice.call(arguments, 0));
 }
 
 /** 
@@ -381,7 +382,7 @@ export async function UInt8PointerInAndOutput(_in) {
  * @returns {Promise<number>}
  **/
 export async function UIntInUIntOut(_in) {
-	return wails.CallByID(2836661285, ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByID(2836661285, ...Array.prototype.slice.call(arguments, 0));
 }
 
 /** 
@@ -390,5 +391,5 @@ export async function UIntInUIntOut(_in) {
  * @returns {Promise<number | null>}
  **/
 export async function UIntPointerInAndOutput(_in) {
-	return wails.CallByID(1367187362, ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByID(1367187362, ...Array.prototype.slice.call(arguments, 0));
 }
diff --git a/v3/internal/parser/testdata/struct_literal_non_pointer_single/frontend/bindings/main/GreetService.name.js b/v3/internal/parser/testdata/struct_literal_non_pointer_single/frontend/bindings/main/GreetService.name.js
index ca80e283965..9982bea9a69 100644
--- a/v3/internal/parser/testdata/struct_literal_non_pointer_single/frontend/bindings/main/GreetService.name.js
+++ b/v3/internal/parser/testdata/struct_literal_non_pointer_single/frontend/bindings/main/GreetService.name.js
@@ -2,6 +2,7 @@
 // Cynhyrchwyd y ffeil hon yn awtomatig. PEIDIWCH Â MODIWL
 // This file is automatically generated. DO NOT EDIT
 
+import {Call} from '@wailsio/runtime';
 /**
  * @typedef {import('./models').Person} Person
  */
@@ -12,7 +13,7 @@
  * @returns {Promise<void>}
  **/
 export async function ArrayInt(_in) {
-	return wails.CallByName("main.GreetService.ArrayInt", ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByName("main.GreetService.ArrayInt", ...Array.prototype.slice.call(arguments, 0));
 }
 
 /** 
@@ -21,7 +22,7 @@ export async function ArrayInt(_in) {
  * @returns {Promise<boolean>}
  **/
 export async function BoolInBoolOut(_in) {
-	return wails.CallByName("main.GreetService.BoolInBoolOut", ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByName("main.GreetService.BoolInBoolOut", ...Array.prototype.slice.call(arguments, 0));
 }
 
 /** 
@@ -30,7 +31,7 @@ export async function BoolInBoolOut(_in) {
  * @returns {Promise<number>}
  **/
 export async function Float32InFloat32Out(_in) {
-	return wails.CallByName("main.GreetService.Float32InFloat32Out", ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByName("main.GreetService.Float32InFloat32Out", ...Array.prototype.slice.call(arguments, 0));
 }
 
 /** 
@@ -39,7 +40,7 @@ export async function Float32InFloat32Out(_in) {
  * @returns {Promise<number>}
  **/
 export async function Float64InFloat64Out(_in) {
-	return wails.CallByName("main.GreetService.Float64InFloat64Out", ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByName("main.GreetService.Float64InFloat64Out", ...Array.prototype.slice.call(arguments, 0));
 }
 
 /**
@@ -49,7 +50,7 @@ export async function Float64InFloat64Out(_in) {
  * @returns {Promise<string>}
  **/
 export async function Greet(name) {
-	return wails.CallByName("main.GreetService.Greet", ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByName("main.GreetService.Greet", ...Array.prototype.slice.call(arguments, 0));
 }
 
 /** 
@@ -58,7 +59,7 @@ export async function Greet(name) {
  * @returns {Promise<number>}
  **/
 export async function Int16InIntOut(_in) {
-	return wails.CallByName("main.GreetService.Int16InIntOut", ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByName("main.GreetService.Int16InIntOut", ...Array.prototype.slice.call(arguments, 0));
 }
 
 /** 
@@ -67,7 +68,7 @@ export async function Int16InIntOut(_in) {
  * @returns {Promise<number | null>}
  **/
 export async function Int16PointerInAndOutput(_in) {
-	return wails.CallByName("main.GreetService.Int16PointerInAndOutput", ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByName("main.GreetService.Int16PointerInAndOutput", ...Array.prototype.slice.call(arguments, 0));
 }
 
 /** 
@@ -76,7 +77,7 @@ export async function Int16PointerInAndOutput(_in) {
  * @returns {Promise<number>}
  **/
 export async function Int32InIntOut(_in) {
-	return wails.CallByName("main.GreetService.Int32InIntOut", ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByName("main.GreetService.Int32InIntOut", ...Array.prototype.slice.call(arguments, 0));
 }
 
 /** 
@@ -85,7 +86,7 @@ export async function Int32InIntOut(_in) {
  * @returns {Promise<number | null>}
  **/
 export async function Int32PointerInAndOutput(_in) {
-	return wails.CallByName("main.GreetService.Int32PointerInAndOutput", ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByName("main.GreetService.Int32PointerInAndOutput", ...Array.prototype.slice.call(arguments, 0));
 }
 
 /** 
@@ -94,7 +95,7 @@ export async function Int32PointerInAndOutput(_in) {
  * @returns {Promise<number>}
  **/
 export async function Int64InIntOut(_in) {
-	return wails.CallByName("main.GreetService.Int64InIntOut", ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByName("main.GreetService.Int64InIntOut", ...Array.prototype.slice.call(arguments, 0));
 }
 
 /** 
@@ -103,7 +104,7 @@ export async function Int64InIntOut(_in) {
  * @returns {Promise<number | null>}
  **/
 export async function Int64PointerInAndOutput(_in) {
-	return wails.CallByName("main.GreetService.Int64PointerInAndOutput", ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByName("main.GreetService.Int64PointerInAndOutput", ...Array.prototype.slice.call(arguments, 0));
 }
 
 /** 
@@ -112,7 +113,7 @@ export async function Int64PointerInAndOutput(_in) {
  * @returns {Promise<number>}
  **/
 export async function Int8InIntOut(_in) {
-	return wails.CallByName("main.GreetService.Int8InIntOut", ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByName("main.GreetService.Int8InIntOut", ...Array.prototype.slice.call(arguments, 0));
 }
 
 /** 
@@ -121,7 +122,7 @@ export async function Int8InIntOut(_in) {
  * @returns {Promise<number | null>}
  **/
 export async function Int8PointerInAndOutput(_in) {
-	return wails.CallByName("main.GreetService.Int8PointerInAndOutput", ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByName("main.GreetService.Int8PointerInAndOutput", ...Array.prototype.slice.call(arguments, 0));
 }
 
 /** 
@@ -130,7 +131,7 @@ export async function Int8PointerInAndOutput(_in) {
  * @returns {Promise<number>}
  **/
 export async function IntInIntOut(_in) {
-	return wails.CallByName("main.GreetService.IntInIntOut", ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByName("main.GreetService.IntInIntOut", ...Array.prototype.slice.call(arguments, 0));
 }
 
 /** 
@@ -139,7 +140,7 @@ export async function IntInIntOut(_in) {
  * @returns {Promise<number | null>}
  **/
 export async function IntPointerInAndOutput(_in) {
-	return wails.CallByName("main.GreetService.IntPointerInAndOutput", ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByName("main.GreetService.IntPointerInAndOutput", ...Array.prototype.slice.call(arguments, 0));
 }
 
 /** 
@@ -148,7 +149,7 @@ export async function IntPointerInAndOutput(_in) {
  * @returns {Promise<number | null, void>}
  **/
 export async function IntPointerInputNamedOutputs(_in) {
-	return wails.CallByName("main.GreetService.IntPointerInputNamedOutputs", ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByName("main.GreetService.IntPointerInputNamedOutputs", ...Array.prototype.slice.call(arguments, 0));
 }
 
 /** 
@@ -157,7 +158,7 @@ export async function IntPointerInputNamedOutputs(_in) {
  * @returns {Promise<void>}
  **/
 export async function MapIntInt(_in) {
-	return wails.CallByName("main.GreetService.MapIntInt", ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByName("main.GreetService.MapIntInt", ...Array.prototype.slice.call(arguments, 0));
 }
 
 /** 
@@ -166,7 +167,7 @@ export async function MapIntInt(_in) {
  * @returns {Promise<void>}
  **/
 export async function MapIntPointerInt(_in) {
-	return wails.CallByName("main.GreetService.MapIntPointerInt", ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByName("main.GreetService.MapIntPointerInt", ...Array.prototype.slice.call(arguments, 0));
 }
 
 /** 
@@ -175,7 +176,7 @@ export async function MapIntPointerInt(_in) {
  * @returns {Promise<void>}
  **/
 export async function MapIntSliceInt(_in) {
-	return wails.CallByName("main.GreetService.MapIntSliceInt", ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByName("main.GreetService.MapIntSliceInt", ...Array.prototype.slice.call(arguments, 0));
 }
 
 /** 
@@ -184,7 +185,7 @@ export async function MapIntSliceInt(_in) {
  * @returns {Promise<map>}
  **/
 export async function MapIntSliceIntInMapIntSliceIntOut(_in) {
-	return wails.CallByName("main.GreetService.MapIntSliceIntInMapIntSliceIntOut", ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByName("main.GreetService.MapIntSliceIntInMapIntSliceIntOut", ...Array.prototype.slice.call(arguments, 0));
 }
 
 /** 
@@ -192,7 +193,7 @@ export async function MapIntSliceIntInMapIntSliceIntOut(_in) {
  * @returns {Promise<string>}
  **/
 export async function NoInputsStringOut() {
-	return wails.CallByName("main.GreetService.NoInputsStringOut", ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByName("main.GreetService.NoInputsStringOut", ...Array.prototype.slice.call(arguments, 0));
 }
 
 /** 
@@ -201,7 +202,7 @@ export async function NoInputsStringOut() {
  * @returns {Promise<boolean | null>}
  **/
 export async function PointerBoolInBoolOut(_in) {
-	return wails.CallByName("main.GreetService.PointerBoolInBoolOut", ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByName("main.GreetService.PointerBoolInBoolOut", ...Array.prototype.slice.call(arguments, 0));
 }
 
 /** 
@@ -210,7 +211,7 @@ export async function PointerBoolInBoolOut(_in) {
  * @returns {Promise<number | null>}
  **/
 export async function PointerFloat32InFloat32Out(_in) {
-	return wails.CallByName("main.GreetService.PointerFloat32InFloat32Out", ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByName("main.GreetService.PointerFloat32InFloat32Out", ...Array.prototype.slice.call(arguments, 0));
 }
 
 /** 
@@ -219,7 +220,7 @@ export async function PointerFloat32InFloat32Out(_in) {
  * @returns {Promise<number | null>}
  **/
 export async function PointerFloat64InFloat64Out(_in) {
-	return wails.CallByName("main.GreetService.PointerFloat64InFloat64Out", ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByName("main.GreetService.PointerFloat64InFloat64Out", ...Array.prototype.slice.call(arguments, 0));
 }
 
 /** 
@@ -228,7 +229,7 @@ export async function PointerFloat64InFloat64Out(_in) {
  * @returns {Promise<void>}
  **/
 export async function PointerMapIntInt(_in) {
-	return wails.CallByName("main.GreetService.PointerMapIntInt", ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByName("main.GreetService.PointerMapIntInt", ...Array.prototype.slice.call(arguments, 0));
 }
 
 /** 
@@ -237,7 +238,7 @@ export async function PointerMapIntInt(_in) {
  * @returns {Promise<string | null>}
  **/
 export async function PointerStringInStringOut(_in) {
-	return wails.CallByName("main.GreetService.PointerStringInStringOut", ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByName("main.GreetService.PointerStringInStringOut", ...Array.prototype.slice.call(arguments, 0));
 }
 
 /** 
@@ -246,7 +247,7 @@ export async function PointerStringInStringOut(_in) {
  * @returns {Promise<string[]>}
  **/
 export async function StringArrayInputNamedOutput(_in) {
-	return wails.CallByName("main.GreetService.StringArrayInputNamedOutput", ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByName("main.GreetService.StringArrayInputNamedOutput", ...Array.prototype.slice.call(arguments, 0));
 }
 
 /** 
@@ -255,7 +256,7 @@ export async function StringArrayInputNamedOutput(_in) {
  * @returns {Promise<string[], void>}
  **/
 export async function StringArrayInputNamedOutputs(_in) {
-	return wails.CallByName("main.GreetService.StringArrayInputNamedOutputs", ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByName("main.GreetService.StringArrayInputNamedOutputs", ...Array.prototype.slice.call(arguments, 0));
 }
 
 /** 
@@ -264,7 +265,7 @@ export async function StringArrayInputNamedOutputs(_in) {
  * @returns {Promise<string[]>}
  **/
 export async function StringArrayInputStringArrayOut(_in) {
-	return wails.CallByName("main.GreetService.StringArrayInputStringArrayOut", ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByName("main.GreetService.StringArrayInputStringArrayOut", ...Array.prototype.slice.call(arguments, 0));
 }
 
 /** 
@@ -273,7 +274,7 @@ export async function StringArrayInputStringArrayOut(_in) {
  * @returns {Promise<string>}
  **/
 export async function StringArrayInputStringOut(_in) {
-	return wails.CallByName("main.GreetService.StringArrayInputStringOut", ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByName("main.GreetService.StringArrayInputStringOut", ...Array.prototype.slice.call(arguments, 0));
 }
 
 /** 
@@ -282,7 +283,7 @@ export async function StringArrayInputStringOut(_in) {
  * @returns {Promise<Person>}
  **/
 export async function StructInputStructOutput(_in) {
-	return wails.CallByName("main.GreetService.StructInputStructOutput", ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByName("main.GreetService.StructInputStructOutput", ...Array.prototype.slice.call(arguments, 0));
 }
 
 /** 
@@ -291,7 +292,7 @@ export async function StructInputStructOutput(_in) {
  * @returns {Promise<void>}
  **/
 export async function StructPointerInputErrorOutput(_in) {
-	return wails.CallByName("main.GreetService.StructPointerInputErrorOutput", ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByName("main.GreetService.StructPointerInputErrorOutput", ...Array.prototype.slice.call(arguments, 0));
 }
 
 /** 
@@ -300,7 +301,7 @@ export async function StructPointerInputErrorOutput(_in) {
  * @returns {Promise<Person>}
  **/
 export async function StructPointerInputStructPointerOutput(_in) {
-	return wails.CallByName("main.GreetService.StructPointerInputStructPointerOutput", ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByName("main.GreetService.StructPointerInputStructPointerOutput", ...Array.prototype.slice.call(arguments, 0));
 }
 
 /** 
@@ -309,7 +310,7 @@ export async function StructPointerInputStructPointerOutput(_in) {
  * @returns {Promise<number>}
  **/
 export async function UInt16InUIntOut(_in) {
-	return wails.CallByName("main.GreetService.UInt16InUIntOut", ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByName("main.GreetService.UInt16InUIntOut", ...Array.prototype.slice.call(arguments, 0));
 }
 
 /** 
@@ -318,7 +319,7 @@ export async function UInt16InUIntOut(_in) {
  * @returns {Promise<number | null>}
  **/
 export async function UInt16PointerInAndOutput(_in) {
-	return wails.CallByName("main.GreetService.UInt16PointerInAndOutput", ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByName("main.GreetService.UInt16PointerInAndOutput", ...Array.prototype.slice.call(arguments, 0));
 }
 
 /** 
@@ -327,7 +328,7 @@ export async function UInt16PointerInAndOutput(_in) {
  * @returns {Promise<number>}
  **/
 export async function UInt32InUIntOut(_in) {
-	return wails.CallByName("main.GreetService.UInt32InUIntOut", ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByName("main.GreetService.UInt32InUIntOut", ...Array.prototype.slice.call(arguments, 0));
 }
 
 /** 
@@ -336,7 +337,7 @@ export async function UInt32InUIntOut(_in) {
  * @returns {Promise<number | null>}
  **/
 export async function UInt32PointerInAndOutput(_in) {
-	return wails.CallByName("main.GreetService.UInt32PointerInAndOutput", ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByName("main.GreetService.UInt32PointerInAndOutput", ...Array.prototype.slice.call(arguments, 0));
 }
 
 /** 
@@ -345,7 +346,7 @@ export async function UInt32PointerInAndOutput(_in) {
  * @returns {Promise<number>}
  **/
 export async function UInt64InUIntOut(_in) {
-	return wails.CallByName("main.GreetService.UInt64InUIntOut", ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByName("main.GreetService.UInt64InUIntOut", ...Array.prototype.slice.call(arguments, 0));
 }
 
 /** 
@@ -354,7 +355,7 @@ export async function UInt64InUIntOut(_in) {
  * @returns {Promise<number | null>}
  **/
 export async function UInt64PointerInAndOutput(_in) {
-	return wails.CallByName("main.GreetService.UInt64PointerInAndOutput", ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByName("main.GreetService.UInt64PointerInAndOutput", ...Array.prototype.slice.call(arguments, 0));
 }
 
 /** 
@@ -363,7 +364,7 @@ export async function UInt64PointerInAndOutput(_in) {
  * @returns {Promise<number>}
  **/
 export async function UInt8InUIntOut(_in) {
-	return wails.CallByName("main.GreetService.UInt8InUIntOut", ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByName("main.GreetService.UInt8InUIntOut", ...Array.prototype.slice.call(arguments, 0));
 }
 
 /** 
@@ -372,7 +373,7 @@ export async function UInt8InUIntOut(_in) {
  * @returns {Promise<number | null>}
  **/
 export async function UInt8PointerInAndOutput(_in) {
-	return wails.CallByName("main.GreetService.UInt8PointerInAndOutput", ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByName("main.GreetService.UInt8PointerInAndOutput", ...Array.prototype.slice.call(arguments, 0));
 }
 
 /** 
@@ -381,7 +382,7 @@ export async function UInt8PointerInAndOutput(_in) {
  * @returns {Promise<number>}
  **/
 export async function UIntInUIntOut(_in) {
-	return wails.CallByName("main.GreetService.UIntInUIntOut", ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByName("main.GreetService.UIntInUIntOut", ...Array.prototype.slice.call(arguments, 0));
 }
 
 /** 
@@ -390,5 +391,5 @@ export async function UIntInUIntOut(_in) {
  * @returns {Promise<number | null>}
  **/
 export async function UIntPointerInAndOutput(_in) {
-	return wails.CallByName("main.GreetService.UIntPointerInAndOutput", ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByName("main.GreetService.UIntPointerInAndOutput", ...Array.prototype.slice.call(arguments, 0));
 }
diff --git a/v3/internal/parser/testdata/struct_literal_non_pointer_single/frontend/bindings/main/GreetService.name.ts b/v3/internal/parser/testdata/struct_literal_non_pointer_single/frontend/bindings/main/GreetService.name.ts
index 0c12fd6970c..b47c462c5a6 100644
--- a/v3/internal/parser/testdata/struct_literal_non_pointer_single/frontend/bindings/main/GreetService.name.ts
+++ b/v3/internal/parser/testdata/struct_literal_non_pointer_single/frontend/bindings/main/GreetService.name.ts
@@ -1,178 +1,179 @@
 // Cynhyrchwyd y ffeil hon yn awtomatig. PEIDIWCH Â MODIWL
 // This file is automatically generated. DO NOT EDIT
 
+import {Call} from '@wailsio/runtime';
 import {Person} from './models';
 
 export async function ArrayInt(_in: number[]) : Promise<void> {
-	return wails.CallByName("main.GreetService.ArrayInt", _in);
+	return Call.ByName("main.GreetService.ArrayInt", _in);
 }
 
 export async function BoolInBoolOut(_in: boolean) : Promise<boolean> {
-	return wails.CallByName("main.GreetService.BoolInBoolOut", _in);
+	return Call.ByName("main.GreetService.BoolInBoolOut", _in);
 }
 
 export async function Float32InFloat32Out(_in: number) : Promise<number> {
-	return wails.CallByName("main.GreetService.Float32InFloat32Out", _in);
+	return Call.ByName("main.GreetService.Float32InFloat32Out", _in);
 }
 
 export async function Float64InFloat64Out(_in: number) : Promise<number> {
-	return wails.CallByName("main.GreetService.Float64InFloat64Out", _in);
+	return Call.ByName("main.GreetService.Float64InFloat64Out", _in);
 }
 
 // Greet someone
 export async function Greet(name: string) : Promise<string> {
-	return wails.CallByName("main.GreetService.Greet", name);
+	return Call.ByName("main.GreetService.Greet", name);
 }
 
 export async function Int16InIntOut(_in: number) : Promise<number> {
-	return wails.CallByName("main.GreetService.Int16InIntOut", _in);
+	return Call.ByName("main.GreetService.Int16InIntOut", _in);
 }
 
 export async function Int16PointerInAndOutput(_in: number | null) : Promise<number | null> {
-	return wails.CallByName("main.GreetService.Int16PointerInAndOutput", _in);
+	return Call.ByName("main.GreetService.Int16PointerInAndOutput", _in);
 }
 
 export async function Int32InIntOut(_in: number) : Promise<number> {
-	return wails.CallByName("main.GreetService.Int32InIntOut", _in);
+	return Call.ByName("main.GreetService.Int32InIntOut", _in);
 }
 
 export async function Int32PointerInAndOutput(_in: number | null) : Promise<number | null> {
-	return wails.CallByName("main.GreetService.Int32PointerInAndOutput", _in);
+	return Call.ByName("main.GreetService.Int32PointerInAndOutput", _in);
 }
 
 export async function Int64InIntOut(_in: number) : Promise<number> {
-	return wails.CallByName("main.GreetService.Int64InIntOut", _in);
+	return Call.ByName("main.GreetService.Int64InIntOut", _in);
 }
 
 export async function Int64PointerInAndOutput(_in: number | null) : Promise<number | null> {
-	return wails.CallByName("main.GreetService.Int64PointerInAndOutput", _in);
+	return Call.ByName("main.GreetService.Int64PointerInAndOutput", _in);
 }
 
 export async function Int8InIntOut(_in: number) : Promise<number> {
-	return wails.CallByName("main.GreetService.Int8InIntOut", _in);
+	return Call.ByName("main.GreetService.Int8InIntOut", _in);
 }
 
 export async function Int8PointerInAndOutput(_in: number | null) : Promise<number | null> {
-	return wails.CallByName("main.GreetService.Int8PointerInAndOutput", _in);
+	return Call.ByName("main.GreetService.Int8PointerInAndOutput", _in);
 }
 
 export async function IntInIntOut(_in: number) : Promise<number> {
-	return wails.CallByName("main.GreetService.IntInIntOut", _in);
+	return Call.ByName("main.GreetService.IntInIntOut", _in);
 }
 
 export async function IntPointerInAndOutput(_in: number | null) : Promise<number | null> {
-	return wails.CallByName("main.GreetService.IntPointerInAndOutput", _in);
+	return Call.ByName("main.GreetService.IntPointerInAndOutput", _in);
 }
 
 export async function IntPointerInputNamedOutputs(_in: number | null) : Promise<number | null, void> {
-	return wails.CallByName("main.GreetService.IntPointerInputNamedOutputs", _in);
+	return Call.ByName("main.GreetService.IntPointerInputNamedOutputs", _in);
 }
 
 export async function MapIntInt(_in: map) : Promise<void> {
-	return wails.CallByName("main.GreetService.MapIntInt", _in);
+	return Call.ByName("main.GreetService.MapIntInt", _in);
 }
 
 export async function MapIntPointerInt(_in: map) : Promise<void> {
-	return wails.CallByName("main.GreetService.MapIntPointerInt", _in);
+	return Call.ByName("main.GreetService.MapIntPointerInt", _in);
 }
 
 export async function MapIntSliceInt(_in: map) : Promise<void> {
-	return wails.CallByName("main.GreetService.MapIntSliceInt", _in);
+	return Call.ByName("main.GreetService.MapIntSliceInt", _in);
 }
 
 export async function MapIntSliceIntInMapIntSliceIntOut(_in: map) : Promise<map> {
-	return wails.CallByName("main.GreetService.MapIntSliceIntInMapIntSliceIntOut", _in);
+	return Call.ByName("main.GreetService.MapIntSliceIntInMapIntSliceIntOut", _in);
 }
 
 export async function NoInputsStringOut() : Promise<string> {
-	return wails.CallByName("main.GreetService.NoInputsStringOut");
+	return Call.ByName("main.GreetService.NoInputsStringOut");
 }
 
 export async function PointerBoolInBoolOut(_in: boolean | null) : Promise<boolean | null> {
-	return wails.CallByName("main.GreetService.PointerBoolInBoolOut", _in);
+	return Call.ByName("main.GreetService.PointerBoolInBoolOut", _in);
 }
 
 export async function PointerFloat32InFloat32Out(_in: number | null) : Promise<number | null> {
-	return wails.CallByName("main.GreetService.PointerFloat32InFloat32Out", _in);
+	return Call.ByName("main.GreetService.PointerFloat32InFloat32Out", _in);
 }
 
 export async function PointerFloat64InFloat64Out(_in: number | null) : Promise<number | null> {
-	return wails.CallByName("main.GreetService.PointerFloat64InFloat64Out", _in);
+	return Call.ByName("main.GreetService.PointerFloat64InFloat64Out", _in);
 }
 
 export async function PointerMapIntInt(_in: map | null) : Promise<void> {
-	return wails.CallByName("main.GreetService.PointerMapIntInt", _in);
+	return Call.ByName("main.GreetService.PointerMapIntInt", _in);
 }
 
 export async function PointerStringInStringOut(_in: string | null) : Promise<string | null> {
-	return wails.CallByName("main.GreetService.PointerStringInStringOut", _in);
+	return Call.ByName("main.GreetService.PointerStringInStringOut", _in);
 }
 
 export async function StringArrayInputNamedOutput(_in: string[]) : Promise<string[]> {
-	return wails.CallByName("main.GreetService.StringArrayInputNamedOutput", _in);
+	return Call.ByName("main.GreetService.StringArrayInputNamedOutput", _in);
 }
 
 export async function StringArrayInputNamedOutputs(_in: string[]) : Promise<string[], void> {
-	return wails.CallByName("main.GreetService.StringArrayInputNamedOutputs", _in);
+	return Call.ByName("main.GreetService.StringArrayInputNamedOutputs", _in);
 }
 
 export async function StringArrayInputStringArrayOut(_in: string[]) : Promise<string[]> {
-	return wails.CallByName("main.GreetService.StringArrayInputStringArrayOut", _in);
+	return Call.ByName("main.GreetService.StringArrayInputStringArrayOut", _in);
 }
 
 export async function StringArrayInputStringOut(_in: string[]) : Promise<string> {
-	return wails.CallByName("main.GreetService.StringArrayInputStringOut", _in);
+	return Call.ByName("main.GreetService.StringArrayInputStringOut", _in);
 }
 
 export async function StructInputStructOutput(_in: Person) : Promise<Person> {
-	return wails.CallByName("main.GreetService.StructInputStructOutput", _in);
+	return Call.ByName("main.GreetService.StructInputStructOutput", _in);
 }
 
 export async function StructPointerInputErrorOutput(_in: Person | null) : Promise<void> {
-	return wails.CallByName("main.GreetService.StructPointerInputErrorOutput", _in);
+	return Call.ByName("main.GreetService.StructPointerInputErrorOutput", _in);
 }
 
 export async function StructPointerInputStructPointerOutput(_in: Person | null) : Promise<Person> {
-	return wails.CallByName("main.GreetService.StructPointerInputStructPointerOutput", _in);
+	return Call.ByName("main.GreetService.StructPointerInputStructPointerOutput", _in);
 }
 
 export async function UInt16InUIntOut(_in: number) : Promise<number> {
-	return wails.CallByName("main.GreetService.UInt16InUIntOut", _in);
+	return Call.ByName("main.GreetService.UInt16InUIntOut", _in);
 }
 
 export async function UInt16PointerInAndOutput(_in: number | null) : Promise<number | null> {
-	return wails.CallByName("main.GreetService.UInt16PointerInAndOutput", _in);
+	return Call.ByName("main.GreetService.UInt16PointerInAndOutput", _in);
 }
 
 export async function UInt32InUIntOut(_in: number) : Promise<number> {
-	return wails.CallByName("main.GreetService.UInt32InUIntOut", _in);
+	return Call.ByName("main.GreetService.UInt32InUIntOut", _in);
 }
 
 export async function UInt32PointerInAndOutput(_in: number | null) : Promise<number | null> {
-	return wails.CallByName("main.GreetService.UInt32PointerInAndOutput", _in);
+	return Call.ByName("main.GreetService.UInt32PointerInAndOutput", _in);
 }
 
 export async function UInt64InUIntOut(_in: number) : Promise<number> {
-	return wails.CallByName("main.GreetService.UInt64InUIntOut", _in);
+	return Call.ByName("main.GreetService.UInt64InUIntOut", _in);
 }
 
 export async function UInt64PointerInAndOutput(_in: number | null) : Promise<number | null> {
-	return wails.CallByName("main.GreetService.UInt64PointerInAndOutput", _in);
+	return Call.ByName("main.GreetService.UInt64PointerInAndOutput", _in);
 }
 
 export async function UInt8InUIntOut(_in: number) : Promise<number> {
-	return wails.CallByName("main.GreetService.UInt8InUIntOut", _in);
+	return Call.ByName("main.GreetService.UInt8InUIntOut", _in);
 }
 
 export async function UInt8PointerInAndOutput(_in: number | null) : Promise<number | null> {
-	return wails.CallByName("main.GreetService.UInt8PointerInAndOutput", _in);
+	return Call.ByName("main.GreetService.UInt8PointerInAndOutput", _in);
 }
 
 export async function UIntInUIntOut(_in: number) : Promise<number> {
-	return wails.CallByName("main.GreetService.UIntInUIntOut", _in);
+	return Call.ByName("main.GreetService.UIntInUIntOut", _in);
 }
 
 export async function UIntPointerInAndOutput(_in: number | null) : Promise<number | null> {
-	return wails.CallByName("main.GreetService.UIntPointerInAndOutput", _in);
+	return Call.ByName("main.GreetService.UIntPointerInAndOutput", _in);
 }
 
diff --git a/v3/internal/parser/testdata/struct_literal_non_pointer_single/frontend/bindings/main/GreetService.ts b/v3/internal/parser/testdata/struct_literal_non_pointer_single/frontend/bindings/main/GreetService.ts
index d7cdb67743d..acc449f58f3 100644
--- a/v3/internal/parser/testdata/struct_literal_non_pointer_single/frontend/bindings/main/GreetService.ts
+++ b/v3/internal/parser/testdata/struct_literal_non_pointer_single/frontend/bindings/main/GreetService.ts
@@ -1,178 +1,179 @@
 // Cynhyrchwyd y ffeil hon yn awtomatig. PEIDIWCH Â MODIWL
 // This file is automatically generated. DO NOT EDIT
 
+import {Call} from '@wailsio/runtime';
 import {Person} from './models';
 
 export async function ArrayInt(_in: number[]) : Promise<void> {
-	return wails.CallByID(3862002418, _in);
+	return Call.ByID(3862002418, _in);
 }
 
 export async function BoolInBoolOut(_in: boolean) : Promise<boolean> {
-	return wails.CallByID(2424639793, _in);
+	return Call.ByID(2424639793, _in);
 }
 
 export async function Float32InFloat32Out(_in: number) : Promise<number> {
-	return wails.CallByID(3132595881, _in);
+	return Call.ByID(3132595881, _in);
 }
 
 export async function Float64InFloat64Out(_in: number) : Promise<number> {
-	return wails.CallByID(2182412247, _in);
+	return Call.ByID(2182412247, _in);
 }
 
 // Greet someone
 export async function Greet(name: string) : Promise<string> {
-	return wails.CallByID(1411160069, name);
+	return Call.ByID(1411160069, name);
 }
 
 export async function Int16InIntOut(_in: number) : Promise<number> {
-	return wails.CallByID(3306292566, _in);
+	return Call.ByID(3306292566, _in);
 }
 
 export async function Int16PointerInAndOutput(_in: number | null) : Promise<number | null> {
-	return wails.CallByID(1754277916, _in);
+	return Call.ByID(1754277916, _in);
 }
 
 export async function Int32InIntOut(_in: number) : Promise<number> {
-	return wails.CallByID(1909469092, _in);
+	return Call.ByID(1909469092, _in);
 }
 
 export async function Int32PointerInAndOutput(_in: number | null) : Promise<number | null> {
-	return wails.CallByID(4251088558, _in);
+	return Call.ByID(4251088558, _in);
 }
 
 export async function Int64InIntOut(_in: number) : Promise<number> {
-	return wails.CallByID(1343888303, _in);
+	return Call.ByID(1343888303, _in);
 }
 
 export async function Int64PointerInAndOutput(_in: number | null) : Promise<number | null> {
-	return wails.CallByID(2205561041, _in);
+	return Call.ByID(2205561041, _in);
 }
 
 export async function Int8InIntOut(_in: number) : Promise<number> {
-	return wails.CallByID(572240879, _in);
+	return Call.ByID(572240879, _in);
 }
 
 export async function Int8PointerInAndOutput(_in: number | null) : Promise<number | null> {
-	return wails.CallByID(2189402897, _in);
+	return Call.ByID(2189402897, _in);
 }
 
 export async function IntInIntOut(_in: number) : Promise<number> {
-	return wails.CallByID(642881729, _in);
+	return Call.ByID(642881729, _in);
 }
 
 export async function IntPointerInAndOutput(_in: number | null) : Promise<number | null> {
-	return wails.CallByID(1066151743, _in);
+	return Call.ByID(1066151743, _in);
 }
 
 export async function IntPointerInputNamedOutputs(_in: number | null) : Promise<number | null, void> {
-	return wails.CallByID(2718999663, _in);
+	return Call.ByID(2718999663, _in);
 }
 
 export async function MapIntInt(_in: map) : Promise<void> {
-	return wails.CallByID(2386486356, _in);
+	return Call.ByID(2386486356, _in);
 }
 
 export async function MapIntPointerInt(_in: map) : Promise<void> {
-	return wails.CallByID(550413585, _in);
+	return Call.ByID(550413585, _in);
 }
 
 export async function MapIntSliceInt(_in: map) : Promise<void> {
-	return wails.CallByID(2900172572, _in);
+	return Call.ByID(2900172572, _in);
 }
 
 export async function MapIntSliceIntInMapIntSliceIntOut(_in: map) : Promise<map> {
-	return wails.CallByID(881980169, _in);
+	return Call.ByID(881980169, _in);
 }
 
 export async function NoInputsStringOut() : Promise<string> {
-	return wails.CallByID(1075577233);
+	return Call.ByID(1075577233);
 }
 
 export async function PointerBoolInBoolOut(_in: boolean | null) : Promise<boolean | null> {
-	return wails.CallByID(3589606958, _in);
+	return Call.ByID(3589606958, _in);
 }
 
 export async function PointerFloat32InFloat32Out(_in: number | null) : Promise<number | null> {
-	return wails.CallByID(224675106, _in);
+	return Call.ByID(224675106, _in);
 }
 
 export async function PointerFloat64InFloat64Out(_in: number | null) : Promise<number | null> {
-	return wails.CallByID(2124953624, _in);
+	return Call.ByID(2124953624, _in);
 }
 
 export async function PointerMapIntInt(_in: map | null) : Promise<void> {
-	return wails.CallByID(3516977899, _in);
+	return Call.ByID(3516977899, _in);
 }
 
 export async function PointerStringInStringOut(_in: string | null) : Promise<string | null> {
-	return wails.CallByID(229603958, _in);
+	return Call.ByID(229603958, _in);
 }
 
 export async function StringArrayInputNamedOutput(_in: string[]) : Promise<string[]> {
-	return wails.CallByID(3678582682, _in);
+	return Call.ByID(3678582682, _in);
 }
 
 export async function StringArrayInputNamedOutputs(_in: string[]) : Promise<string[], void> {
-	return wails.CallByID(319259595, _in);
+	return Call.ByID(319259595, _in);
 }
 
 export async function StringArrayInputStringArrayOut(_in: string[]) : Promise<string[]> {
-	return wails.CallByID(383995060, _in);
+	return Call.ByID(383995060, _in);
 }
 
 export async function StringArrayInputStringOut(_in: string[]) : Promise<string> {
-	return wails.CallByID(1091960237, _in);
+	return Call.ByID(1091960237, _in);
 }
 
 export async function StructInputStructOutput(_in: Person) : Promise<Person> {
-	return wails.CallByID(3835643147, _in);
+	return Call.ByID(3835643147, _in);
 }
 
 export async function StructPointerInputErrorOutput(_in: Person | null) : Promise<void> {
-	return wails.CallByID(2447692557, _in);
+	return Call.ByID(2447692557, _in);
 }
 
 export async function StructPointerInputStructPointerOutput(_in: Person | null) : Promise<Person> {
-	return wails.CallByID(2943477349, _in);
+	return Call.ByID(2943477349, _in);
 }
 
 export async function UInt16InUIntOut(_in: number) : Promise<number> {
-	return wails.CallByID(3401034892, _in);
+	return Call.ByID(3401034892, _in);
 }
 
 export async function UInt16PointerInAndOutput(_in: number | null) : Promise<number | null> {
-	return wails.CallByID(1236957573, _in);
+	return Call.ByID(1236957573, _in);
 }
 
 export async function UInt32InUIntOut(_in: number) : Promise<number> {
-	return wails.CallByID(1160383782, _in);
+	return Call.ByID(1160383782, _in);
 }
 
 export async function UInt32PointerInAndOutput(_in: number | null) : Promise<number | null> {
-	return wails.CallByID(1739300671, _in);
+	return Call.ByID(1739300671, _in);
 }
 
 export async function UInt64InUIntOut(_in: number) : Promise<number> {
-	return wails.CallByID(793803239, _in);
+	return Call.ByID(793803239, _in);
 }
 
 export async function UInt64PointerInAndOutput(_in: number | null) : Promise<number | null> {
-	return wails.CallByID(1403757716, _in);
+	return Call.ByID(1403757716, _in);
 }
 
 export async function UInt8InUIntOut(_in: number) : Promise<number> {
-	return wails.CallByID(2988345717, _in);
+	return Call.ByID(2988345717, _in);
 }
 
 export async function UInt8PointerInAndOutput(_in: number | null) : Promise<number | null> {
-	return wails.CallByID(518250834, _in);
+	return Call.ByID(518250834, _in);
 }
 
 export async function UIntInUIntOut(_in: number) : Promise<number> {
-	return wails.CallByID(2836661285, _in);
+	return Call.ByID(2836661285, _in);
 }
 
 export async function UIntPointerInAndOutput(_in: number | null) : Promise<number | null> {
-	return wails.CallByID(1367187362, _in);
+	return Call.ByID(1367187362, _in);
 }
 
diff --git a/v3/internal/parser/testdata/struct_literal_single/frontend/bindings/main/GreetService.js b/v3/internal/parser/testdata/struct_literal_single/frontend/bindings/main/GreetService.js
index 6f884468ea8..66d3c141559 100644
--- a/v3/internal/parser/testdata/struct_literal_single/frontend/bindings/main/GreetService.js
+++ b/v3/internal/parser/testdata/struct_literal_single/frontend/bindings/main/GreetService.js
@@ -2,6 +2,7 @@
 // Cynhyrchwyd y ffeil hon yn awtomatig. PEIDIWCH Â MODIWL
 // This file is automatically generated. DO NOT EDIT
 
+import {Call} from '@wailsio/runtime';
 /**
  * @typedef {import('./models').Person} Person
  */
@@ -12,7 +13,7 @@
  * @returns {Promise<void>}
  **/
 export async function ArrayInt(_in) {
-	return wails.CallByID(3862002418, ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByID(3862002418, ...Array.prototype.slice.call(arguments, 0));
 }
 
 /** 
@@ -21,7 +22,7 @@ export async function ArrayInt(_in) {
  * @returns {Promise<boolean>}
  **/
 export async function BoolInBoolOut(_in) {
-	return wails.CallByID(2424639793, ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByID(2424639793, ...Array.prototype.slice.call(arguments, 0));
 }
 
 /** 
@@ -30,7 +31,7 @@ export async function BoolInBoolOut(_in) {
  * @returns {Promise<number>}
  **/
 export async function Float32InFloat32Out(_in) {
-	return wails.CallByID(3132595881, ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByID(3132595881, ...Array.prototype.slice.call(arguments, 0));
 }
 
 /** 
@@ -39,7 +40,7 @@ export async function Float32InFloat32Out(_in) {
  * @returns {Promise<number>}
  **/
 export async function Float64InFloat64Out(_in) {
-	return wails.CallByID(2182412247, ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByID(2182412247, ...Array.prototype.slice.call(arguments, 0));
 }
 
 /**
@@ -49,7 +50,7 @@ export async function Float64InFloat64Out(_in) {
  * @returns {Promise<string>}
  **/
 export async function Greet(name) {
-	return wails.CallByID(1411160069, ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByID(1411160069, ...Array.prototype.slice.call(arguments, 0));
 }
 
 /** 
@@ -58,7 +59,7 @@ export async function Greet(name) {
  * @returns {Promise<number>}
  **/
 export async function Int16InIntOut(_in) {
-	return wails.CallByID(3306292566, ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByID(3306292566, ...Array.prototype.slice.call(arguments, 0));
 }
 
 /** 
@@ -67,7 +68,7 @@ export async function Int16InIntOut(_in) {
  * @returns {Promise<number | null>}
  **/
 export async function Int16PointerInAndOutput(_in) {
-	return wails.CallByID(1754277916, ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByID(1754277916, ...Array.prototype.slice.call(arguments, 0));
 }
 
 /** 
@@ -76,7 +77,7 @@ export async function Int16PointerInAndOutput(_in) {
  * @returns {Promise<number>}
  **/
 export async function Int32InIntOut(_in) {
-	return wails.CallByID(1909469092, ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByID(1909469092, ...Array.prototype.slice.call(arguments, 0));
 }
 
 /** 
@@ -85,7 +86,7 @@ export async function Int32InIntOut(_in) {
  * @returns {Promise<number | null>}
  **/
 export async function Int32PointerInAndOutput(_in) {
-	return wails.CallByID(4251088558, ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByID(4251088558, ...Array.prototype.slice.call(arguments, 0));
 }
 
 /** 
@@ -94,7 +95,7 @@ export async function Int32PointerInAndOutput(_in) {
  * @returns {Promise<number>}
  **/
 export async function Int64InIntOut(_in) {
-	return wails.CallByID(1343888303, ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByID(1343888303, ...Array.prototype.slice.call(arguments, 0));
 }
 
 /** 
@@ -103,7 +104,7 @@ export async function Int64InIntOut(_in) {
  * @returns {Promise<number | null>}
  **/
 export async function Int64PointerInAndOutput(_in) {
-	return wails.CallByID(2205561041, ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByID(2205561041, ...Array.prototype.slice.call(arguments, 0));
 }
 
 /** 
@@ -112,7 +113,7 @@ export async function Int64PointerInAndOutput(_in) {
  * @returns {Promise<number>}
  **/
 export async function Int8InIntOut(_in) {
-	return wails.CallByID(572240879, ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByID(572240879, ...Array.prototype.slice.call(arguments, 0));
 }
 
 /** 
@@ -121,7 +122,7 @@ export async function Int8InIntOut(_in) {
  * @returns {Promise<number | null>}
  **/
 export async function Int8PointerInAndOutput(_in) {
-	return wails.CallByID(2189402897, ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByID(2189402897, ...Array.prototype.slice.call(arguments, 0));
 }
 
 /** 
@@ -130,7 +131,7 @@ export async function Int8PointerInAndOutput(_in) {
  * @returns {Promise<number>}
  **/
 export async function IntInIntOut(_in) {
-	return wails.CallByID(642881729, ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByID(642881729, ...Array.prototype.slice.call(arguments, 0));
 }
 
 /** 
@@ -139,7 +140,7 @@ export async function IntInIntOut(_in) {
  * @returns {Promise<number | null>}
  **/
 export async function IntPointerInAndOutput(_in) {
-	return wails.CallByID(1066151743, ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByID(1066151743, ...Array.prototype.slice.call(arguments, 0));
 }
 
 /** 
@@ -148,7 +149,7 @@ export async function IntPointerInAndOutput(_in) {
  * @returns {Promise<number | null, void>}
  **/
 export async function IntPointerInputNamedOutputs(_in) {
-	return wails.CallByID(2718999663, ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByID(2718999663, ...Array.prototype.slice.call(arguments, 0));
 }
 
 /** 
@@ -157,7 +158,7 @@ export async function IntPointerInputNamedOutputs(_in) {
  * @returns {Promise<void>}
  **/
 export async function MapIntInt(_in) {
-	return wails.CallByID(2386486356, ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByID(2386486356, ...Array.prototype.slice.call(arguments, 0));
 }
 
 /** 
@@ -166,7 +167,7 @@ export async function MapIntInt(_in) {
  * @returns {Promise<void>}
  **/
 export async function MapIntPointerInt(_in) {
-	return wails.CallByID(550413585, ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByID(550413585, ...Array.prototype.slice.call(arguments, 0));
 }
 
 /** 
@@ -175,7 +176,7 @@ export async function MapIntPointerInt(_in) {
  * @returns {Promise<void>}
  **/
 export async function MapIntSliceInt(_in) {
-	return wails.CallByID(2900172572, ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByID(2900172572, ...Array.prototype.slice.call(arguments, 0));
 }
 
 /** 
@@ -184,7 +185,7 @@ export async function MapIntSliceInt(_in) {
  * @returns {Promise<map>}
  **/
 export async function MapIntSliceIntInMapIntSliceIntOut(_in) {
-	return wails.CallByID(881980169, ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByID(881980169, ...Array.prototype.slice.call(arguments, 0));
 }
 
 /** 
@@ -192,7 +193,7 @@ export async function MapIntSliceIntInMapIntSliceIntOut(_in) {
  * @returns {Promise<string>}
  **/
 export async function NoInputsStringOut() {
-	return wails.CallByID(1075577233, ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByID(1075577233, ...Array.prototype.slice.call(arguments, 0));
 }
 
 /** 
@@ -201,7 +202,7 @@ export async function NoInputsStringOut() {
  * @returns {Promise<boolean | null>}
  **/
 export async function PointerBoolInBoolOut(_in) {
-	return wails.CallByID(3589606958, ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByID(3589606958, ...Array.prototype.slice.call(arguments, 0));
 }
 
 /** 
@@ -210,7 +211,7 @@ export async function PointerBoolInBoolOut(_in) {
  * @returns {Promise<number | null>}
  **/
 export async function PointerFloat32InFloat32Out(_in) {
-	return wails.CallByID(224675106, ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByID(224675106, ...Array.prototype.slice.call(arguments, 0));
 }
 
 /** 
@@ -219,7 +220,7 @@ export async function PointerFloat32InFloat32Out(_in) {
  * @returns {Promise<number | null>}
  **/
 export async function PointerFloat64InFloat64Out(_in) {
-	return wails.CallByID(2124953624, ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByID(2124953624, ...Array.prototype.slice.call(arguments, 0));
 }
 
 /** 
@@ -228,7 +229,7 @@ export async function PointerFloat64InFloat64Out(_in) {
  * @returns {Promise<void>}
  **/
 export async function PointerMapIntInt(_in) {
-	return wails.CallByID(3516977899, ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByID(3516977899, ...Array.prototype.slice.call(arguments, 0));
 }
 
 /** 
@@ -237,7 +238,7 @@ export async function PointerMapIntInt(_in) {
  * @returns {Promise<string | null>}
  **/
 export async function PointerStringInStringOut(_in) {
-	return wails.CallByID(229603958, ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByID(229603958, ...Array.prototype.slice.call(arguments, 0));
 }
 
 /** 
@@ -246,7 +247,7 @@ export async function PointerStringInStringOut(_in) {
  * @returns {Promise<string[]>}
  **/
 export async function StringArrayInputNamedOutput(_in) {
-	return wails.CallByID(3678582682, ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByID(3678582682, ...Array.prototype.slice.call(arguments, 0));
 }
 
 /** 
@@ -255,7 +256,7 @@ export async function StringArrayInputNamedOutput(_in) {
  * @returns {Promise<string[], void>}
  **/
 export async function StringArrayInputNamedOutputs(_in) {
-	return wails.CallByID(319259595, ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByID(319259595, ...Array.prototype.slice.call(arguments, 0));
 }
 
 /** 
@@ -264,7 +265,7 @@ export async function StringArrayInputNamedOutputs(_in) {
  * @returns {Promise<string[]>}
  **/
 export async function StringArrayInputStringArrayOut(_in) {
-	return wails.CallByID(383995060, ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByID(383995060, ...Array.prototype.slice.call(arguments, 0));
 }
 
 /** 
@@ -273,7 +274,7 @@ export async function StringArrayInputStringArrayOut(_in) {
  * @returns {Promise<string>}
  **/
 export async function StringArrayInputStringOut(_in) {
-	return wails.CallByID(1091960237, ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByID(1091960237, ...Array.prototype.slice.call(arguments, 0));
 }
 
 /** 
@@ -282,7 +283,7 @@ export async function StringArrayInputStringOut(_in) {
  * @returns {Promise<Person>}
  **/
 export async function StructInputStructOutput(_in) {
-	return wails.CallByID(3835643147, ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByID(3835643147, ...Array.prototype.slice.call(arguments, 0));
 }
 
 /** 
@@ -291,7 +292,7 @@ export async function StructInputStructOutput(_in) {
  * @returns {Promise<void>}
  **/
 export async function StructPointerInputErrorOutput(_in) {
-	return wails.CallByID(2447692557, ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByID(2447692557, ...Array.prototype.slice.call(arguments, 0));
 }
 
 /** 
@@ -300,7 +301,7 @@ export async function StructPointerInputErrorOutput(_in) {
  * @returns {Promise<Person>}
  **/
 export async function StructPointerInputStructPointerOutput(_in) {
-	return wails.CallByID(2943477349, ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByID(2943477349, ...Array.prototype.slice.call(arguments, 0));
 }
 
 /** 
@@ -309,7 +310,7 @@ export async function StructPointerInputStructPointerOutput(_in) {
  * @returns {Promise<number>}
  **/
 export async function UInt16InUIntOut(_in) {
-	return wails.CallByID(3401034892, ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByID(3401034892, ...Array.prototype.slice.call(arguments, 0));
 }
 
 /** 
@@ -318,7 +319,7 @@ export async function UInt16InUIntOut(_in) {
  * @returns {Promise<number | null>}
  **/
 export async function UInt16PointerInAndOutput(_in) {
-	return wails.CallByID(1236957573, ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByID(1236957573, ...Array.prototype.slice.call(arguments, 0));
 }
 
 /** 
@@ -327,7 +328,7 @@ export async function UInt16PointerInAndOutput(_in) {
  * @returns {Promise<number>}
  **/
 export async function UInt32InUIntOut(_in) {
-	return wails.CallByID(1160383782, ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByID(1160383782, ...Array.prototype.slice.call(arguments, 0));
 }
 
 /** 
@@ -336,7 +337,7 @@ export async function UInt32InUIntOut(_in) {
  * @returns {Promise<number | null>}
  **/
 export async function UInt32PointerInAndOutput(_in) {
-	return wails.CallByID(1739300671, ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByID(1739300671, ...Array.prototype.slice.call(arguments, 0));
 }
 
 /** 
@@ -345,7 +346,7 @@ export async function UInt32PointerInAndOutput(_in) {
  * @returns {Promise<number>}
  **/
 export async function UInt64InUIntOut(_in) {
-	return wails.CallByID(793803239, ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByID(793803239, ...Array.prototype.slice.call(arguments, 0));
 }
 
 /** 
@@ -354,7 +355,7 @@ export async function UInt64InUIntOut(_in) {
  * @returns {Promise<number | null>}
  **/
 export async function UInt64PointerInAndOutput(_in) {
-	return wails.CallByID(1403757716, ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByID(1403757716, ...Array.prototype.slice.call(arguments, 0));
 }
 
 /** 
@@ -363,7 +364,7 @@ export async function UInt64PointerInAndOutput(_in) {
  * @returns {Promise<number>}
  **/
 export async function UInt8InUIntOut(_in) {
-	return wails.CallByID(2988345717, ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByID(2988345717, ...Array.prototype.slice.call(arguments, 0));
 }
 
 /** 
@@ -372,7 +373,7 @@ export async function UInt8InUIntOut(_in) {
  * @returns {Promise<number | null>}
  **/
 export async function UInt8PointerInAndOutput(_in) {
-	return wails.CallByID(518250834, ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByID(518250834, ...Array.prototype.slice.call(arguments, 0));
 }
 
 /** 
@@ -381,7 +382,7 @@ export async function UInt8PointerInAndOutput(_in) {
  * @returns {Promise<number>}
  **/
 export async function UIntInUIntOut(_in) {
-	return wails.CallByID(2836661285, ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByID(2836661285, ...Array.prototype.slice.call(arguments, 0));
 }
 
 /** 
@@ -390,5 +391,5 @@ export async function UIntInUIntOut(_in) {
  * @returns {Promise<number | null>}
  **/
 export async function UIntPointerInAndOutput(_in) {
-	return wails.CallByID(1367187362, ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByID(1367187362, ...Array.prototype.slice.call(arguments, 0));
 }
diff --git a/v3/internal/parser/testdata/struct_literal_single/frontend/bindings/main/GreetService.name.js b/v3/internal/parser/testdata/struct_literal_single/frontend/bindings/main/GreetService.name.js
index ca80e283965..9982bea9a69 100644
--- a/v3/internal/parser/testdata/struct_literal_single/frontend/bindings/main/GreetService.name.js
+++ b/v3/internal/parser/testdata/struct_literal_single/frontend/bindings/main/GreetService.name.js
@@ -2,6 +2,7 @@
 // Cynhyrchwyd y ffeil hon yn awtomatig. PEIDIWCH Â MODIWL
 // This file is automatically generated. DO NOT EDIT
 
+import {Call} from '@wailsio/runtime';
 /**
  * @typedef {import('./models').Person} Person
  */
@@ -12,7 +13,7 @@
  * @returns {Promise<void>}
  **/
 export async function ArrayInt(_in) {
-	return wails.CallByName("main.GreetService.ArrayInt", ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByName("main.GreetService.ArrayInt", ...Array.prototype.slice.call(arguments, 0));
 }
 
 /** 
@@ -21,7 +22,7 @@ export async function ArrayInt(_in) {
  * @returns {Promise<boolean>}
  **/
 export async function BoolInBoolOut(_in) {
-	return wails.CallByName("main.GreetService.BoolInBoolOut", ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByName("main.GreetService.BoolInBoolOut", ...Array.prototype.slice.call(arguments, 0));
 }
 
 /** 
@@ -30,7 +31,7 @@ export async function BoolInBoolOut(_in) {
  * @returns {Promise<number>}
  **/
 export async function Float32InFloat32Out(_in) {
-	return wails.CallByName("main.GreetService.Float32InFloat32Out", ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByName("main.GreetService.Float32InFloat32Out", ...Array.prototype.slice.call(arguments, 0));
 }
 
 /** 
@@ -39,7 +40,7 @@ export async function Float32InFloat32Out(_in) {
  * @returns {Promise<number>}
  **/
 export async function Float64InFloat64Out(_in) {
-	return wails.CallByName("main.GreetService.Float64InFloat64Out", ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByName("main.GreetService.Float64InFloat64Out", ...Array.prototype.slice.call(arguments, 0));
 }
 
 /**
@@ -49,7 +50,7 @@ export async function Float64InFloat64Out(_in) {
  * @returns {Promise<string>}
  **/
 export async function Greet(name) {
-	return wails.CallByName("main.GreetService.Greet", ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByName("main.GreetService.Greet", ...Array.prototype.slice.call(arguments, 0));
 }
 
 /** 
@@ -58,7 +59,7 @@ export async function Greet(name) {
  * @returns {Promise<number>}
  **/
 export async function Int16InIntOut(_in) {
-	return wails.CallByName("main.GreetService.Int16InIntOut", ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByName("main.GreetService.Int16InIntOut", ...Array.prototype.slice.call(arguments, 0));
 }
 
 /** 
@@ -67,7 +68,7 @@ export async function Int16InIntOut(_in) {
  * @returns {Promise<number | null>}
  **/
 export async function Int16PointerInAndOutput(_in) {
-	return wails.CallByName("main.GreetService.Int16PointerInAndOutput", ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByName("main.GreetService.Int16PointerInAndOutput", ...Array.prototype.slice.call(arguments, 0));
 }
 
 /** 
@@ -76,7 +77,7 @@ export async function Int16PointerInAndOutput(_in) {
  * @returns {Promise<number>}
  **/
 export async function Int32InIntOut(_in) {
-	return wails.CallByName("main.GreetService.Int32InIntOut", ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByName("main.GreetService.Int32InIntOut", ...Array.prototype.slice.call(arguments, 0));
 }
 
 /** 
@@ -85,7 +86,7 @@ export async function Int32InIntOut(_in) {
  * @returns {Promise<number | null>}
  **/
 export async function Int32PointerInAndOutput(_in) {
-	return wails.CallByName("main.GreetService.Int32PointerInAndOutput", ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByName("main.GreetService.Int32PointerInAndOutput", ...Array.prototype.slice.call(arguments, 0));
 }
 
 /** 
@@ -94,7 +95,7 @@ export async function Int32PointerInAndOutput(_in) {
  * @returns {Promise<number>}
  **/
 export async function Int64InIntOut(_in) {
-	return wails.CallByName("main.GreetService.Int64InIntOut", ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByName("main.GreetService.Int64InIntOut", ...Array.prototype.slice.call(arguments, 0));
 }
 
 /** 
@@ -103,7 +104,7 @@ export async function Int64InIntOut(_in) {
  * @returns {Promise<number | null>}
  **/
 export async function Int64PointerInAndOutput(_in) {
-	return wails.CallByName("main.GreetService.Int64PointerInAndOutput", ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByName("main.GreetService.Int64PointerInAndOutput", ...Array.prototype.slice.call(arguments, 0));
 }
 
 /** 
@@ -112,7 +113,7 @@ export async function Int64PointerInAndOutput(_in) {
  * @returns {Promise<number>}
  **/
 export async function Int8InIntOut(_in) {
-	return wails.CallByName("main.GreetService.Int8InIntOut", ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByName("main.GreetService.Int8InIntOut", ...Array.prototype.slice.call(arguments, 0));
 }
 
 /** 
@@ -121,7 +122,7 @@ export async function Int8InIntOut(_in) {
  * @returns {Promise<number | null>}
  **/
 export async function Int8PointerInAndOutput(_in) {
-	return wails.CallByName("main.GreetService.Int8PointerInAndOutput", ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByName("main.GreetService.Int8PointerInAndOutput", ...Array.prototype.slice.call(arguments, 0));
 }
 
 /** 
@@ -130,7 +131,7 @@ export async function Int8PointerInAndOutput(_in) {
  * @returns {Promise<number>}
  **/
 export async function IntInIntOut(_in) {
-	return wails.CallByName("main.GreetService.IntInIntOut", ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByName("main.GreetService.IntInIntOut", ...Array.prototype.slice.call(arguments, 0));
 }
 
 /** 
@@ -139,7 +140,7 @@ export async function IntInIntOut(_in) {
  * @returns {Promise<number | null>}
  **/
 export async function IntPointerInAndOutput(_in) {
-	return wails.CallByName("main.GreetService.IntPointerInAndOutput", ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByName("main.GreetService.IntPointerInAndOutput", ...Array.prototype.slice.call(arguments, 0));
 }
 
 /** 
@@ -148,7 +149,7 @@ export async function IntPointerInAndOutput(_in) {
  * @returns {Promise<number | null, void>}
  **/
 export async function IntPointerInputNamedOutputs(_in) {
-	return wails.CallByName("main.GreetService.IntPointerInputNamedOutputs", ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByName("main.GreetService.IntPointerInputNamedOutputs", ...Array.prototype.slice.call(arguments, 0));
 }
 
 /** 
@@ -157,7 +158,7 @@ export async function IntPointerInputNamedOutputs(_in) {
  * @returns {Promise<void>}
  **/
 export async function MapIntInt(_in) {
-	return wails.CallByName("main.GreetService.MapIntInt", ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByName("main.GreetService.MapIntInt", ...Array.prototype.slice.call(arguments, 0));
 }
 
 /** 
@@ -166,7 +167,7 @@ export async function MapIntInt(_in) {
  * @returns {Promise<void>}
  **/
 export async function MapIntPointerInt(_in) {
-	return wails.CallByName("main.GreetService.MapIntPointerInt", ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByName("main.GreetService.MapIntPointerInt", ...Array.prototype.slice.call(arguments, 0));
 }
 
 /** 
@@ -175,7 +176,7 @@ export async function MapIntPointerInt(_in) {
  * @returns {Promise<void>}
  **/
 export async function MapIntSliceInt(_in) {
-	return wails.CallByName("main.GreetService.MapIntSliceInt", ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByName("main.GreetService.MapIntSliceInt", ...Array.prototype.slice.call(arguments, 0));
 }
 
 /** 
@@ -184,7 +185,7 @@ export async function MapIntSliceInt(_in) {
  * @returns {Promise<map>}
  **/
 export async function MapIntSliceIntInMapIntSliceIntOut(_in) {
-	return wails.CallByName("main.GreetService.MapIntSliceIntInMapIntSliceIntOut", ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByName("main.GreetService.MapIntSliceIntInMapIntSliceIntOut", ...Array.prototype.slice.call(arguments, 0));
 }
 
 /** 
@@ -192,7 +193,7 @@ export async function MapIntSliceIntInMapIntSliceIntOut(_in) {
  * @returns {Promise<string>}
  **/
 export async function NoInputsStringOut() {
-	return wails.CallByName("main.GreetService.NoInputsStringOut", ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByName("main.GreetService.NoInputsStringOut", ...Array.prototype.slice.call(arguments, 0));
 }
 
 /** 
@@ -201,7 +202,7 @@ export async function NoInputsStringOut() {
  * @returns {Promise<boolean | null>}
  **/
 export async function PointerBoolInBoolOut(_in) {
-	return wails.CallByName("main.GreetService.PointerBoolInBoolOut", ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByName("main.GreetService.PointerBoolInBoolOut", ...Array.prototype.slice.call(arguments, 0));
 }
 
 /** 
@@ -210,7 +211,7 @@ export async function PointerBoolInBoolOut(_in) {
  * @returns {Promise<number | null>}
  **/
 export async function PointerFloat32InFloat32Out(_in) {
-	return wails.CallByName("main.GreetService.PointerFloat32InFloat32Out", ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByName("main.GreetService.PointerFloat32InFloat32Out", ...Array.prototype.slice.call(arguments, 0));
 }
 
 /** 
@@ -219,7 +220,7 @@ export async function PointerFloat32InFloat32Out(_in) {
  * @returns {Promise<number | null>}
  **/
 export async function PointerFloat64InFloat64Out(_in) {
-	return wails.CallByName("main.GreetService.PointerFloat64InFloat64Out", ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByName("main.GreetService.PointerFloat64InFloat64Out", ...Array.prototype.slice.call(arguments, 0));
 }
 
 /** 
@@ -228,7 +229,7 @@ export async function PointerFloat64InFloat64Out(_in) {
  * @returns {Promise<void>}
  **/
 export async function PointerMapIntInt(_in) {
-	return wails.CallByName("main.GreetService.PointerMapIntInt", ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByName("main.GreetService.PointerMapIntInt", ...Array.prototype.slice.call(arguments, 0));
 }
 
 /** 
@@ -237,7 +238,7 @@ export async function PointerMapIntInt(_in) {
  * @returns {Promise<string | null>}
  **/
 export async function PointerStringInStringOut(_in) {
-	return wails.CallByName("main.GreetService.PointerStringInStringOut", ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByName("main.GreetService.PointerStringInStringOut", ...Array.prototype.slice.call(arguments, 0));
 }
 
 /** 
@@ -246,7 +247,7 @@ export async function PointerStringInStringOut(_in) {
  * @returns {Promise<string[]>}
  **/
 export async function StringArrayInputNamedOutput(_in) {
-	return wails.CallByName("main.GreetService.StringArrayInputNamedOutput", ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByName("main.GreetService.StringArrayInputNamedOutput", ...Array.prototype.slice.call(arguments, 0));
 }
 
 /** 
@@ -255,7 +256,7 @@ export async function StringArrayInputNamedOutput(_in) {
  * @returns {Promise<string[], void>}
  **/
 export async function StringArrayInputNamedOutputs(_in) {
-	return wails.CallByName("main.GreetService.StringArrayInputNamedOutputs", ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByName("main.GreetService.StringArrayInputNamedOutputs", ...Array.prototype.slice.call(arguments, 0));
 }
 
 /** 
@@ -264,7 +265,7 @@ export async function StringArrayInputNamedOutputs(_in) {
  * @returns {Promise<string[]>}
  **/
 export async function StringArrayInputStringArrayOut(_in) {
-	return wails.CallByName("main.GreetService.StringArrayInputStringArrayOut", ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByName("main.GreetService.StringArrayInputStringArrayOut", ...Array.prototype.slice.call(arguments, 0));
 }
 
 /** 
@@ -273,7 +274,7 @@ export async function StringArrayInputStringArrayOut(_in) {
  * @returns {Promise<string>}
  **/
 export async function StringArrayInputStringOut(_in) {
-	return wails.CallByName("main.GreetService.StringArrayInputStringOut", ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByName("main.GreetService.StringArrayInputStringOut", ...Array.prototype.slice.call(arguments, 0));
 }
 
 /** 
@@ -282,7 +283,7 @@ export async function StringArrayInputStringOut(_in) {
  * @returns {Promise<Person>}
  **/
 export async function StructInputStructOutput(_in) {
-	return wails.CallByName("main.GreetService.StructInputStructOutput", ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByName("main.GreetService.StructInputStructOutput", ...Array.prototype.slice.call(arguments, 0));
 }
 
 /** 
@@ -291,7 +292,7 @@ export async function StructInputStructOutput(_in) {
  * @returns {Promise<void>}
  **/
 export async function StructPointerInputErrorOutput(_in) {
-	return wails.CallByName("main.GreetService.StructPointerInputErrorOutput", ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByName("main.GreetService.StructPointerInputErrorOutput", ...Array.prototype.slice.call(arguments, 0));
 }
 
 /** 
@@ -300,7 +301,7 @@ export async function StructPointerInputErrorOutput(_in) {
  * @returns {Promise<Person>}
  **/
 export async function StructPointerInputStructPointerOutput(_in) {
-	return wails.CallByName("main.GreetService.StructPointerInputStructPointerOutput", ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByName("main.GreetService.StructPointerInputStructPointerOutput", ...Array.prototype.slice.call(arguments, 0));
 }
 
 /** 
@@ -309,7 +310,7 @@ export async function StructPointerInputStructPointerOutput(_in) {
  * @returns {Promise<number>}
  **/
 export async function UInt16InUIntOut(_in) {
-	return wails.CallByName("main.GreetService.UInt16InUIntOut", ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByName("main.GreetService.UInt16InUIntOut", ...Array.prototype.slice.call(arguments, 0));
 }
 
 /** 
@@ -318,7 +319,7 @@ export async function UInt16InUIntOut(_in) {
  * @returns {Promise<number | null>}
  **/
 export async function UInt16PointerInAndOutput(_in) {
-	return wails.CallByName("main.GreetService.UInt16PointerInAndOutput", ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByName("main.GreetService.UInt16PointerInAndOutput", ...Array.prototype.slice.call(arguments, 0));
 }
 
 /** 
@@ -327,7 +328,7 @@ export async function UInt16PointerInAndOutput(_in) {
  * @returns {Promise<number>}
  **/
 export async function UInt32InUIntOut(_in) {
-	return wails.CallByName("main.GreetService.UInt32InUIntOut", ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByName("main.GreetService.UInt32InUIntOut", ...Array.prototype.slice.call(arguments, 0));
 }
 
 /** 
@@ -336,7 +337,7 @@ export async function UInt32InUIntOut(_in) {
  * @returns {Promise<number | null>}
  **/
 export async function UInt32PointerInAndOutput(_in) {
-	return wails.CallByName("main.GreetService.UInt32PointerInAndOutput", ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByName("main.GreetService.UInt32PointerInAndOutput", ...Array.prototype.slice.call(arguments, 0));
 }
 
 /** 
@@ -345,7 +346,7 @@ export async function UInt32PointerInAndOutput(_in) {
  * @returns {Promise<number>}
  **/
 export async function UInt64InUIntOut(_in) {
-	return wails.CallByName("main.GreetService.UInt64InUIntOut", ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByName("main.GreetService.UInt64InUIntOut", ...Array.prototype.slice.call(arguments, 0));
 }
 
 /** 
@@ -354,7 +355,7 @@ export async function UInt64InUIntOut(_in) {
  * @returns {Promise<number | null>}
  **/
 export async function UInt64PointerInAndOutput(_in) {
-	return wails.CallByName("main.GreetService.UInt64PointerInAndOutput", ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByName("main.GreetService.UInt64PointerInAndOutput", ...Array.prototype.slice.call(arguments, 0));
 }
 
 /** 
@@ -363,7 +364,7 @@ export async function UInt64PointerInAndOutput(_in) {
  * @returns {Promise<number>}
  **/
 export async function UInt8InUIntOut(_in) {
-	return wails.CallByName("main.GreetService.UInt8InUIntOut", ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByName("main.GreetService.UInt8InUIntOut", ...Array.prototype.slice.call(arguments, 0));
 }
 
 /** 
@@ -372,7 +373,7 @@ export async function UInt8InUIntOut(_in) {
  * @returns {Promise<number | null>}
  **/
 export async function UInt8PointerInAndOutput(_in) {
-	return wails.CallByName("main.GreetService.UInt8PointerInAndOutput", ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByName("main.GreetService.UInt8PointerInAndOutput", ...Array.prototype.slice.call(arguments, 0));
 }
 
 /** 
@@ -381,7 +382,7 @@ export async function UInt8PointerInAndOutput(_in) {
  * @returns {Promise<number>}
  **/
 export async function UIntInUIntOut(_in) {
-	return wails.CallByName("main.GreetService.UIntInUIntOut", ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByName("main.GreetService.UIntInUIntOut", ...Array.prototype.slice.call(arguments, 0));
 }
 
 /** 
@@ -390,5 +391,5 @@ export async function UIntInUIntOut(_in) {
  * @returns {Promise<number | null>}
  **/
 export async function UIntPointerInAndOutput(_in) {
-	return wails.CallByName("main.GreetService.UIntPointerInAndOutput", ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByName("main.GreetService.UIntPointerInAndOutput", ...Array.prototype.slice.call(arguments, 0));
 }
diff --git a/v3/internal/parser/testdata/struct_literal_single/frontend/bindings/main/GreetService.name.ts b/v3/internal/parser/testdata/struct_literal_single/frontend/bindings/main/GreetService.name.ts
index 0c12fd6970c..b47c462c5a6 100644
--- a/v3/internal/parser/testdata/struct_literal_single/frontend/bindings/main/GreetService.name.ts
+++ b/v3/internal/parser/testdata/struct_literal_single/frontend/bindings/main/GreetService.name.ts
@@ -1,178 +1,179 @@
 // Cynhyrchwyd y ffeil hon yn awtomatig. PEIDIWCH Â MODIWL
 // This file is automatically generated. DO NOT EDIT
 
+import {Call} from '@wailsio/runtime';
 import {Person} from './models';
 
 export async function ArrayInt(_in: number[]) : Promise<void> {
-	return wails.CallByName("main.GreetService.ArrayInt", _in);
+	return Call.ByName("main.GreetService.ArrayInt", _in);
 }
 
 export async function BoolInBoolOut(_in: boolean) : Promise<boolean> {
-	return wails.CallByName("main.GreetService.BoolInBoolOut", _in);
+	return Call.ByName("main.GreetService.BoolInBoolOut", _in);
 }
 
 export async function Float32InFloat32Out(_in: number) : Promise<number> {
-	return wails.CallByName("main.GreetService.Float32InFloat32Out", _in);
+	return Call.ByName("main.GreetService.Float32InFloat32Out", _in);
 }
 
 export async function Float64InFloat64Out(_in: number) : Promise<number> {
-	return wails.CallByName("main.GreetService.Float64InFloat64Out", _in);
+	return Call.ByName("main.GreetService.Float64InFloat64Out", _in);
 }
 
 // Greet someone
 export async function Greet(name: string) : Promise<string> {
-	return wails.CallByName("main.GreetService.Greet", name);
+	return Call.ByName("main.GreetService.Greet", name);
 }
 
 export async function Int16InIntOut(_in: number) : Promise<number> {
-	return wails.CallByName("main.GreetService.Int16InIntOut", _in);
+	return Call.ByName("main.GreetService.Int16InIntOut", _in);
 }
 
 export async function Int16PointerInAndOutput(_in: number | null) : Promise<number | null> {
-	return wails.CallByName("main.GreetService.Int16PointerInAndOutput", _in);
+	return Call.ByName("main.GreetService.Int16PointerInAndOutput", _in);
 }
 
 export async function Int32InIntOut(_in: number) : Promise<number> {
-	return wails.CallByName("main.GreetService.Int32InIntOut", _in);
+	return Call.ByName("main.GreetService.Int32InIntOut", _in);
 }
 
 export async function Int32PointerInAndOutput(_in: number | null) : Promise<number | null> {
-	return wails.CallByName("main.GreetService.Int32PointerInAndOutput", _in);
+	return Call.ByName("main.GreetService.Int32PointerInAndOutput", _in);
 }
 
 export async function Int64InIntOut(_in: number) : Promise<number> {
-	return wails.CallByName("main.GreetService.Int64InIntOut", _in);
+	return Call.ByName("main.GreetService.Int64InIntOut", _in);
 }
 
 export async function Int64PointerInAndOutput(_in: number | null) : Promise<number | null> {
-	return wails.CallByName("main.GreetService.Int64PointerInAndOutput", _in);
+	return Call.ByName("main.GreetService.Int64PointerInAndOutput", _in);
 }
 
 export async function Int8InIntOut(_in: number) : Promise<number> {
-	return wails.CallByName("main.GreetService.Int8InIntOut", _in);
+	return Call.ByName("main.GreetService.Int8InIntOut", _in);
 }
 
 export async function Int8PointerInAndOutput(_in: number | null) : Promise<number | null> {
-	return wails.CallByName("main.GreetService.Int8PointerInAndOutput", _in);
+	return Call.ByName("main.GreetService.Int8PointerInAndOutput", _in);
 }
 
 export async function IntInIntOut(_in: number) : Promise<number> {
-	return wails.CallByName("main.GreetService.IntInIntOut", _in);
+	return Call.ByName("main.GreetService.IntInIntOut", _in);
 }
 
 export async function IntPointerInAndOutput(_in: number | null) : Promise<number | null> {
-	return wails.CallByName("main.GreetService.IntPointerInAndOutput", _in);
+	return Call.ByName("main.GreetService.IntPointerInAndOutput", _in);
 }
 
 export async function IntPointerInputNamedOutputs(_in: number | null) : Promise<number | null, void> {
-	return wails.CallByName("main.GreetService.IntPointerInputNamedOutputs", _in);
+	return Call.ByName("main.GreetService.IntPointerInputNamedOutputs", _in);
 }
 
 export async function MapIntInt(_in: map) : Promise<void> {
-	return wails.CallByName("main.GreetService.MapIntInt", _in);
+	return Call.ByName("main.GreetService.MapIntInt", _in);
 }
 
 export async function MapIntPointerInt(_in: map) : Promise<void> {
-	return wails.CallByName("main.GreetService.MapIntPointerInt", _in);
+	return Call.ByName("main.GreetService.MapIntPointerInt", _in);
 }
 
 export async function MapIntSliceInt(_in: map) : Promise<void> {
-	return wails.CallByName("main.GreetService.MapIntSliceInt", _in);
+	return Call.ByName("main.GreetService.MapIntSliceInt", _in);
 }
 
 export async function MapIntSliceIntInMapIntSliceIntOut(_in: map) : Promise<map> {
-	return wails.CallByName("main.GreetService.MapIntSliceIntInMapIntSliceIntOut", _in);
+	return Call.ByName("main.GreetService.MapIntSliceIntInMapIntSliceIntOut", _in);
 }
 
 export async function NoInputsStringOut() : Promise<string> {
-	return wails.CallByName("main.GreetService.NoInputsStringOut");
+	return Call.ByName("main.GreetService.NoInputsStringOut");
 }
 
 export async function PointerBoolInBoolOut(_in: boolean | null) : Promise<boolean | null> {
-	return wails.CallByName("main.GreetService.PointerBoolInBoolOut", _in);
+	return Call.ByName("main.GreetService.PointerBoolInBoolOut", _in);
 }
 
 export async function PointerFloat32InFloat32Out(_in: number | null) : Promise<number | null> {
-	return wails.CallByName("main.GreetService.PointerFloat32InFloat32Out", _in);
+	return Call.ByName("main.GreetService.PointerFloat32InFloat32Out", _in);
 }
 
 export async function PointerFloat64InFloat64Out(_in: number | null) : Promise<number | null> {
-	return wails.CallByName("main.GreetService.PointerFloat64InFloat64Out", _in);
+	return Call.ByName("main.GreetService.PointerFloat64InFloat64Out", _in);
 }
 
 export async function PointerMapIntInt(_in: map | null) : Promise<void> {
-	return wails.CallByName("main.GreetService.PointerMapIntInt", _in);
+	return Call.ByName("main.GreetService.PointerMapIntInt", _in);
 }
 
 export async function PointerStringInStringOut(_in: string | null) : Promise<string | null> {
-	return wails.CallByName("main.GreetService.PointerStringInStringOut", _in);
+	return Call.ByName("main.GreetService.PointerStringInStringOut", _in);
 }
 
 export async function StringArrayInputNamedOutput(_in: string[]) : Promise<string[]> {
-	return wails.CallByName("main.GreetService.StringArrayInputNamedOutput", _in);
+	return Call.ByName("main.GreetService.StringArrayInputNamedOutput", _in);
 }
 
 export async function StringArrayInputNamedOutputs(_in: string[]) : Promise<string[], void> {
-	return wails.CallByName("main.GreetService.StringArrayInputNamedOutputs", _in);
+	return Call.ByName("main.GreetService.StringArrayInputNamedOutputs", _in);
 }
 
 export async function StringArrayInputStringArrayOut(_in: string[]) : Promise<string[]> {
-	return wails.CallByName("main.GreetService.StringArrayInputStringArrayOut", _in);
+	return Call.ByName("main.GreetService.StringArrayInputStringArrayOut", _in);
 }
 
 export async function StringArrayInputStringOut(_in: string[]) : Promise<string> {
-	return wails.CallByName("main.GreetService.StringArrayInputStringOut", _in);
+	return Call.ByName("main.GreetService.StringArrayInputStringOut", _in);
 }
 
 export async function StructInputStructOutput(_in: Person) : Promise<Person> {
-	return wails.CallByName("main.GreetService.StructInputStructOutput", _in);
+	return Call.ByName("main.GreetService.StructInputStructOutput", _in);
 }
 
 export async function StructPointerInputErrorOutput(_in: Person | null) : Promise<void> {
-	return wails.CallByName("main.GreetService.StructPointerInputErrorOutput", _in);
+	return Call.ByName("main.GreetService.StructPointerInputErrorOutput", _in);
 }
 
 export async function StructPointerInputStructPointerOutput(_in: Person | null) : Promise<Person> {
-	return wails.CallByName("main.GreetService.StructPointerInputStructPointerOutput", _in);
+	return Call.ByName("main.GreetService.StructPointerInputStructPointerOutput", _in);
 }
 
 export async function UInt16InUIntOut(_in: number) : Promise<number> {
-	return wails.CallByName("main.GreetService.UInt16InUIntOut", _in);
+	return Call.ByName("main.GreetService.UInt16InUIntOut", _in);
 }
 
 export async function UInt16PointerInAndOutput(_in: number | null) : Promise<number | null> {
-	return wails.CallByName("main.GreetService.UInt16PointerInAndOutput", _in);
+	return Call.ByName("main.GreetService.UInt16PointerInAndOutput", _in);
 }
 
 export async function UInt32InUIntOut(_in: number) : Promise<number> {
-	return wails.CallByName("main.GreetService.UInt32InUIntOut", _in);
+	return Call.ByName("main.GreetService.UInt32InUIntOut", _in);
 }
 
 export async function UInt32PointerInAndOutput(_in: number | null) : Promise<number | null> {
-	return wails.CallByName("main.GreetService.UInt32PointerInAndOutput", _in);
+	return Call.ByName("main.GreetService.UInt32PointerInAndOutput", _in);
 }
 
 export async function UInt64InUIntOut(_in: number) : Promise<number> {
-	return wails.CallByName("main.GreetService.UInt64InUIntOut", _in);
+	return Call.ByName("main.GreetService.UInt64InUIntOut", _in);
 }
 
 export async function UInt64PointerInAndOutput(_in: number | null) : Promise<number | null> {
-	return wails.CallByName("main.GreetService.UInt64PointerInAndOutput", _in);
+	return Call.ByName("main.GreetService.UInt64PointerInAndOutput", _in);
 }
 
 export async function UInt8InUIntOut(_in: number) : Promise<number> {
-	return wails.CallByName("main.GreetService.UInt8InUIntOut", _in);
+	return Call.ByName("main.GreetService.UInt8InUIntOut", _in);
 }
 
 export async function UInt8PointerInAndOutput(_in: number | null) : Promise<number | null> {
-	return wails.CallByName("main.GreetService.UInt8PointerInAndOutput", _in);
+	return Call.ByName("main.GreetService.UInt8PointerInAndOutput", _in);
 }
 
 export async function UIntInUIntOut(_in: number) : Promise<number> {
-	return wails.CallByName("main.GreetService.UIntInUIntOut", _in);
+	return Call.ByName("main.GreetService.UIntInUIntOut", _in);
 }
 
 export async function UIntPointerInAndOutput(_in: number | null) : Promise<number | null> {
-	return wails.CallByName("main.GreetService.UIntPointerInAndOutput", _in);
+	return Call.ByName("main.GreetService.UIntPointerInAndOutput", _in);
 }
 
diff --git a/v3/internal/parser/testdata/struct_literal_single/frontend/bindings/main/GreetService.ts b/v3/internal/parser/testdata/struct_literal_single/frontend/bindings/main/GreetService.ts
index d7cdb67743d..acc449f58f3 100644
--- a/v3/internal/parser/testdata/struct_literal_single/frontend/bindings/main/GreetService.ts
+++ b/v3/internal/parser/testdata/struct_literal_single/frontend/bindings/main/GreetService.ts
@@ -1,178 +1,179 @@
 // Cynhyrchwyd y ffeil hon yn awtomatig. PEIDIWCH Â MODIWL
 // This file is automatically generated. DO NOT EDIT
 
+import {Call} from '@wailsio/runtime';
 import {Person} from './models';
 
 export async function ArrayInt(_in: number[]) : Promise<void> {
-	return wails.CallByID(3862002418, _in);
+	return Call.ByID(3862002418, _in);
 }
 
 export async function BoolInBoolOut(_in: boolean) : Promise<boolean> {
-	return wails.CallByID(2424639793, _in);
+	return Call.ByID(2424639793, _in);
 }
 
 export async function Float32InFloat32Out(_in: number) : Promise<number> {
-	return wails.CallByID(3132595881, _in);
+	return Call.ByID(3132595881, _in);
 }
 
 export async function Float64InFloat64Out(_in: number) : Promise<number> {
-	return wails.CallByID(2182412247, _in);
+	return Call.ByID(2182412247, _in);
 }
 
 // Greet someone
 export async function Greet(name: string) : Promise<string> {
-	return wails.CallByID(1411160069, name);
+	return Call.ByID(1411160069, name);
 }
 
 export async function Int16InIntOut(_in: number) : Promise<number> {
-	return wails.CallByID(3306292566, _in);
+	return Call.ByID(3306292566, _in);
 }
 
 export async function Int16PointerInAndOutput(_in: number | null) : Promise<number | null> {
-	return wails.CallByID(1754277916, _in);
+	return Call.ByID(1754277916, _in);
 }
 
 export async function Int32InIntOut(_in: number) : Promise<number> {
-	return wails.CallByID(1909469092, _in);
+	return Call.ByID(1909469092, _in);
 }
 
 export async function Int32PointerInAndOutput(_in: number | null) : Promise<number | null> {
-	return wails.CallByID(4251088558, _in);
+	return Call.ByID(4251088558, _in);
 }
 
 export async function Int64InIntOut(_in: number) : Promise<number> {
-	return wails.CallByID(1343888303, _in);
+	return Call.ByID(1343888303, _in);
 }
 
 export async function Int64PointerInAndOutput(_in: number | null) : Promise<number | null> {
-	return wails.CallByID(2205561041, _in);
+	return Call.ByID(2205561041, _in);
 }
 
 export async function Int8InIntOut(_in: number) : Promise<number> {
-	return wails.CallByID(572240879, _in);
+	return Call.ByID(572240879, _in);
 }
 
 export async function Int8PointerInAndOutput(_in: number | null) : Promise<number | null> {
-	return wails.CallByID(2189402897, _in);
+	return Call.ByID(2189402897, _in);
 }
 
 export async function IntInIntOut(_in: number) : Promise<number> {
-	return wails.CallByID(642881729, _in);
+	return Call.ByID(642881729, _in);
 }
 
 export async function IntPointerInAndOutput(_in: number | null) : Promise<number | null> {
-	return wails.CallByID(1066151743, _in);
+	return Call.ByID(1066151743, _in);
 }
 
 export async function IntPointerInputNamedOutputs(_in: number | null) : Promise<number | null, void> {
-	return wails.CallByID(2718999663, _in);
+	return Call.ByID(2718999663, _in);
 }
 
 export async function MapIntInt(_in: map) : Promise<void> {
-	return wails.CallByID(2386486356, _in);
+	return Call.ByID(2386486356, _in);
 }
 
 export async function MapIntPointerInt(_in: map) : Promise<void> {
-	return wails.CallByID(550413585, _in);
+	return Call.ByID(550413585, _in);
 }
 
 export async function MapIntSliceInt(_in: map) : Promise<void> {
-	return wails.CallByID(2900172572, _in);
+	return Call.ByID(2900172572, _in);
 }
 
 export async function MapIntSliceIntInMapIntSliceIntOut(_in: map) : Promise<map> {
-	return wails.CallByID(881980169, _in);
+	return Call.ByID(881980169, _in);
 }
 
 export async function NoInputsStringOut() : Promise<string> {
-	return wails.CallByID(1075577233);
+	return Call.ByID(1075577233);
 }
 
 export async function PointerBoolInBoolOut(_in: boolean | null) : Promise<boolean | null> {
-	return wails.CallByID(3589606958, _in);
+	return Call.ByID(3589606958, _in);
 }
 
 export async function PointerFloat32InFloat32Out(_in: number | null) : Promise<number | null> {
-	return wails.CallByID(224675106, _in);
+	return Call.ByID(224675106, _in);
 }
 
 export async function PointerFloat64InFloat64Out(_in: number | null) : Promise<number | null> {
-	return wails.CallByID(2124953624, _in);
+	return Call.ByID(2124953624, _in);
 }
 
 export async function PointerMapIntInt(_in: map | null) : Promise<void> {
-	return wails.CallByID(3516977899, _in);
+	return Call.ByID(3516977899, _in);
 }
 
 export async function PointerStringInStringOut(_in: string | null) : Promise<string | null> {
-	return wails.CallByID(229603958, _in);
+	return Call.ByID(229603958, _in);
 }
 
 export async function StringArrayInputNamedOutput(_in: string[]) : Promise<string[]> {
-	return wails.CallByID(3678582682, _in);
+	return Call.ByID(3678582682, _in);
 }
 
 export async function StringArrayInputNamedOutputs(_in: string[]) : Promise<string[], void> {
-	return wails.CallByID(319259595, _in);
+	return Call.ByID(319259595, _in);
 }
 
 export async function StringArrayInputStringArrayOut(_in: string[]) : Promise<string[]> {
-	return wails.CallByID(383995060, _in);
+	return Call.ByID(383995060, _in);
 }
 
 export async function StringArrayInputStringOut(_in: string[]) : Promise<string> {
-	return wails.CallByID(1091960237, _in);
+	return Call.ByID(1091960237, _in);
 }
 
 export async function StructInputStructOutput(_in: Person) : Promise<Person> {
-	return wails.CallByID(3835643147, _in);
+	return Call.ByID(3835643147, _in);
 }
 
 export async function StructPointerInputErrorOutput(_in: Person | null) : Promise<void> {
-	return wails.CallByID(2447692557, _in);
+	return Call.ByID(2447692557, _in);
 }
 
 export async function StructPointerInputStructPointerOutput(_in: Person | null) : Promise<Person> {
-	return wails.CallByID(2943477349, _in);
+	return Call.ByID(2943477349, _in);
 }
 
 export async function UInt16InUIntOut(_in: number) : Promise<number> {
-	return wails.CallByID(3401034892, _in);
+	return Call.ByID(3401034892, _in);
 }
 
 export async function UInt16PointerInAndOutput(_in: number | null) : Promise<number | null> {
-	return wails.CallByID(1236957573, _in);
+	return Call.ByID(1236957573, _in);
 }
 
 export async function UInt32InUIntOut(_in: number) : Promise<number> {
-	return wails.CallByID(1160383782, _in);
+	return Call.ByID(1160383782, _in);
 }
 
 export async function UInt32PointerInAndOutput(_in: number | null) : Promise<number | null> {
-	return wails.CallByID(1739300671, _in);
+	return Call.ByID(1739300671, _in);
 }
 
 export async function UInt64InUIntOut(_in: number) : Promise<number> {
-	return wails.CallByID(793803239, _in);
+	return Call.ByID(793803239, _in);
 }
 
 export async function UInt64PointerInAndOutput(_in: number | null) : Promise<number | null> {
-	return wails.CallByID(1403757716, _in);
+	return Call.ByID(1403757716, _in);
 }
 
 export async function UInt8InUIntOut(_in: number) : Promise<number> {
-	return wails.CallByID(2988345717, _in);
+	return Call.ByID(2988345717, _in);
 }
 
 export async function UInt8PointerInAndOutput(_in: number | null) : Promise<number | null> {
-	return wails.CallByID(518250834, _in);
+	return Call.ByID(518250834, _in);
 }
 
 export async function UIntInUIntOut(_in: number) : Promise<number> {
-	return wails.CallByID(2836661285, _in);
+	return Call.ByID(2836661285, _in);
 }
 
 export async function UIntPointerInAndOutput(_in: number | null) : Promise<number | null> {
-	return wails.CallByID(1367187362, _in);
+	return Call.ByID(1367187362, _in);
 }
 
diff --git a/v3/internal/parser/testdata/variable_single/frontend/bindings/main/GreetService.js b/v3/internal/parser/testdata/variable_single/frontend/bindings/main/GreetService.js
index a6214ec03ff..6e4ed88f979 100644
--- a/v3/internal/parser/testdata/variable_single/frontend/bindings/main/GreetService.js
+++ b/v3/internal/parser/testdata/variable_single/frontend/bindings/main/GreetService.js
@@ -2,6 +2,7 @@
 // Cynhyrchwyd y ffeil hon yn awtomatig. PEIDIWCH Â MODIWL
 // This file is automatically generated. DO NOT EDIT
 
+import {Call} from '@wailsio/runtime';
 
 /**
  * Greet someone 
@@ -10,5 +11,5 @@
  * @returns {Promise<string>}
  **/
 export async function Greet(name) {
-	return wails.CallByID(1411160069, ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByID(1411160069, ...Array.prototype.slice.call(arguments, 0));
 }
diff --git a/v3/internal/parser/testdata/variable_single/frontend/bindings/main/GreetService.name.js b/v3/internal/parser/testdata/variable_single/frontend/bindings/main/GreetService.name.js
index 28e42b26896..020458d0bb3 100644
--- a/v3/internal/parser/testdata/variable_single/frontend/bindings/main/GreetService.name.js
+++ b/v3/internal/parser/testdata/variable_single/frontend/bindings/main/GreetService.name.js
@@ -2,6 +2,7 @@
 // Cynhyrchwyd y ffeil hon yn awtomatig. PEIDIWCH Â MODIWL
 // This file is automatically generated. DO NOT EDIT
 
+import {Call} from '@wailsio/runtime';
 
 /**
  * Greet someone 
@@ -10,5 +11,5 @@
  * @returns {Promise<string>}
  **/
 export async function Greet(name) {
-	return wails.CallByName("main.GreetService.Greet", ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByName("main.GreetService.Greet", ...Array.prototype.slice.call(arguments, 0));
 }
diff --git a/v3/internal/parser/testdata/variable_single/frontend/bindings/main/GreetService.name.ts b/v3/internal/parser/testdata/variable_single/frontend/bindings/main/GreetService.name.ts
index 4078d56c682..e7884a90c3d 100644
--- a/v3/internal/parser/testdata/variable_single/frontend/bindings/main/GreetService.name.ts
+++ b/v3/internal/parser/testdata/variable_single/frontend/bindings/main/GreetService.name.ts
@@ -1,8 +1,9 @@
 // Cynhyrchwyd y ffeil hon yn awtomatig. PEIDIWCH Â MODIWL
 // This file is automatically generated. DO NOT EDIT
 
+import {Call} from '@wailsio/runtime';
 // Greet someone
 export async function Greet(name: string) : Promise<string> {
-	return wails.CallByName("main.GreetService.Greet", name);
+	return Call.ByName("main.GreetService.Greet", name);
 }
 
diff --git a/v3/internal/parser/testdata/variable_single/frontend/bindings/main/GreetService.ts b/v3/internal/parser/testdata/variable_single/frontend/bindings/main/GreetService.ts
index d16dfd2b5bc..497e17d2bf6 100644
--- a/v3/internal/parser/testdata/variable_single/frontend/bindings/main/GreetService.ts
+++ b/v3/internal/parser/testdata/variable_single/frontend/bindings/main/GreetService.ts
@@ -1,8 +1,9 @@
 // Cynhyrchwyd y ffeil hon yn awtomatig. PEIDIWCH Â MODIWL
 // This file is automatically generated. DO NOT EDIT
 
+import {Call} from '@wailsio/runtime';
 // Greet someone
 export async function Greet(name: string) : Promise<string> {
-	return wails.CallByID(1411160069, name);
+	return Call.ByID(1411160069, name);
 }
 
diff --git a/v3/internal/parser/testdata/variable_single_from_function/frontend/bindings/main/GreetService.js b/v3/internal/parser/testdata/variable_single_from_function/frontend/bindings/main/GreetService.js
index a6214ec03ff..6e4ed88f979 100644
--- a/v3/internal/parser/testdata/variable_single_from_function/frontend/bindings/main/GreetService.js
+++ b/v3/internal/parser/testdata/variable_single_from_function/frontend/bindings/main/GreetService.js
@@ -2,6 +2,7 @@
 // Cynhyrchwyd y ffeil hon yn awtomatig. PEIDIWCH Â MODIWL
 // This file is automatically generated. DO NOT EDIT
 
+import {Call} from '@wailsio/runtime';
 
 /**
  * Greet someone 
@@ -10,5 +11,5 @@
  * @returns {Promise<string>}
  **/
 export async function Greet(name) {
-	return wails.CallByID(1411160069, ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByID(1411160069, ...Array.prototype.slice.call(arguments, 0));
 }
diff --git a/v3/internal/parser/testdata/variable_single_from_function/frontend/bindings/main/GreetService.name.js b/v3/internal/parser/testdata/variable_single_from_function/frontend/bindings/main/GreetService.name.js
index 28e42b26896..020458d0bb3 100644
--- a/v3/internal/parser/testdata/variable_single_from_function/frontend/bindings/main/GreetService.name.js
+++ b/v3/internal/parser/testdata/variable_single_from_function/frontend/bindings/main/GreetService.name.js
@@ -2,6 +2,7 @@
 // Cynhyrchwyd y ffeil hon yn awtomatig. PEIDIWCH Â MODIWL
 // This file is automatically generated. DO NOT EDIT
 
+import {Call} from '@wailsio/runtime';
 
 /**
  * Greet someone 
@@ -10,5 +11,5 @@
  * @returns {Promise<string>}
  **/
 export async function Greet(name) {
-	return wails.CallByName("main.GreetService.Greet", ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByName("main.GreetService.Greet", ...Array.prototype.slice.call(arguments, 0));
 }
diff --git a/v3/internal/parser/testdata/variable_single_from_function/frontend/bindings/main/GreetService.name.ts b/v3/internal/parser/testdata/variable_single_from_function/frontend/bindings/main/GreetService.name.ts
index 4078d56c682..e7884a90c3d 100644
--- a/v3/internal/parser/testdata/variable_single_from_function/frontend/bindings/main/GreetService.name.ts
+++ b/v3/internal/parser/testdata/variable_single_from_function/frontend/bindings/main/GreetService.name.ts
@@ -1,8 +1,9 @@
 // Cynhyrchwyd y ffeil hon yn awtomatig. PEIDIWCH Â MODIWL
 // This file is automatically generated. DO NOT EDIT
 
+import {Call} from '@wailsio/runtime';
 // Greet someone
 export async function Greet(name: string) : Promise<string> {
-	return wails.CallByName("main.GreetService.Greet", name);
+	return Call.ByName("main.GreetService.Greet", name);
 }
 
diff --git a/v3/internal/parser/testdata/variable_single_from_function/frontend/bindings/main/GreetService.ts b/v3/internal/parser/testdata/variable_single_from_function/frontend/bindings/main/GreetService.ts
index d16dfd2b5bc..497e17d2bf6 100644
--- a/v3/internal/parser/testdata/variable_single_from_function/frontend/bindings/main/GreetService.ts
+++ b/v3/internal/parser/testdata/variable_single_from_function/frontend/bindings/main/GreetService.ts
@@ -1,8 +1,9 @@
 // Cynhyrchwyd y ffeil hon yn awtomatig. PEIDIWCH Â MODIWL
 // This file is automatically generated. DO NOT EDIT
 
+import {Call} from '@wailsio/runtime';
 // Greet someone
 export async function Greet(name: string) : Promise<string> {
-	return wails.CallByID(1411160069, name);
+	return Call.ByID(1411160069, name);
 }
 
diff --git a/v3/internal/parser/testdata/variable_single_from_other_function/frontend/bindings/main/GreetService.js b/v3/internal/parser/testdata/variable_single_from_other_function/frontend/bindings/main/GreetService.js
index dee2ada333a..7d9510b20ed 100644
--- a/v3/internal/parser/testdata/variable_single_from_other_function/frontend/bindings/main/GreetService.js
+++ b/v3/internal/parser/testdata/variable_single_from_other_function/frontend/bindings/main/GreetService.js
@@ -2,6 +2,7 @@
 // Cynhyrchwyd y ffeil hon yn awtomatig. PEIDIWCH Â MODIWL
 // This file is automatically generated. DO NOT EDIT
 
+import {Call} from '@wailsio/runtime';
 /**
  * @typedef {import('./models').Person} Person
  */
@@ -13,7 +14,7 @@
  * @returns {Promise<string>}
  **/
 export async function Greet(name) {
-	return wails.CallByID(1411160069, ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByID(1411160069, ...Array.prototype.slice.call(arguments, 0));
 }
 
 /**
@@ -23,5 +24,5 @@ export async function Greet(name) {
  * @returns {Promise<Person>}
  **/
 export async function NewPerson(name) {
-	return wails.CallByID(1661412647, ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByID(1661412647, ...Array.prototype.slice.call(arguments, 0));
 }
diff --git a/v3/internal/parser/testdata/variable_single_from_other_function/frontend/bindings/main/GreetService.name.js b/v3/internal/parser/testdata/variable_single_from_other_function/frontend/bindings/main/GreetService.name.js
index 9c4f2666956..38558e41c9c 100644
--- a/v3/internal/parser/testdata/variable_single_from_other_function/frontend/bindings/main/GreetService.name.js
+++ b/v3/internal/parser/testdata/variable_single_from_other_function/frontend/bindings/main/GreetService.name.js
@@ -2,6 +2,7 @@
 // Cynhyrchwyd y ffeil hon yn awtomatig. PEIDIWCH Â MODIWL
 // This file is automatically generated. DO NOT EDIT
 
+import {Call} from '@wailsio/runtime';
 /**
  * @typedef {import('./models').Person} Person
  */
@@ -13,7 +14,7 @@
  * @returns {Promise<string>}
  **/
 export async function Greet(name) {
-	return wails.CallByName("main.GreetService.Greet", ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByName("main.GreetService.Greet", ...Array.prototype.slice.call(arguments, 0));
 }
 
 /**
@@ -23,5 +24,5 @@ export async function Greet(name) {
  * @returns {Promise<Person>}
  **/
 export async function NewPerson(name) {
-	return wails.CallByName("main.GreetService.NewPerson", ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByName("main.GreetService.NewPerson", ...Array.prototype.slice.call(arguments, 0));
 }
diff --git a/v3/internal/parser/testdata/variable_single_from_other_function/frontend/bindings/main/GreetService.name.ts b/v3/internal/parser/testdata/variable_single_from_other_function/frontend/bindings/main/GreetService.name.ts
index e7cc3292f38..b5753395d13 100644
--- a/v3/internal/parser/testdata/variable_single_from_other_function/frontend/bindings/main/GreetService.name.ts
+++ b/v3/internal/parser/testdata/variable_single_from_other_function/frontend/bindings/main/GreetService.name.ts
@@ -1,15 +1,16 @@
 // Cynhyrchwyd y ffeil hon yn awtomatig. PEIDIWCH Â MODIWL
 // This file is automatically generated. DO NOT EDIT
 
+import {Call} from '@wailsio/runtime';
 import {Person} from './models';
 
 // Greet does XYZ
 export async function Greet(name: string) : Promise<string> {
-	return wails.CallByName("main.GreetService.Greet", name);
+	return Call.ByName("main.GreetService.Greet", name);
 }
 
 // NewPerson creates a new person
 export async function NewPerson(name: string) : Promise<Person> {
-	return wails.CallByName("main.GreetService.NewPerson", name);
+	return Call.ByName("main.GreetService.NewPerson", name);
 }
 
diff --git a/v3/internal/parser/testdata/variable_single_from_other_function/frontend/bindings/main/GreetService.ts b/v3/internal/parser/testdata/variable_single_from_other_function/frontend/bindings/main/GreetService.ts
index a66bf118b64..0b2c57590b6 100644
--- a/v3/internal/parser/testdata/variable_single_from_other_function/frontend/bindings/main/GreetService.ts
+++ b/v3/internal/parser/testdata/variable_single_from_other_function/frontend/bindings/main/GreetService.ts
@@ -1,15 +1,16 @@
 // Cynhyrchwyd y ffeil hon yn awtomatig. PEIDIWCH Â MODIWL
 // This file is automatically generated. DO NOT EDIT
 
+import {Call} from '@wailsio/runtime';
 import {Person} from './models';
 
 // Greet does XYZ
 export async function Greet(name: string) : Promise<string> {
-	return wails.CallByID(1411160069, name);
+	return Call.ByID(1411160069, name);
 }
 
 // NewPerson creates a new person
 export async function NewPerson(name: string) : Promise<Person> {
-	return wails.CallByID(1661412647, name);
+	return Call.ByID(1661412647, name);
 }
 
diff --git a/v3/internal/parser/testdata/variable_single_from_other_function/frontend/bindings/services/OtherService.js b/v3/internal/parser/testdata/variable_single_from_other_function/frontend/bindings/services/OtherService.js
index 59fa5a850e0..5729834914d 100644
--- a/v3/internal/parser/testdata/variable_single_from_other_function/frontend/bindings/services/OtherService.js
+++ b/v3/internal/parser/testdata/variable_single_from_other_function/frontend/bindings/services/OtherService.js
@@ -2,6 +2,7 @@
 // Cynhyrchwyd y ffeil hon yn awtomatig. PEIDIWCH Â MODIWL
 // This file is automatically generated. DO NOT EDIT
 
+import {Call} from '@wailsio/runtime';
 /**
  * @typedef {import('./models').Address} Address
  */
@@ -12,5 +13,5 @@
  * @returns {Promise<Address>}
  **/
 export async function Yay() {
-	return wails.CallByID(302702907, ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByID(302702907, ...Array.prototype.slice.call(arguments, 0));
 }
diff --git a/v3/internal/parser/testdata/variable_single_from_other_function/frontend/bindings/services/OtherService.name.js b/v3/internal/parser/testdata/variable_single_from_other_function/frontend/bindings/services/OtherService.name.js
index f6af59d6ede..4d3d71c5b4a 100644
--- a/v3/internal/parser/testdata/variable_single_from_other_function/frontend/bindings/services/OtherService.name.js
+++ b/v3/internal/parser/testdata/variable_single_from_other_function/frontend/bindings/services/OtherService.name.js
@@ -2,6 +2,7 @@
 // Cynhyrchwyd y ffeil hon yn awtomatig. PEIDIWCH Â MODIWL
 // This file is automatically generated. DO NOT EDIT
 
+import {Call} from '@wailsio/runtime';
 /**
  * @typedef {import('./models').Address} Address
  */
@@ -12,5 +13,5 @@
  * @returns {Promise<Address>}
  **/
 export async function Yay() {
-	return wails.CallByName("services.OtherService.Yay", ...Array.prototype.slice.call(arguments, 0));
+	return Call.ByName("services.OtherService.Yay", ...Array.prototype.slice.call(arguments, 0));
 }
diff --git a/v3/internal/parser/testdata/variable_single_from_other_function/frontend/bindings/services/OtherService.name.ts b/v3/internal/parser/testdata/variable_single_from_other_function/frontend/bindings/services/OtherService.name.ts
index bc71aefc828..44612231689 100644
--- a/v3/internal/parser/testdata/variable_single_from_other_function/frontend/bindings/services/OtherService.name.ts
+++ b/v3/internal/parser/testdata/variable_single_from_other_function/frontend/bindings/services/OtherService.name.ts
@@ -1,10 +1,11 @@
 // Cynhyrchwyd y ffeil hon yn awtomatig. PEIDIWCH Â MODIWL
 // This file is automatically generated. DO NOT EDIT
 
+import {Call} from '@wailsio/runtime';
 import {Address} from './models';
 
 // Yay does this and that
 export async function Yay() : Promise<Address> {
-	return wails.CallByName("services.OtherService.Yay");
+	return Call.ByName("services.OtherService.Yay");
 }
 
diff --git a/v3/internal/parser/testdata/variable_single_from_other_function/frontend/bindings/services/OtherService.ts b/v3/internal/parser/testdata/variable_single_from_other_function/frontend/bindings/services/OtherService.ts
index 57ae3a80159..c37328f5c21 100644
--- a/v3/internal/parser/testdata/variable_single_from_other_function/frontend/bindings/services/OtherService.ts
+++ b/v3/internal/parser/testdata/variable_single_from_other_function/frontend/bindings/services/OtherService.ts
@@ -1,10 +1,11 @@
 // Cynhyrchwyd y ffeil hon yn awtomatig. PEIDIWCH Â MODIWL
 // This file is automatically generated. DO NOT EDIT
 
+import {Call} from '@wailsio/runtime';
 import {Address} from './models';
 
 // Yay does this and that
 export async function Yay() : Promise<Address> {
-	return wails.CallByID(302702907);
+	return Call.ByID(302702907);
 }