diff --git a/src/cli/flash.js b/src/cli/flash.js
index 8b91c3f76..b44c3aeb8 100644
--- a/src/cli/flash.js
+++ b/src/cli/flash.js
@@ -38,9 +38,9 @@ module.exports = ({ commandProcessor, root }) => {
 			'port': {
 				describe: 'Use this serial port instead of auto-detecting. Useful if there are more than 1 connected device. Only available for serial'
 			},
-			'linux' : {
+			'tachyon' : {
 				boolean: true,
-				description: 'Flash one of the latest linux boards'
+				description: 'Flash Tachyon'
 			},
 			'verbose' : {
 				boolean: false,
@@ -63,7 +63,7 @@ module.exports = ({ commandProcessor, root }) => {
 			'$0 $command --local application.zip': 'Flash the pre-compiled binary and assets from the bundle to the device connected over USB',
 			'$0 $command --local tinker': 'Flash the default Tinker app to the device connected over USB',
 			'$0 $command --usb firmware.bin': 'Flash the binary over USB',
-			'$0 $command --linux /path/to/unpackaged-tool-and-files': 'Flash linux boards from the files in the specified directory. Use --verbose to see the progress',
+			'$0 $command --tachyon /path/to/unpackaged-tool-and-files': 'Flash Tachyon from the files in the specified directory. Use --verbose to see the progress',
 		},
 		epilogue: unindent(`
 		  When passing the --local flag, Device OS will be updated if the version on the device is outdated.
diff --git a/src/cmd/flash.js b/src/cmd/flash.js
index 7a70afdcf..94486afdd 100644
--- a/src/cmd/flash.js
+++ b/src/cmd/flash.js
@@ -42,10 +42,10 @@ module.exports = class FlashCommand extends CLICommandBase {
 		port,
 		yes,
 		verbose,
-		linux,
+		tachyon,
 		'application-only': applicationOnly
 	}) {
-		if (!linux && !device && !binary && !local) {
+		if (!tachyon && !device && !binary && !local) {
 			// if no device nor files are passed, show help
 			throw usageError('You must specify a device or a file');
 		}
@@ -59,14 +59,14 @@ module.exports = class FlashCommand extends CLICommandBase {
 		} else if (local) {
 			let allFiles = binary ? [binary, ...files] : files;
 			await this.flashLocal({ files: allFiles, applicationOnly, target });
-		} else if (linux) {
-			await this.flashLinux({ verbose, binary });
+		} else if (tachyon) {
+			await this.flashTachyon({ verbose, binary });
 		} else {
 			await this.flashCloud({ device, files, target });
 		}
 	}
 
-	async flashLinux({ verbose, binary }) {
+	async flashTachyon({ verbose, binary }) {
 		this.ui.write(`Ensure only one device is connected to a computer${os.EOL}`);
 
 		let unpackToolFolder = '';