diff --git a/src/kernels/serviceRegistry.node.ts b/src/kernels/serviceRegistry.node.ts
index 03545b1aa31..b19154606da 100644
--- a/src/kernels/serviceRegistry.node.ts
+++ b/src/kernels/serviceRegistry.node.ts
@@ -29,14 +29,14 @@ import { RawNotebookSupportedService } from './raw/session/rawNotebookSupportedS
 import { IKernelLauncher, ILocalKernelFinder, IRawNotebookProvider, IRawNotebookSupportedService } from './raw/types';
 import { DebuggerVariableRegistration } from './variables/debuggerVariableRegistration.node';
 import { DebuggerVariables } from './variables/debuggerVariables.node';
-import { JupyterVariables } from './variables/jupyterVariables.node';
-import { KernelVariables } from './variables/kernelVariables.node';
+import { JupyterVariables } from './variables/jupyterVariables';
+import { KernelVariables } from './variables/kernelVariables';
 import { PreWarmActivatedJupyterEnvironmentVariables } from './variables/preWarmVariables.node';
 import { PythonVariablesRequester } from './variables/pythonVariableRequester.node';
 import { ICellHashListener } from '../interactive-window/editor-integration/types';
 import { IInteractiveWindowDebugger } from '../interactive-window/types';
 import { MultiplexingDebugService } from '../platform/debugger/multiplexingDebugService.node';
