diff --git a/packages/cra-template/template/src/index.js b/packages/cra-template/template/src/index.js
index 57e666da229..3b160160ba9 100644
--- a/packages/cra-template/template/src/index.js
+++ b/packages/cra-template/template/src/index.js
@@ -2,8 +2,8 @@ import React from "react"
 import ReactDOM from "react-dom"
 import "typeface-roboto"
 import App from "./App"
-import * as serviceWorker from "./serviceWorker"
 import ErrorBoundary from "./ErrorBoundary"
+import * as serviceWorkerRegistration from './serviceWorkerRegistration';
 import reportWebVitals from './reportWebVitals';
 
 const Root = () => (
@@ -19,7 +19,7 @@ ReactDOM.render(<Root />, document.getElementById("root"))
 // If you want your app to work offline and load faster, you can change
 // unregister() to register() below. Note this comes with some pitfalls.
 // Learn more about service workers: https://cra.link/PWA
-serviceWorker.unregister();
+serviceWorkerRegistration.unregister();
 
 // If you want to start measuring performance in your app, pass a function
 // to log results (for example: reportWebVitals(console.log))
diff --git a/packages/cra-template/template/src/serviceWorker.js b/packages/cra-template/template/src/serviceWorkerRegistration.js
similarity index 100%
rename from packages/cra-template/template/src/serviceWorker.js
rename to packages/cra-template/template/src/serviceWorkerRegistration.js