diff --git a/src/RendezvousTracker.spec.ts b/src/RendezvousTracker.spec.ts
index 1399186d..ff2b58db 100644
--- a/src/RendezvousTracker.spec.ts
+++ b/src/RendezvousTracker.spec.ts
@@ -4,6 +4,7 @@ import { assert, expect } from 'chai';
 import type { RendezvousHistory } from './RendezvousTracker';
 import { RendezvousTracker } from './RendezvousTracker';
 import { SceneGraphDebugCommandController } from './SceneGraphDebugCommandController';
+import type { LaunchConfiguration } from './LaunchConfiguration';
 
 describe('BrightScriptFileUtils ', () => {
     let rendezvousTracker: RendezvousTracker;
@@ -12,12 +13,14 @@ describe('BrightScriptFileUtils ', () => {
     let expectedHistory: RendezvousHistory;
 
     beforeEach(() => {
-        let deviceInfo = {
-            'software-version': '11.5.0',
+        let launchConfig = {
             'host': '192.168.1.5',
             'remotePort': 8060
         };
-        rendezvousTracker = new RendezvousTracker(deviceInfo);
+        let deviceInfo = {
+            softwareVersion: '11.5.0'
+        };
+        rendezvousTracker = new RendezvousTracker(deviceInfo, launchConfig as any);
         rendezvousTracker.registerSourceLocator(async (debuggerPath: string, lineNumber: number) => {
             //remove preceding pkg:
             if (debuggerPath.toLowerCase().startsWith('pkg:')) {
@@ -279,13 +282,13 @@ describe('BrightScriptFileUtils ', () => {
 
     describe('isEcpRendezvousTrackingSupported ', () => {
         it('works', () => {
-            rendezvousTracker['deviceInfo']['software-version'] = '11.0.0';
+            rendezvousTracker['deviceInfo'].softwareVersion = '11.0.0';
             expect(rendezvousTracker.doesHostSupportEcpRendezvousTracking).to.be.false;
 
-            rendezvousTracker['deviceInfo']['software-version'] = '11.5.0';
+            rendezvousTracker['deviceInfo'].softwareVersion = '11.5.0';
             expect(rendezvousTracker.doesHostSupportEcpRendezvousTracking).to.be.true;
 
-            rendezvousTracker['deviceInfo']['software-version'] = '12.0.1';
+            rendezvousTracker['deviceInfo'].softwareVersion = '12.0.1';
             expect(rendezvousTracker.doesHostSupportEcpRendezvousTracking).to.be.true;
         });
     });
diff --git a/src/RendezvousTracker.ts b/src/RendezvousTracker.ts
index 8f7716c5..1cf32322 100644
--- a/src/RendezvousTracker.ts
+++ b/src/RendezvousTracker.ts
@@ -12,8 +12,8 @@ import type { LaunchConfiguration } from './LaunchConfiguration';
 
 export class RendezvousTracker {
     constructor(
-        private launchConfiguration: LaunchConfiguration,
-        private deviceInfo: DeviceInfo
+        private deviceInfo: DeviceInfo,
+        private launchConfiguration: LaunchConfiguration
     ) {
         this.clientPathsMap = {};
         this.emitter = new EventEmitter();
diff --git a/src/adapters/DebugProtocolAdapter.spec.ts b/src/adapters/DebugProtocolAdapter.spec.ts
index 71952cbc..556ce524 100644
--- a/src/adapters/DebugProtocolAdapter.spec.ts
+++ b/src/adapters/DebugProtocolAdapter.spec.ts
@@ -47,12 +47,14 @@ describe('DebugProtocolAdapter', function() {
     let plugin: DebugProtocolServerTestPlugin;
     let breakpointManager: BreakpointManager;
     let projectManager: ProjectManager;
+    let launchConfig = {
+        host: '192.168.1.5',
+        remotePort: 8060
+    };
     let deviceInfo = {
-        'software-version': '11.5.0',
-        'host': '192.168.1.5',
-        'remotePort': 8060
+        softwareVersion: '11.5.0'
     };
-    let rendezvousTracker = new RendezvousTracker(deviceInfo);
+    let rendezvousTracker = new RendezvousTracker(deviceInfo, launchConfig as any);
 
     beforeEach(async () => {
         sinon.stub(console, 'log').callsFake((...args) => { });
@@ -62,7 +64,7 @@ describe('DebugProtocolAdapter', function() {
         };
         const sourcemapManager = new SourceMapManager();
         const locationManager = new LocationManager(sourcemapManager);
-        const rendezvousTracker = new RendezvousTracker({});
+        const rendezvousTracker = new RendezvousTracker({}, {} as any);
         breakpointManager = new BreakpointManager(sourcemapManager, locationManager);
         projectManager = new ProjectManager(breakpointManager, locationManager);
         projectManager.mainProject = new Project({
diff --git a/src/adapters/TelnetAdapter.spec.ts b/src/adapters/TelnetAdapter.spec.ts
index a40a6281..78069485 100644
--- a/src/adapters/TelnetAdapter.spec.ts
+++ b/src/adapters/TelnetAdapter.spec.ts
@@ -4,15 +4,18 @@ import { TelnetAdapter } from './TelnetAdapter';
 import * as dedent from 'dedent';
 import { HighLevelType } from '../interfaces';
 import { RendezvousTracker } from '../RendezvousTracker';
+import type { LaunchConfiguration } from '../LaunchConfiguration';
 
 describe('TelnetAdapter ', () => {
     let adapter: TelnetAdapter;
-    let deviceInfo = {
-        'software-version': '11.5.0',
+    let launchConfig = {
         'host': '192.168.1.5',
         'remotePort': 8060
     };
-    let rendezvousTracker = new RendezvousTracker(deviceInfo);
+    let deviceInfo = {
+        softwareVersion: '11.5.0'
+    };
+    let rendezvousTracker = new RendezvousTracker(deviceInfo, launchConfig as any);
 
     beforeEach(() => {
         adapter = new TelnetAdapter(
@@ -38,9 +41,9 @@ describe('TelnetAdapter ', () => {
                 vscode_is_string:falsetrue
                 vscode_is_string:falsefalse
                 vscode_is_string:truecat
-                vscode_is_string:truecat 
+                vscode_is_string:truecat
+                vscode_is_string:true
                 vscode_is_string:true
-                vscode_is_string:true 
             `).length).to.equal(6);
         });
         it('handles basic arrays', () => {
diff --git a/src/debugSession/BrightScriptDebugSession.ts b/src/debugSession/BrightScriptDebugSession.ts
index 53c401e5..60210811 100644
--- a/src/debugSession/BrightScriptDebugSession.ts
+++ b/src/debugSession/BrightScriptDebugSession.ts
@@ -445,7 +445,7 @@ export class BrightScriptDebugSession extends BaseDebugSession {
     }
 
     private async _initRendezvousTracking() {
-        this.rendezvousTracker = new RendezvousTracker(this.launchConfiguration, this.deviceInfo);
+        this.rendezvousTracker = new RendezvousTracker(this.deviceInfo, this.launchConfiguration);
 
         //pass the debug functions used to locate the client files and lines thought the adapter to the RendezvousTracker
         this.rendezvousTracker.registerSourceLocator(async (debuggerPath: string, lineNumber: number) => {