diff --git a/src/LaunchConfiguration.ts b/src/LaunchConfiguration.ts
index 14209221..05d7d0b3 100644
--- a/src/LaunchConfiguration.ts
+++ b/src/LaunchConfiguration.ts
@@ -260,9 +260,16 @@ export interface LaunchConfiguration extends DebugProtocol.LaunchRequestArgument
     /**
      * The path used for the staging folder of roku-deploy
      * This should generally be set to "${cwd}/.roku-deploy-staging", but that's ultimately up to the debug client.
+     * @deprecated use `stagingDir` instead
      */
     stagingFolderPath?: string;
 
+    /**
+     * Path used for the staging folder where files are written right before being packaged. This folder will contain any roku-debug related sourcemaps,
+     * as well as having breakpoints injected into source code
+     */
+    stagingDir?: string;
+
     /**
      * What level of debug server's internal logging should be performed in the debug session
      */
diff --git a/src/debugSession/BrightScriptDebugSession.spec.ts b/src/debugSession/BrightScriptDebugSession.spec.ts
index c69f9382..395b0a3a 100644
--- a/src/debugSession/BrightScriptDebugSession.spec.ts
+++ b/src/debugSession/BrightScriptDebugSession.spec.ts
@@ -64,7 +64,7 @@ describe('BrightScriptDebugSession', () => {
         launchConfiguration = {
             rootDir: rootDir,
             outDir: outDir,
-            stagingFolderPath: stagingDir,
+            stagingDir: stagingDir,
             files: DefaultFiles
         } as any;
         session['launchConfiguration'] = launchConfiguration;
@@ -658,7 +658,7 @@ describe('BrightScriptDebugSession', () => {
         it('registers the entry breakpoint when stopOnEntry is enabled', async () => {
             (session as any).launchConfiguration = { stopOnEntry: true };
             session.projectManager.mainProject = <any>{
-                stagingFolderPath: stagingDir
+                stagingDir: stagingDir
             };
             let stub = sinon.stub(session.projectManager, 'registerEntryBreakpoint').returns(Promise.resolve());
             await session.handleEntryBreakpoint();
@@ -677,10 +677,10 @@ describe('BrightScriptDebugSession', () => {
         it('erases all staging folders when configured to do so', async () => {
             let stub = sinon.stub(fsExtra, 'removeSync').returns(null);
             session.projectManager.mainProject = <any>{
-                stagingFolderPath: 'stagingPathA'
+                stagingDir: 'stagingPathA'
             };
             session.projectManager.componentLibraryProjects.push(<any>{
-                stagingFolderPath: 'stagingPathB'
+                stagingDir: 'stagingPathB'
             });
             (session as any).launchConfiguration = {
                 retainStagingFolder: false
@@ -830,7 +830,7 @@ describe('BrightScriptDebugSession', () => {
                 session.projectManager.componentLibraryProjects.push(
                     new ComponentLibraryProject({
                         rootDir: complib1Dir,
-                        stagingFolderPath: stagingDir,
+                        stagingDir: stagingDir,
                         outDir: outDir,
                         libraryIndex: 1
                     } as Partial<ComponentLibraryConstructorParams> as any)
diff --git a/src/debugSession/BrightScriptDebugSession.ts b/src/debugSession/BrightScriptDebugSession.ts
index e7abae1b..962b3e7e 100644
--- a/src/debugSession/BrightScriptDebugSession.ts
+++ b/src/debugSession/BrightScriptDebugSession.ts
@@ -229,6 +229,7 @@ export class BrightScriptDebugSession extends BaseDebugSession {
         config.sceneGraphDebugCommandsPort ??= 8080;
         config.controlPort ??= 8081;
         config.brightScriptConsolePort ??= 8085;
+        config.stagingDir ??= config.stagingFolderPath;
         return config;
     }
 
@@ -628,7 +629,7 @@ export class BrightScriptDebugSession extends BaseDebugSession {
             raleTrackerTaskFileLocation: this.launchConfiguration.raleTrackerTaskFileLocation,
             injectRdbOnDeviceComponent: this.launchConfiguration.injectRdbOnDeviceComponent,
             rdbFilesBasePath: this.launchConfiguration.rdbFilesBasePath,
-            stagingFolderPath: this.launchConfiguration.stagingFolderPath
+            stagingDir: this.launchConfiguration.stagingDir
         });
 
         util.log('Moving selected files to staging area');
@@ -1439,7 +1440,7 @@ export class BrightScriptDebugSession extends BaseDebugSession {
         if (!this.enableDebugProtocol) {
             this.entryBreakpointWasHandled = true;
             if (this.launchConfiguration.stopOnEntry || this.launchConfiguration.deepLinkUrl) {
-                await this.projectManager.registerEntryBreakpoint(this.projectManager.mainProject.stagingFolderPath);
+                await this.projectManager.registerEntryBreakpoint(this.projectManager.mainProject.stagingDir);
             }
         }
     }
@@ -1468,14 +1469,14 @@ export class BrightScriptDebugSession extends BaseDebugSession {
 
             //if configured, delete the staging directory
             if (!this.launchConfiguration.retainStagingFolder) {
-                const stagingFolders = this.projectManager?.getStagingFolderPaths() ?? [];
-                this.logger.info('deleting staging folders', stagingFolders);
-                for (let stagingFolderPath of stagingFolders) {
+                const stagingDirs = this.projectManager?.getStagingDirs() ?? [];
+                this.logger.info('deleting staging folders', stagingDirs);
+                for (let stagingDir of stagingDirs) {
                     try {
-                        fsExtra.removeSync(stagingFolderPath);
+                        fsExtra.removeSync(stagingDir);
                     } catch (e) {
                         this.logger.error(e);
-                        util.log(`Error removing staging directory '${stagingFolderPath}': ${JSON.stringify(e)}`);
+                        util.log(`Error removing staging directory '${stagingDir}': ${JSON.stringify(e)}`);
                     }
                 }
             }
diff --git a/src/managers/BreakpointManager.spec.ts b/src/managers/BreakpointManager.spec.ts
index 746a611b..715e5ca0 100644
--- a/src/managers/BreakpointManager.spec.ts
+++ b/src/managers/BreakpointManager.spec.ts
@@ -388,7 +388,7 @@ describe('BreakpointManager', () => {
             await bpManager.writeBreakpointsForProject(new Project(<any>{
                 rootDir: rootDir,
                 outDir: outDir,
-                stagingFolderPath: stagingDir
+                stagingDir: stagingDir
             }));
 
             //it wrote the breakpoint in the correct location
@@ -429,7 +429,7 @@ describe('BreakpointManager', () => {
                     rootDir: rootDir,
                     outDir: s`${cwd}/out`,
                     sourceDirs: [sourceDir1],
-                    stagingFolderPath: stagingDir
+                    stagingDir: stagingDir
                 })
             );
 
@@ -467,7 +467,7 @@ describe('BreakpointManager', () => {
                     rootDir: rootDir,
                     outDir: s`${cwd}/out`,
                     sourceDirs: [sourceDir1, sourceDir2],
-                    stagingFolderPath: stagingDir
+                    stagingDir: stagingDir
                 })
             );
 
@@ -510,7 +510,7 @@ describe('BreakpointManager', () => {
                     rootDir: rootDir,
                     outDir: s`${cwd}/out`,
                     sourceDirs: [sourceDir1, sourceDir2],
-                    stagingFolderPath: stagingDir
+                    stagingDir: stagingDir
                 })
             );
 
@@ -552,7 +552,7 @@ describe('BreakpointManager', () => {
                     rootDir: rootDir,
                     outDir: s`${cwd}/out`,
                     sourceDirs: [sourceDir1, sourceDir2],
-                    stagingFolderPath: stagingDir
+                    stagingDir: stagingDir
                 })
             );
 
@@ -609,7 +609,7 @@ describe('BreakpointManager', () => {
                 ],
                 rootDir: s`${tmpDir}/dist`,
                 outDir: s`${tmpDir}/out`,
-                stagingFolderPath: stagingDir
+                stagingDir: stagingDir
             }));
 
             //the breakpoints should be placed in the proper locations
@@ -714,7 +714,7 @@ describe('BreakpointManager', () => {
                 files: [
                     'source/main.brs'
                 ],
-                stagingFolderPath: stagingDir,
+                stagingDir: stagingDir,
                 outDir: outDir,
                 rootDir: rootDir
             }));
@@ -726,7 +726,7 @@ describe('BreakpointManager', () => {
                 lineNumber: 2,
                 fileMappings: [],
                 rootDir: rootDir,
-                stagingFolderPath: stagingDir,
+                stagingDir: stagingDir,
                 enableSourceMaps: true
             });
 
@@ -775,7 +775,7 @@ describe('BreakpointManager', () => {
                 files: [
                     'source/main.brs'
                 ],
-                stagingFolderPath: stagingDir,
+                stagingDir: stagingDir,
                 outDir: outDir,
                 rootDir: rootDir
             }));
@@ -813,7 +813,7 @@ describe('BreakpointManager', () => {
                     dest: ''
                 }
             ],
-            stagingFolderPath: stagingDir,
+            stagingDir: stagingDir,
             outDir: outDir,
             rootDir: rootDir
         });
diff --git a/src/managers/BreakpointManager.ts b/src/managers/BreakpointManager.ts
index be71a303..76824b67 100644
--- a/src/managers/BreakpointManager.ts
+++ b/src/managers/BreakpointManager.ts
@@ -368,7 +368,7 @@ export class BreakpointManager {
                         ...project?.sourceDirs ?? [],
                         project.rootDir
                     ],
-                    project.stagingFolderPath,
+                    project.stagingDir,
                     project.fileMappings
                 );
 
@@ -376,7 +376,7 @@ export class BreakpointManager {
                     let relativeStagingPath = fileUtils.replaceCaseInsensitive(
                         stagingLocation.filePath,
                         fileUtils.standardizePath(
-                            fileUtils.removeTrailingSlash(project.stagingFolderPath) + '/'
+                            fileUtils.removeTrailingSlash(project.stagingDir) + '/'
                         ),
                         ''
                     );
@@ -384,7 +384,7 @@ export class BreakpointManager {
                         //replace staging folder path with nothing (so we can build a pkg path)
                         .replaceCaseInsensitive(
                             s`${stagingLocation.filePath}`,
-                            s`${project.stagingFolderPath}`,
+                            s`${project.stagingDir}`,
                             ''
                         )
                         //force to unix path separators
diff --git a/src/managers/LocationManager.spec.ts b/src/managers/LocationManager.spec.ts
index 8387a665..ca2294ac 100644
--- a/src/managers/LocationManager.spec.ts
+++ b/src/managers/LocationManager.spec.ts
@@ -52,7 +52,7 @@ describe('LocationManager', () => {
 
             let location = await locationManager.getSourceLocation({
                 stagingFilePath: stagingFilePath,
-                stagingFolderPath: stagingDir,
+                stagingDir: stagingDir,
                 fileMappings: [],
                 rootDir: rootDir,
                 lineNumber: 1,
@@ -76,7 +76,7 @@ describe('LocationManager', () => {
 
                 let location = await locationManager.getSourceLocation({
                     stagingFilePath: s`${stagingDir}/lib1.brs`,
-                    stagingFolderPath: stagingDir,
+                    stagingDir: stagingDir,
                     fileMappings: [{
                         src: s`${rootDir}/lib1.brs`,
                         dest: s`${stagingDir}/lib1.brs`
@@ -116,7 +116,7 @@ describe('LocationManager', () => {
 
                 let location = await locationManager.getSourceLocation({
                     stagingFilePath: stagingFilePath,
-                    stagingFolderPath: stagingDir,
+                    stagingDir: stagingDir,
                     fileMappings: [],
                     rootDir: rootDir,
                     lineNumber: 3,
@@ -142,7 +142,7 @@ describe('LocationManager', () => {
 
                 let location = await locationManager.getSourceLocation({
                     stagingFilePath: s`${stagingDir}/lib1.brs`,
-                    stagingFolderPath: stagingDir,
+                    stagingDir: stagingDir,
                     fileMappings: [{
                         src: s`${sourceDirs[0]}/lib1.brs`,
                         dest: '/lib1.brs'
@@ -169,7 +169,7 @@ describe('LocationManager', () => {
 
                 let location = await locationManager.getSourceLocation({
                     stagingFilePath: s`${stagingDir}/lib1.brs`,
-                    stagingFolderPath: stagingDir,
+                    stagingDir: stagingDir,
                     fileMappings: [{
                         src: s`${sourceDirs[1]}/lib1.brs`,
                         dest: '/lib1.brs'
@@ -195,7 +195,7 @@ describe('LocationManager', () => {
 
                 let location = await locationManager.getSourceLocation({
                     stagingFilePath: s`${stagingDir}/lib1.brs`,
-                    stagingFolderPath: stagingDir,
+                    stagingDir: stagingDir,
                     fileMappings: [{
                         src: s`${sourceDirs[2]}/lib1.brs`,
                         dest: '/lib1.brs'
diff --git a/src/managers/LocationManager.ts b/src/managers/LocationManager.ts
index 91a712ec..e0433898 100644
--- a/src/managers/LocationManager.ts
+++ b/src/managers/LocationManager.ts
@@ -18,7 +18,7 @@ export class LocationManager {
      */
     public async getSourceLocation(options: GetSourceLocationOptions): Promise<SourceLocation> {
         let rootDir = s`${options.rootDir}`;
-        let stagingFolderPath = s`${options.stagingFolderPath}`;
+        let stagingDir = s`${options.stagingDir}`;
         let currentFilePath = s`${options.stagingFilePath}`;
         let sourceDirs = options.sourceDirs ? options.sourceDirs.map(x => s`${x}`) : [];
         //throw out any sourceDirs pointing the rootDir
@@ -62,7 +62,7 @@ export class LocationManager {
         //if we have sourceDirs, rootDir is the project's OUTPUT folder, so skip looking for files there, and
         //instead walk backwards through sourceDirs until we find the file we want
         if (sourceDirs.length > 0) {
-            let relativeFilePath = fileUtils.getRelativePath(stagingFolderPath, currentFilePath);
+            let relativeFilePath = fileUtils.getRelativePath(stagingDir, currentFilePath);
             let sourceDirsFilePath = await fileUtils.findFirstRelativeFile(relativeFilePath, sourceDirs);
             //if we found a file in one of the sourceDirs, use that
             if (sourceDirsFilePath) {
@@ -104,18 +104,18 @@ export class LocationManager {
         sourceLineNumber: number,
         sourceColumnIndex: number,
         sourceDirs: string[],
-        stagingFolderPath: string,
+        stagingDir: string,
         fileMappings: Array<{ src: string; dest: string }>
     ): Promise<{ type: 'fileMap' | 'sourceDirs' | 'sourceMap'; locations: SourceLocation[] }> {
 
         sourceFilePath = s`${sourceFilePath}`;
         sourceDirs = sourceDirs.map(x => s`${x}`);
-        stagingFolderPath = s`${stagingFolderPath}`;
+        stagingDir = s`${stagingDir}`;
 
         //look through the sourcemaps in the staging folder for any instances of this source location
         let locations = await this.sourceMapManager.getGeneratedLocations(
             glob.sync('**/*.map', {
-                cwd: stagingFolderPath,
+                cwd: stagingDir,
                 absolute: true
             }),
             {
@@ -141,7 +141,7 @@ export class LocationManager {
         let parentFolderPath = fileUtils.findFirstParent(sourceFilePath, sourceDirs);
         if (parentFolderPath) {
             let relativeFilePath = fileUtils.replaceCaseInsensitive(sourceFilePath, parentFolderPath, '');
-            let stagingFilePathAbsolute = path.join(stagingFolderPath, relativeFilePath);
+            let stagingFilePathAbsolute = path.join(stagingDir, relativeFilePath);
             return {
                 type: 'sourceDirs',
                 locations: [{
@@ -180,7 +180,7 @@ export interface GetSourceLocationOptions {
     /**
      * The absolute path to the staging folder
      */
-    stagingFolderPath: string;
+    stagingDir: string;
 
     /**
      * The absolute path to the file in the staging folder
diff --git a/src/managers/ProjectManager.spec.ts b/src/managers/ProjectManager.spec.ts
index e86b92ee..cf1c4d44 100644
--- a/src/managers/ProjectManager.spec.ts
+++ b/src/managers/ProjectManager.spec.ts
@@ -19,9 +19,9 @@ let cwd = fileUtils.standardizePath(process.cwd());
 let tempPath = s`${cwd}/.tmp`;
 let rootDir = s`${tempPath}/rootDir`;
 let outDir = s`${tempPath}/outDir`;
-let stagingFolderPath = s`${outDir}/stagingDir`;
+let stagingDir = s`${outDir}/stagingDir`;
 let compLibOutDir = s`${outDir}/component-libraries`;
-let compLibStagingFolderPath = s`${rootDir}/component-libraries/CompLibA`;
+let compLibstagingDir = s`${rootDir}/component-libraries/CompLibA`;
 
 beforeEach(() => {
     fsExtra.ensureDirSync(tempPath);
@@ -44,10 +44,10 @@ describe('ProjectManager', () => {
         manager = new ProjectManager(breakpointManager, locationManager);
 
         manager.mainProject = <any>{
-            stagingFolderPath: stagingFolderPath
+            stagingDir: stagingDir
         };
         manager.componentLibraryProjects.push(<any>{
-            stagingFolderPath: compLibStagingFolderPath,
+            stagingDir: compLibstagingDir,
             libraryIndex: 1,
             outDir: compLibOutDir
         });
@@ -173,7 +173,7 @@ describe('ProjectManager', () => {
             expect(
                 await manager.getStagingFileInfo('pkg:/source/main.brs')
             ).to.include({
-                absolutePath: s`${stagingFolderPath}/source/main.brs`,
+                absolutePath: s`${stagingDir}/source/main.brs`,
                 //the relative path should not include a leading slash
                 relativePath: s`source/main.brs`
             });
@@ -182,13 +182,13 @@ describe('ProjectManager', () => {
         it(`searches for partial files in main project when '...' is encountered`, async () => {
             let stub = sinon.stub(fileUtils, 'findPartialFileInDirectory').callsFake((partialFilePath, directoryPath) => {
                 expect(partialFilePath).to.equal('...ource/main.brs');
-                expect(directoryPath).to.equal(manager.mainProject.stagingFolderPath);
+                expect(directoryPath).to.equal(manager.mainProject.stagingDir);
                 return Promise.resolve(`source/main.brs`);
             });
             expect(
                 (await manager.getStagingFileInfo('...ource/main.brs')).absolutePath
             ).to.equal(
-                s`${stagingFolderPath}/source/main.brs`
+                s`${stagingDir}/source/main.brs`
             );
             expect(stub.called).to.be.true;
         });
@@ -197,20 +197,20 @@ describe('ProjectManager', () => {
             expect(
                 (await manager.getStagingFileInfo('pkg:/source/main__lib1.brs')).absolutePath
             ).to.equal(
-                s`${compLibStagingFolderPath}/source/main__lib1.brs`
+                s`${compLibstagingDir}/source/main__lib1.brs`
             );
         });
 
         it(`detects partial paths to component library filenames`, async () => {
             let stub = sinon.stub(fileUtils, 'findPartialFileInDirectory').callsFake((partialFilePath, directoryPath) => {
                 expect(partialFilePath).to.equal('...ource/main__lib1.brs');
-                expect(directoryPath).to.equal(manager.componentLibraryProjects[0].stagingFolderPath);
+                expect(directoryPath).to.equal(manager.componentLibraryProjects[0].stagingDir);
                 return Promise.resolve(`source/main__lib1.brs`);
             });
             let info = await manager.getStagingFileInfo('...ource/main__lib1.brs');
             expect(info).to.deep.include({
                 relativePath: s`source/main__lib1.brs`,
-                absolutePath: s`${compLibStagingFolderPath}/source/main__lib1.brs`
+                absolutePath: s`${compLibstagingDir}/source/main__lib1.brs`
             });
             expect(info.project).to.include({
                 outDir: compLibOutDir
@@ -224,7 +224,7 @@ describe('ProjectManager', () => {
         it(`does not crash when file is missing`, async () => {
             manager.mainProject.fileMappings = [];
             let sourceLocation = await manager.getSourceLocation('pkg:/source/file-we-dont-know-about.brs', 1);
-            expect(n(sourceLocation.filePath)).to.equal(n(`${stagingFolderPath}/source/file-we-dont-know-about.brs`));
+            expect(n(sourceLocation.filePath)).to.equal(n(`${stagingDir}/source/file-we-dont-know-about.brs`));
         });
 
         it('handles truncated paths', async () => {
@@ -241,13 +241,13 @@ describe('ProjectManager', () => {
                 'source/file2.brs'
             ]));
             manager.mainProject.rootDir = rootDir;
-            manager.mainProject.stagingFolderPath = stagingFolderPath;
+            manager.mainProject.stagingDir = stagingDir;
             manager.mainProject.fileMappings = [{
                 src: s`${rootDir}/source/file1.brs`,
-                dest: s`${stagingFolderPath}/source/file1.brs`
+                dest: s`${stagingDir}/source/file1.brs`
             }, {
                 src: s`${rootDir}/source/file2.brs`,
-                dest: s`${stagingFolderPath}/source/file2.brs`
+                dest: s`${stagingDir}/source/file2.brs`
             }];
 
             let sourceLocation = await manager.getSourceLocation('...rce/file1.brs', 1);
@@ -268,13 +268,13 @@ describe('ProjectManager', () => {
                 }
             });
             manager.mainProject.rootDir = rootDir;
-            manager.mainProject.stagingFolderPath = stagingFolderPath;
+            manager.mainProject.stagingDir = stagingDir;
             manager.mainProject.fileMappings = [{
                 src: s`${rootDir}/source/file1.brs`,
-                dest: s`${stagingFolderPath}/source/file1.brs`
+                dest: s`${stagingDir}/source/file1.brs`
             }, {
                 src: s`${rootDir}/source/file2.brs`,
-                dest: s`${stagingFolderPath}/source/file2.brs`
+                dest: s`${stagingDir}/source/file2.brs`
             }];
 
             let sourceLocation = await manager.getSourceLocation('pkg:source/file1.brs', 1);
@@ -304,7 +304,7 @@ describe('Project', () => {
             injectRdbOnDeviceComponent: true,
             rdbFilesBasePath: rdbFilesBasePath,
             sourceDirs: [s`${cwd}/source1`],
-            stagingFolderPath: stagingFolderPath,
+            stagingDir: stagingDir,
             raleTrackerTaskFileLocation: 'z'
         });
     });
@@ -320,7 +320,7 @@ describe('Project', () => {
         expect(project.injectRaleTrackerTask).to.equal(true);
         expect(project.outDir).to.eql(outDir);
         expect(project.sourceDirs).to.eql([s`${cwd}/source1`]);
-        expect(project.stagingFolderPath).to.eql(stagingFolderPath);
+        expect(project.stagingDir).to.eql(stagingDir);
         expect(project.raleTrackerTaskFileLocation).to.eql('z');
         expect(project.injectRdbOnDeviceComponent).to.equal(true);
         expect(project.rdbFilesBasePath).to.eql(rdbFilesBasePath);
@@ -336,17 +336,17 @@ describe('Project', () => {
             project.raleTrackerTaskFileLocation = undefined;
             project.rootDir = rootDir;
             project.outDir = outDir;
-            project.stagingFolderPath = stagingFolderPath;
+            project.stagingDir = stagingDir;
             fsExtra.ensureDirSync(project.rootDir);
             fsExtra.ensureDirSync(project.outDir);
-            fsExtra.ensureDirSync(project.stagingFolderPath);
+            fsExtra.ensureDirSync(project.stagingDir);
 
             fsExtra.writeFileSync(s`${project.rootDir}/manifest`, 'bs_const=b=true');
             project.files = [
                 'manifest'
             ];
             await project.stage();
-            expect(fsExtra.pathExistsSync(`${stagingFolderPath}/manifest`)).to.be.true;
+            expect(fsExtra.pathExistsSync(`${stagingDir}/manifest`)).to.be.true;
         });
     });
 
@@ -443,7 +443,7 @@ describe('Project', () => {
             let filePath = s`${folder}/main.${fileExt}`;
 
             fsExtra.writeFileSync(filePath, fileContents);
-            project.stagingFolderPath = folder;
+            project.stagingDir = folder;
             project.injectRaleTrackerTask = true;
             //these file contents don't actually matter
             project.raleTrackerTaskFileLocation = raleTrackerTaskFileLocation;
@@ -456,7 +456,7 @@ describe('Project', () => {
             fsExtra.ensureDirSync(tempPath);
             fsExtra.writeFileSync(`${tempPath}/RALE.xml`, 'test contents');
             await doTest(`sub main()\nend sub`, `sub main()\nend sub`);
-            expect(fsExtra.pathExistsSync(s`${project.stagingFolderPath}/components/TrackerTask.xml`), 'TrackerTask.xml was not copied to staging').to.be.true;
+            expect(fsExtra.pathExistsSync(s`${project.stagingDir}/components/TrackerTask.xml`), 'TrackerTask.xml was not copied to staging').to.be.true;
         });
 
         it('works for inline comments brs files', async () => {
@@ -556,7 +556,7 @@ describe('Project', () => {
             let filePath = s`${folder}/main.${fileExt}`;
 
             fsExtra.writeFileSync(filePath, fileContents);
-            project.stagingFolderPath = folder;
+            project.stagingDir = folder;
             project.injectRdbOnDeviceComponent = injectRdbOnDeviceComponent;
             project.rdbFilesBasePath = rdbFilesBasePath;
             await project.copyAndTransformRDB();
@@ -567,8 +567,8 @@ describe('Project', () => {
         it('copies the RDB files', async () => {
             fsExtra.ensureDirSync(tempPath);
             await doTest(`sub main()\nend sub`, `sub main()\nend sub`);
-            expect(fsExtra.pathExistsSync(s`${project.stagingFolderPath}/${sourceFileRelativePath}`), `${sourceFileRelativePath} was not copied to staging`).to.be.true;
-            expect(fsExtra.pathExistsSync(s`${project.stagingFolderPath}/${componentsFileRelativePath}`), `${componentsFileRelativePath} was not copied to staging`).to.be.true;
+            expect(fsExtra.pathExistsSync(s`${project.stagingDir}/${sourceFileRelativePath}`), `${sourceFileRelativePath} was not copied to staging`).to.be.true;
+            expect(fsExtra.pathExistsSync(s`${project.stagingDir}/${componentsFileRelativePath}`), `${componentsFileRelativePath} was not copied to staging`).to.be.true;
         });
 
         it('works for inline comments brs files', async () => {
@@ -587,8 +587,8 @@ describe('Project', () => {
         //     let brsSample = `\nsub main()\n  screen.show\n  ' ${Project.RDB_ODC_ENTRY}\nend sub`;
         //     project.injectRdbOnDeviceComponent = false
         //     await doTest(brsSample, brsSample, 'brs', false);
-        //     expect(fsExtra.pathExistsSync(s`${project.stagingFolderPath}/${sourceFileRelativePath}`), `${sourceFileRelativePath} should not have been copied to staging`).to.be.false;
-        //     expect(fsExtra.pathExistsSync(s`${project.stagingFolderPath}/${componentsFileRelativePath}`), `${componentsFileRelativePath} should not have been copied to staging`).to.be.false;
+        //     expect(fsExtra.pathExistsSync(s`${project.stagingDir}/${sourceFileRelativePath}`), `${sourceFileRelativePath} should not have been copied to staging`).to.be.false;
+        //     expect(fsExtra.pathExistsSync(s`${project.stagingDir}/${componentsFileRelativePath}`), `${componentsFileRelativePath} should not have been copied to staging`).to.be.false;
         // });
 
         it('works for in line comments in xml files', async () => {
@@ -652,9 +652,9 @@ describe('Project', () => {
 
     describe('zipPackage', () => {
         it('excludes sourcemaps', async () => {
-            fsExtra.outputFileSync(`${project.stagingFolderPath}/manifest`, '#stuff');
-            fsExtra.outputFileSync(`${project.stagingFolderPath}/source/main.brs`, 'sub main() : end sub');
-            fsExtra.outputFileSync(`${project.stagingFolderPath}/source/main.brs.map`, '{}');
+            fsExtra.outputFileSync(`${project.stagingDir}/manifest`, '#stuff');
+            fsExtra.outputFileSync(`${project.stagingDir}/source/main.brs`, 'sub main() : end sub');
+            fsExtra.outputFileSync(`${project.stagingDir}/source/main.brs.map`, '{}');
             await project.zipPackage({ retainStagingFolder: true });
             const zipPath = path.join(
                 project.outDir,
@@ -680,7 +680,7 @@ describe('ComponentLibraryProject', () => {
             bsConst: { b: true },
             injectRaleTrackerTask: true,
             sourceDirs: [s`${tempPath}/source1`],
-            stagingFolderPath: s`${outDir}/complib1-staging`,
+            stagingDir: s`${outDir}/complib1-staging`,
             raleTrackerTaskFileLocation: 'z',
             libraryIndex: 0,
             outFile: 'PrettyComponent.zip'
@@ -700,8 +700,8 @@ describe('ComponentLibraryProject', () => {
         it('adds postfix if path is 1) pkg:/ or 2) relative - no spaces in url', async () => {
             let project = new ComponentLibraryProject(params);
             project.fileMappings = [];
-            fsExtra.outputFileSync(`${params.stagingFolderPath}/source/main.brs`, '');
-            fsExtra.outputFileSync(`${params.stagingFolderPath}/components/Component1.xml`, `
+            fsExtra.outputFileSync(`${params.stagingDir}/source/main.brs`, '');
+            fsExtra.outputFileSync(`${params.stagingDir}/components/Component1.xml`, `
                 <component name="CustomComponent" extends="Rectangle">
                     <script type="text/brightscript" uri="common:/LibCore/v30/bslCore.brs"/>
                     <script type="text/brightscript" uri="CustomComponent.brs"/>
@@ -710,7 +710,7 @@ describe('ComponentLibraryProject', () => {
             `);
             await project.postfixFiles();
             expect(
-                fsExtra.readFileSync(`${params.stagingFolderPath}/components/Component1.xml`).toString()
+                fsExtra.readFileSync(`${params.stagingDir}/components/Component1.xml`).toString()
             ).to.eql(`
                 <component name="CustomComponent" extends="Rectangle">
                     <script type="text/brightscript" uri="common:/LibCore/v30/bslCore.brs"/>
@@ -723,8 +723,8 @@ describe('ComponentLibraryProject', () => {
         it('adds postfix if path is 1) pkg:/ or 2) relative - plus spaces in url', async () => {
             let project = new ComponentLibraryProject(params);
             project.fileMappings = [];
-            fsExtra.outputFileSync(`${params.stagingFolderPath}/source/main.brs`, '');
-            fsExtra.outputFileSync(`${params.stagingFolderPath}/components/Component1.xml`, `
+            fsExtra.outputFileSync(`${params.stagingDir}/source/main.brs`, '');
+            fsExtra.outputFileSync(`${params.stagingDir}/components/Component1.xml`, `
                 <component name="CustomComponent" extends="Rectangle">
                     <script type="text/brightscript" uri = "common:/LibCore/v30/bslCore.brs"/>
                     <script type="text/brightscript" uri = "CustomComponent.brs"/>
@@ -733,7 +733,7 @@ describe('ComponentLibraryProject', () => {
             `);
             await project.postfixFiles();
             expect(
-                fsExtra.readFileSync(`${params.stagingFolderPath}/components/Component1.xml`).toString()
+                fsExtra.readFileSync(`${params.stagingDir}/components/Component1.xml`).toString()
             ).to.eql(`
                 <component name="CustomComponent" extends="Rectangle">
                     <script type="text/brightscript" uri = "common:/LibCore/v30/bslCore.brs"/>
@@ -745,8 +745,8 @@ describe('ComponentLibraryProject', () => {
     });
 
     describe('stage', () => {
-        it('computes stagingFolderPath before calling getFileMappings', async () => {
-            delete params.stagingFolderPath;
+        it('computes stagingDir before calling getFileMappings', async () => {
+            delete params.stagingDir;
             let project = new ComponentLibraryProject(params);
 
             sinon.stub(rokuDeploy, 'getFilePaths').returns(Promise.resolve([
@@ -777,7 +777,7 @@ describe('ComponentLibraryProject', () => {
                     files: [
                         { src: src, dest: 'manifest' }
                     ],
-                    stagingFolderPath: s`${outDir}/complib1-staging`,
+                    stagingDir: s`${outDir}/complib1-staging`,
                     libraryIndex: 0,
                     // eslint-disable-next-line no-template-curly-in-string
                     outFile: '${title}.zip'
diff --git a/src/managers/ProjectManager.ts b/src/managers/ProjectManager.ts
index a16d7156..bd0c2748 100644
--- a/src/managers/ProjectManager.ts
+++ b/src/managers/ProjectManager.ts
@@ -58,12 +58,12 @@ export class ProjectManager {
     /**
      * Get the list of staging folder paths from all projects
      */
-    public getStagingFolderPaths() {
+    public getStagingDirs() {
         let projects = [
             ...(this.mainProject ? [this.mainProject] : []),
             ...(this.componentLibraryProjects ?? [])
         ];
-        return projects.map(x => x.stagingFolderPath);
+        return projects.map(x => x.stagingDir);
     }
 
     /**
@@ -126,7 +126,7 @@ export class ProjectManager {
                 fileMappings: project.fileMappings,
                 rootDir: project.rootDir,
                 stagingFilePath: stagingFileInfo.absolutePath,
-                stagingFolderPath: project.stagingFolderPath,
+                stagingDir: project.stagingDir,
                 sourceDirs: project.sourceDirs,
                 enableSourceMaps: this.launchConfiguration?.enableSourceMaps ?? true
             });
@@ -151,11 +151,11 @@ export class ProjectManager {
 
     /**
      *
-     * @param stagingFolderPath - the path to
+     * @param stagingDir - the path to
      */
-    public async registerEntryBreakpoint(stagingFolderPath: string) {
+    public async registerEntryBreakpoint(stagingDir: string) {
         //find the main function from the staging flder
-        let entryPoint = await fileUtils.findEntryPoint(stagingFolderPath);
+        let entryPoint = await fileUtils.findEntryPoint(stagingDir);
 
         //convert entry point staging location to source location
         let sourceLocation = await this.getSourceLocation(entryPoint.relativePath, entryPoint.lineNumber);
@@ -172,7 +172,7 @@ export class ProjectManager {
      * Given a debugger-relative file path, find the path to that file in the staging directory.
      * This supports the standard out dir, as well as component library out dirs
      * @param debuggerPath the path to the file which was provided by the debugger
-     * @param stagingFolderPath - the path to the root of the staging folder (where all of the files were copied before deployment)
+     * @param stagingDir - the path to the root of the staging folder (where all of the files were copied before deployment)
      * @return a full path to the file in the staging directory
      */
     public async getStagingFileInfo(debuggerPath: string) {
@@ -198,7 +198,7 @@ export class ProjectManager {
         if (util.getFileScheme(debuggerPath)) {
             relativePath = util.removeFileScheme(debuggerPath);
         } else {
-            relativePath = await fileUtils.findPartialFileInDirectory(debuggerPath, project.stagingFolderPath);
+            relativePath = await fileUtils.findPartialFileInDirectory(debuggerPath, project.stagingDir);
         }
         if (relativePath) {
             relativePath = fileUtils.removeLeadingSlash(
@@ -207,7 +207,7 @@ export class ProjectManager {
             );
             return {
                 relativePath: relativePath,
-                absolutePath: s`${project.stagingFolderPath}/${relativePath}`,
+                absolutePath: s`${project.stagingDir}/${relativePath}`,
                 project: project
             };
         } else {
@@ -226,7 +226,7 @@ export interface AddProjectParams {
     injectRdbOnDeviceComponent?: boolean;
     rdbFilesBasePath?: string;
     bsConst?: Record<string, boolean>;
-    stagingFolderPath?: string;
+    stagingDir?: string;
 }
 
 export class Project {
@@ -236,8 +236,7 @@ export class Project {
 
         assert(params?.outDir, 'outDir is required');
         this.outDir = fileUtils.standardizePath(params.outDir);
-
-        this.stagingFolderPath = params.stagingFolderPath ?? rokuDeploy.getOptions(this).stagingFolderPath;
+        this.stagingDir = params.stagingDir ?? rokuDeploy.getOptions(this).stagingDir;
         this.bsConst = params.bsConst;
         this.sourceDirs = (params.sourceDirs ?? [])
             //standardize every sourcedir
@@ -252,7 +251,7 @@ export class Project {
     public outDir: string;
     public sourceDirs: string[];
     public files: Array<FileEntry>;
-    public stagingFolderPath: string;
+    public stagingDir: string;
     public fileMappings: Array<{ src: string; dest: string }>;
     public bsConst: Record<string, boolean>;
     public injectRaleTrackerTask: boolean;
@@ -279,7 +278,7 @@ export class Project {
             for (let fileMapping of this.fileMappings) {
                 relativeFileMappings.push({
                     src: fileMapping.src,
-                    dest: fileUtils.replaceCaseInsensitive(fileMapping.dest, this.stagingFolderPath, '')
+                    dest: fileUtils.replaceCaseInsensitive(fileMapping.dest, this.stagingDir, '')
                 });
             }
             return Promise.resolve(relativeFileMappings);
@@ -288,7 +287,7 @@ export class Project {
         //copy all project files to the staging folder
         await rd.prepublishToStaging({
             rootDir: this.rootDir,
-            stagingFolderPath: this.stagingFolderPath,
+            stagingDir: this.stagingDir,
             files: this.files,
             outDir: this.outDir
         });
@@ -309,7 +308,7 @@ export class Project {
     private resolveFileMappingsForSourceDirs() {
         return Promise.all([
             this.fileMappings.map(async x => {
-                let stagingFilePathRelative = fileUtils.getRelativePath(this.stagingFolderPath, x.dest);
+                let stagingFilePathRelative = fileUtils.getRelativePath(this.stagingDir, x.dest);
                 let sourceDirFilePath = await fileUtils.findFirstRelativeFile(stagingFilePathRelative, this.sourceDirs);
                 if (sourceDirFilePath) {
                     x.src = sourceDirFilePath;
@@ -323,7 +322,7 @@ export class Project {
      */
     public async transformManifestWithBsConst() {
         if (this.bsConst) {
-            let manifestPath = s`${this.stagingFolderPath}/manifest`;
+            let manifestPath = s`${this.stagingDir}/manifest`;
             if (await fsExtra.pathExists(manifestPath)) {
                 // Update the bs_const values in the manifest in the staging folder before side loading the channel
                 let fileContents = (await fsExtra.readFile(manifestPath)).toString();
@@ -384,11 +383,11 @@ export class Project {
             return;
         }
         try {
-            await fsExtra.copy(this.raleTrackerTaskFileLocation, s`${this.stagingFolderPath}/components/TrackerTask.xml`);
+            await fsExtra.copy(this.raleTrackerTaskFileLocation, s`${this.stagingDir}/components/TrackerTask.xml`);
             this.logger.log('Tracker task successfully injected');
             // Search for the tracker task entry injection point
             const trackerReplacementResult = await replaceInFile({
-                files: `${this.stagingFolderPath}/**/*.+(xml|brs)`,
+                files: `${this.stagingDir}/**/*.+(xml|brs)`,
                 from: new RegExp(`^.*'\\s*${Project.RALE_TRACKER_ENTRY}.*$`, 'mig'),
                 to: (match: string) => {
                     // Strip off the comment
@@ -434,7 +433,7 @@ export class Project {
                 //only include files (i.e. skip directories)
                 if (await util.isFile(filePathAbsolute)) {
                     const relativePath = s`${filePathAbsolute}`.replace(s`${this.rdbFilesBasePath}`, '');
-                    const destinationPath = s`${this.stagingFolderPath}/${relativePath}`;
+                    const destinationPath = s`${this.stagingDir}/${relativePath}`;
                     promises.push(fsExtra.copy(filePathAbsolute, destinationPath));
                 }
                 await Promise.all(promises);
@@ -443,7 +442,7 @@ export class Project {
 
             // Search for the tracker task entry injection point
             const replacementResult = await replaceInFile({
-                files: `${this.stagingFolderPath}/**/*.+(xml|brs)`,
+                files: `${this.stagingDir}/**/*.+(xml|brs)`,
                 from: new RegExp(`^.*'\\s*${Project.RDB_ODC_ENTRY}.*$`, 'mig'),
                 to: (match: string) => {
                     // Strip off the comment
@@ -509,7 +508,7 @@ export class Project {
         let fileMappings = await rokuDeploy.getFilePaths(this.files, this.rootDir);
         for (let mapping of fileMappings) {
             //if the dest path is relative, make it absolute (relative to the staging dir)
-            mapping.dest = path.resolve(this.stagingFolderPath, mapping.dest);
+            mapping.dest = path.resolve(this.stagingDir, mapping.dest);
             //standardize the paths once here, and don't need to do it again anywhere else in this project
             mapping.src = fileUtils.standardizePath(mapping.src);
             mapping.dest = fileUtils.standardizePath(mapping.dest);
@@ -572,8 +571,8 @@ export class ComponentLibraryProject extends Project {
          */
         this.fileMappings = await this.getFileMappings();
 
-        let expectedManifestDestPath = fileUtils.standardizePath(`${this.stagingFolderPath}/manifest`).toLowerCase();
-        //find the file entry with the `dest` value of `${stagingFolderPath}/manifest` (case insensitive)
+        let expectedManifestDestPath = fileUtils.standardizePath(`${this.stagingDir}/manifest`).toLowerCase();
+        //find the file entry with the `dest` value of `${stagingDir}/manifest` (case insensitive)
         let manifestFileEntry = this.fileMappings.find(x => x.dest.toLowerCase() === expectedManifestDestPath);
         if (manifestFileEntry) {
             //read the manifest from `src` since nothing has been copied to staging yet
@@ -583,18 +582,18 @@ export class ComponentLibraryProject extends Project {
         }
         let fileNameWithoutExtension = path.basename(this.outFile, path.extname(this.outFile));
 
-        let defaultStagingFolderPath = this.stagingFolderPath;
+        let defaultStagingDir = this.stagingDir;
 
         //compute the staging folder path.
-        this.stagingFolderPath = s`${this.outDir}/${fileNameWithoutExtension}`;
+        this.stagingDir = s`${this.outDir}/${fileNameWithoutExtension}`;
 
         /*
-          The fileMappings were created using the default stagingFolderPath (because we need the manifest path
-          to compute the out file name and staging path), so we need to replace the default stagingFolderPath
-          with the actual stagingFolderPath.
+          The fileMappings were created using the default stagingDir (because we need the manifest path
+          to compute the out file name and staging path), so we need to replace the default stagingDir
+          with the actual stagingDir.
          */
         for (let fileMapping of this.fileMappings) {
-            fileMapping.dest = fileUtils.replaceCaseInsensitive(fileMapping.dest, defaultStagingFolderPath, this.stagingFolderPath);
+            fileMapping.dest = fileUtils.replaceCaseInsensitive(fileMapping.dest, defaultStagingDir, this.stagingDir);
         }
 
         return super.stage();
@@ -612,12 +611,12 @@ export class ComponentLibraryProject extends Project {
         let pathDetails = {};
         await Promise.all(this.fileMappings.map(async (fileMapping) => {
             let relativePath = fileUtils.removeLeadingSlash(
-                fileUtils.getRelativePath(this.stagingFolderPath, fileMapping.dest)
+                fileUtils.getRelativePath(this.stagingDir, fileMapping.dest)
             );
             let postfixedPath = fileUtils.postfixFilePath(relativePath, this.postfix, ['.brs']);
             if (postfixedPath !== relativePath) {
                 // Rename the brs files to include the postfix namespacing tag
-                await fsExtra.move(fileMapping.dest, path.join(this.stagingFolderPath, postfixedPath));
+                await fsExtra.move(fileMapping.dest, path.join(this.stagingDir, postfixedPath));
                 // Add to the map of original paths and the new paths
                 pathDetails[postfixedPath] = relativePath;
             }
@@ -626,8 +625,8 @@ export class ComponentLibraryProject extends Project {
         // Update all the file name references in the library to the new file names
         await replaceInFile({
             files: [
-                path.join(this.stagingFolderPath, '**/*.xml'),
-                path.join(this.stagingFolderPath, '**/*.brs')
+                path.join(this.stagingDir, '**/*.xml'),
+                path.join(this.stagingDir, '**/*.brs')
             ],
             from: /uri\s*=\s*"(.+)\.brs"/gi,
             to: (match: string) => {