-import { JupyterVariableDataProvider } from '../webviews/extension-side/dataviewer/jupyterVariableDataProvider.node';
+import { JupyterVariableDataProvider } from '../webviews/extension-side/dataviewer/jupyterVariableDataProvider';
 import { JupyterVariableDataProviderFactory } from '../webviews/extension-side/dataviewer/jupyterVariableDataProviderFactory.node';
 import {
     IJupyterVariableDataProvider,
diff --git a/src/kernels/variables/debuggerVariables.node.ts b/src/kernels/variables/debuggerVariables.node.ts
index b9b6bd4defd..aaaeaf817ac 100644
--- a/src/kernels/variables/debuggerVariables.node.ts
+++ b/src/kernels/variables/debuggerVariables.node.ts
@@ -11,7 +11,7 @@ import { IDebugService, IVSCodeNotebook } from '../../platform/common/applicatio
 import { DataFrameLoading, GetVariableInfo } from '../../platform/common/constants.node';
 import { traceError } from '../../platform/logging';
 import { IConfigurationService, Resource } from '../../platform/common/types';
-import { DebugLocationTracker } from '../../platform/debugger/debugLocationTracker.node';
+import { DebugLocationTracker } from '../../platform/debugger/debugLocationTracker';
 import { IDebuggingManager, KernelDebugMode } from '../../platform/debugger/types';
 import { sendTelemetryEvent } from '../../telemetry';
 import { Identifiers, Telemetry } from '../../webviews/webview-side/common/constants';
diff --git a/src/kernels/variables/jupyterVariables.node.ts b/src/kernels/variables/jupyterVariables.ts
similarity index 100%
rename from src/kernels/variables/jupyterVariables.node.ts
rename to src/kernels/variables/jupyterVariables.ts
diff --git a/src/kernels/variables/kernelVariables.node.ts b/src/kernels/variables/kernelVariables.ts
similarity index 100%
rename from src/kernels/variables/kernelVariables.node.ts
rename to src/kernels/variables/kernelVariables.ts
diff --git a/src/platform/debugger/debugLocationTracker.node.ts b/src/platform/debugger/debugLocationTracker.ts
similarity index 100%
rename from src/platform/debugger/debugLocationTracker.node.ts
rename to src/platform/debugger/debugLocationTracker.ts
diff --git a/src/platform/debugger/debugLocationTrackerFactory.node.ts b/src/platform/debugger/debugLocationTrackerFactory.node.ts
index 39981f81967..59bc96d1ab7 100644
--- a/src/platform/debugger/debugLocationTrackerFactory.node.ts
+++ b/src/platform/debugger/debugLocationTrackerFactory.node.ts
@@ -13,7 +13,7 @@ import {
 
 import { IDebugService } from '../common/application/types';
 import { IDisposableRegistry } from '../common/types';
-import { DebugLocationTracker } from './debugLocationTracker.node';
+import { DebugLocationTracker } from './debugLocationTracker';
 import { IDebugLocationTracker } from './types';
 
 // Hook up our IDebugLocationTracker to python debugging sessions
diff --git a/src/test/datascience/data-viewing/dataViewer.unit.test.ts b/src/test/datascience/data-viewing/dataViewer.unit.test.ts
index fe40c4cf3da..1702c3b6b30 100644
--- a/src/test/datascience/data-viewing/dataViewer.unit.test.ts
+++ b/src/test/datascience/data-viewing/dataViewer.unit.test.ts
@@ -19,7 +19,7 @@ import { IConfigurationService } from '../../../platform/common/types';
 import { IDataScienceErrorHandler } from '../../../platform/errors/types';
 import { CodeCssGenerator } from '../../../webviews/extension-side/codeCssGenerator.node';
 import { DataViewer } from '../../../webviews/extension-side/dataviewer/dataViewer.node';
-import { JupyterVariableDataProvider } from '../../../webviews/extension-side/dataviewer/jupyterVariableDataProvider.node';
+import { JupyterVariableDataProvider } from '../../../webviews/extension-side/dataviewer/jupyterVariableDataProvider';
 import { IDataViewer, IDataViewerDataProvider } from '../../../webviews/extension-side/dataviewer/types';
 import { ThemeFinder } from '../../../webviews/extension-side/themeFinder.node';
 import { ICodeCssGenerator, IThemeFinder } from '../../../webviews/extension-side/types';
diff --git a/src/test/datascience/debugLocationTracker.unit.test.ts b/src/test/datascience/debugLocationTracker.unit.test.ts
index e507556489a..706803423fb 100644
--- a/src/test/datascience/debugLocationTracker.unit.test.ts
+++ b/src/test/datascience/debugLocationTracker.unit.test.ts
@@ -4,7 +4,7 @@
 /* eslint-disable , , @typescript-eslint/no-explicit-any, no-multi-str, no-trailing-spaces */
 import { expect } from 'chai';
 import { DebugProtocol } from 'vscode-debugprotocol';
-import { DebugLocationTracker } from '../../platform/debugger/debugLocationTracker.node';
+import { DebugLocationTracker } from '../../platform/debugger/debugLocationTracker';
 import { IDebugLocation } from '../../platform/debugger/types';
 
 suite('Debug Location Tracker', () => {
diff --git a/src/webviews/extension-side/dataviewer/jupyterVariableDataProvider.node.ts b/src/webviews/extension-side/dataviewer/jupyterVariableDataProvider.ts
similarity index 100%
rename from src/webviews/extension-side/dataviewer/jupyterVariableDataProvider.node.ts
rename to src/webviews/extension-side/dataviewer/jupyterVariableDataProvider.ts
diff --git a/src/webviews/extension-side/serviceRegistry.node.ts b/src/webviews/extension-side/serviceRegistry.node.ts
index 70d3e3d810a..a1a279597a5 100644
--- a/src/webviews/extension-side/serviceRegistry.node.ts
+++ b/src/webviews/extension-side/serviceRegistry.node.ts
@@ -6,7 +6,7 @@ import { IExtensionSingleActivationService } from '../../platform/activation/typ
 import { IWebviewViewProvider, IWebviewPanelProvider } from '../../platform/common/application/types';
 import { IServiceManager } from '../../platform/ioc/types';
 import { IVariableViewProvider } from './variablesView/types';
-import { VariableViewActivationService } from './variablesView/variableViewActivationService.node';
+import { VariableViewActivationService } from './variablesView/variableViewActivationService';
 import { VariableViewProvider } from './variablesView/variableViewProvider.node';
 import { WebviewPanelProvider } from './webviewPanels/webviewPanelProvider.node';
 import { WebviewViewProvider } from './webviewViews/webviewViewProvider.node';
diff --git a/src/webviews/extension-side/variablesView/variableView.node.ts b/src/webviews/extension-side/variablesView/variableView.node.ts
index 37a6955c576..691e978340f 100644
--- a/src/webviews/extension-side/variablesView/variableView.node.ts
+++ b/src/webviews/extension-side/variablesView/variableView.node.ts
@@ -8,7 +8,7 @@ import { WebviewView as vscodeWebviewView } from 'vscode';
 
 import { captureTelemetry, sendTelemetryEvent } from '../../../telemetry';
 import { INotebookWatcher, IVariableViewPanelMapping } from './types';
-import { VariableViewMessageListener } from './variableViewMessageListener.node';
+import { VariableViewMessageListener } from './variableViewMessageListener';
 import { InteractiveWindowMessages, IShowDataViewer } from '../../../platform/messageTypes';
 import {
     IJupyterVariables,
diff --git a/src/webviews/extension-side/variablesView/variableViewActivationService.node.ts b/src/webviews/extension-side/variablesView/variableViewActivationService.ts
similarity index 100%
rename from src/webviews/extension-side/variablesView/variableViewActivationService.node.ts
rename to src/webviews/extension-side/variablesView/variableViewActivationService.ts
diff --git a/src/webviews/extension-side/variablesView/variableViewMessageListener.node.ts b/src/webviews/extension-side/variablesView/variableViewMessageListener.ts
similarity index 100%
rename from src/webviews/extension-side/variablesView/variableViewMessageListener.node.ts
rename to src/webviews/extension-side/variablesView/variableViewMessageListener.ts