diff --git a/packages/react-scripts/scripts/eject.js b/packages/react-scripts/scripts/eject.js
index c0c498d12dff8d88a49d1e2d358366dc1bab2eed..9eb6d4fd44cde1e5df8a606de10ee7aa010a588c 100644
--- a/packages/react-scripts/scripts/eject.js
+++ b/packages/react-scripts/scripts/eject.js
@@ -94,10 +94,7 @@ prompt(
   delete appPackage.scripts['eject'];
   Object.keys(appPackage.scripts).forEach(function (key) {
     appPackage.scripts[key] = appPackage.scripts[key]
-      .replace(
-        new RegExp(ownPackageName + ' (\\w+)', 'g'),
-        'node scripts/$1.js'
-      );
+      .replace(/react-scripts (\w+)/g, 'node scripts/$1.js');
   });
 
   // Add Jest config
diff --git a/packages/react-scripts/scripts/init.js b/packages/react-scripts/scripts/init.js
index 222902a7413f19225044441e1e3e4c6d6fd961a3..cbefd413c293a908301ef275ec8242459c05ab02 100644
--- a/packages/react-scripts/scripts/init.js
+++ b/packages/react-scripts/scripts/init.js
@@ -24,10 +24,10 @@ module.exports = function(appPath, appName, verbose, originalDirectory) {
 
   // Setup the script rules
   appPackage.scripts = {
-    'start': ownPackageName + ' start',
-    'build': ownPackageName + ' build',
-    'test': ownPackageName + ' test --env=jsdom',
-    'eject': ownPackageName + ' eject'
+    'start': 'react-scripts start',
+    'build': 'react-scripts build',
+    'test': 'react-scripts test --env=jsdom',
+    'eject': 'react-scripts eject'
   };
 
   fs.writeFileSync(