diff --git a/packages/@uppy/screen-capture/src/CaptureScreen.jsx b/packages/@uppy/screen-capture/src/RecorderScreen.jsx
similarity index 96%
rename from packages/@uppy/screen-capture/src/CaptureScreen.jsx
rename to packages/@uppy/screen-capture/src/RecorderScreen.jsx
index 323a3d487a..3ea9fb04cc 100644
--- a/packages/@uppy/screen-capture/src/CaptureScreen.jsx
+++ b/packages/@uppy/screen-capture/src/RecorderScreen.jsx
@@ -1,4 +1,3 @@
-// TODO: rename this file to RecorderScreen.jsx in the next major.
 /* eslint-disable react/jsx-props-no-spreading */
 import { h, Component } from 'preact'
 import RecordButton from './RecordButton.jsx'
diff --git a/packages/@uppy/screen-capture/src/ScreenCapture.jsx b/packages/@uppy/screen-capture/src/ScreenCapture.jsx
index 2ad3907d2f..488bfd7d6f 100644
--- a/packages/@uppy/screen-capture/src/ScreenCapture.jsx
+++ b/packages/@uppy/screen-capture/src/ScreenCapture.jsx
@@ -2,7 +2,7 @@ import { h } from 'preact'
 import { UIPlugin } from '@uppy/core'
 import getFileTypeExtension from '@uppy/utils/lib/getFileTypeExtension'
 import ScreenRecIcon from './ScreenRecIcon.jsx'
-import CaptureScreen from './CaptureScreen.jsx'
+import RecorderScreen from './RecorderScreen.jsx'
 
 import packageJson from '../package.json'
 import locale from './locale.js'
@@ -392,7 +392,7 @@ export default class ScreenCapture extends UIPlugin {
     }
 
     return (
-      <CaptureScreen
+      <RecorderScreen
         {...recorderState} // eslint-disable-line react/jsx-props-no-spreading
         onStartRecording={this.startRecording}
         onStopRecording={this.stopRecording}
diff --git a/packages/@uppy/screen-capture/src/StopWatch.jsx b/packages/@uppy/screen-capture/src/StopWatch.jsx
index c9ebc4aabd..866695b8b1 100644
--- a/packages/@uppy/screen-capture/src/StopWatch.jsx
+++ b/packages/@uppy/screen-capture/src/StopWatch.jsx
@@ -1,7 +1,6 @@
 import { h, Component } from 'preact'
 
-// TODO: rename this class to StopWatch in the next major.
-class Stopwatch extends Component {
+class StopWatch extends Component {
   constructor (props) {
     super(props)
     this.state = { elapsedTime: 0 }
@@ -105,4 +104,4 @@ class Stopwatch extends Component {
   }
 }
 
-export default Stopwatch
+export default StopWatch