diff --git a/packages/babel-plugin-flow-comments/test/fixtures/flow-comments/options.json b/packages/babel-plugin-flow-comments/test/fixtures/flow-comments/options.json
deleted file mode 100644
index e3fdfb4934..0000000000
--- a/packages/babel-plugin-flow-comments/test/fixtures/flow-comments/options.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "plugins": ["flow-comments"]
-}
diff --git a/packages/babel-plugin-flow-comments/.npmignore b/packages/babel-plugin-transform-flow-comments/.npmignore
similarity index 100%
rename from packages/babel-plugin-flow-comments/.npmignore
rename to packages/babel-plugin-transform-flow-comments/.npmignore
diff --git a/packages/babel-plugin-flow-comments/README.md b/packages/babel-plugin-transform-flow-comments/README.md
similarity index 82%
rename from packages/babel-plugin-flow-comments/README.md
rename to packages/babel-plugin-transform-flow-comments/README.md
index a8dd93e4ef..4a5afd27b8 100644
--- a/packages/babel-plugin-flow-comments/README.md
+++ b/packages/babel-plugin-transform-flow-comments/README.md
@@ -1,4 +1,4 @@
-# babel-plugin-flow-comments
+# babel-plugin-transform-flow-comments
 
 Turn flow type annotations into comments.
 
@@ -41,7 +41,7 @@ function foo(x /*: number*/) /*: string*/ {}
 ## Installation
 
 ```sh
-$ npm install babel-plugin-flow-comments
+$ npm install babel-plugin-transform-flow-comments
 ```
 
 ## Usage
@@ -52,20 +52,20 @@ $ npm install babel-plugin-flow-comments
 
 ```json
 {
-  "plugins": ["flow-comments"]
+  "plugins": ["transform-flow-comments"]
 }
 ```
 
 ### Via CLI
 
 ```sh
-$ babel --plugins flow-comments script.js
+$ babel --plugins transform-flow-comments script.js
 ```
 
 ### Via Node API
 
 ```javascript
 require("babel-core").transform("code", {
-  plugins: ["flow-comments"]
+  plugins: ["transform-flow-comments"]
 });
 ```
diff --git a/packages/babel-plugin-flow-comments/package.json b/packages/babel-plugin-transform-flow-comments/package.json
similarity index 81%
rename from packages/babel-plugin-flow-comments/package.json
rename to packages/babel-plugin-transform-flow-comments/package.json
index 4510943e0f..1e92bbfe94 100644
--- a/packages/babel-plugin-flow-comments/package.json
+++ b/packages/babel-plugin-transform-flow-comments/package.json
@@ -1,8 +1,8 @@
 {
-  "name": "babel-plugin-flow-comments",
+  "name": "babel-plugin-transform-flow-comments",
   "version": "6.3.19",
   "description": "Turn flow type annotations into comments",
-  "repository": "https://github.com/babel/babel/tree/master/packages/babel-plugin-flow-comments",
+  "repository": "https://github.com/babel/babel/tree/master/packages/babel-plugin-transform-flow-comments",
   "license": "MIT",
   "main": "lib/index.js",
   "keywords": [
diff --git a/packages/babel-plugin-flow-comments/src/index.js b/packages/babel-plugin-transform-flow-comments/src/index.js
similarity index 100%
rename from packages/babel-plugin-flow-comments/src/index.js
rename to packages/babel-plugin-transform-flow-comments/src/index.js
diff --git a/packages/babel-plugin-flow-comments/test/fixtures/flow-comments/export-type-alias/actual.js b/packages/babel-plugin-transform-flow-comments/test/fixtures/flow-comments/export-type-alias/actual.js
similarity index 100%
rename from packages/babel-plugin-flow-comments/test/fixtures/flow-comments/export-type-alias/actual.js
rename to packages/babel-plugin-transform-flow-comments/test/fixtures/flow-comments/export-type-alias/actual.js
diff --git a/packages/babel-plugin-flow-comments/test/fixtures/flow-comments/export-type-alias/expected.js b/packages/babel-plugin-transform-flow-comments/test/fixtures/flow-comments/export-type-alias/expected.js
similarity index 100%
rename from packages/babel-plugin-flow-comments/test/fixtures/flow-comments/export-type-alias/expected.js
rename to packages/babel-plugin-transform-flow-comments/test/fixtures/flow-comments/export-type-alias/expected.js
diff --git a/packages/babel-plugin-flow-comments/test/fixtures/flow-comments/import-type-alias/actual.js b/packages/babel-plugin-transform-flow-comments/test/fixtures/flow-comments/import-type-alias/actual.js
similarity index 100%
rename from packages/babel-plugin-flow-comments/test/fixtures/flow-comments/import-type-alias/actual.js
rename to packages/babel-plugin-transform-flow-comments/test/fixtures/flow-comments/import-type-alias/actual.js
diff --git a/packages/babel-plugin-flow-comments/test/fixtures/flow-comments/import-type-alias/expected.js b/packages/babel-plugin-transform-flow-comments/test/fixtures/flow-comments/import-type-alias/expected.js
similarity index 100%
rename from packages/babel-plugin-flow-comments/test/fixtures/flow-comments/import-type-alias/expected.js
rename to packages/babel-plugin-transform-flow-comments/test/fixtures/flow-comments/import-type-alias/expected.js
diff --git a/packages/babel-plugin-flow-comments/test/fixtures/flow-comments/optional-parameters/actual.js b/packages/babel-plugin-transform-flow-comments/test/fixtures/flow-comments/optional-parameters/actual.js
similarity index 100%
rename from packages/babel-plugin-flow-comments/test/fixtures/flow-comments/optional-parameters/actual.js
rename to packages/babel-plugin-transform-flow-comments/test/fixtures/flow-comments/optional-parameters/actual.js
diff --git a/packages/babel-plugin-flow-comments/test/fixtures/flow-comments/optional-parameters/expected.js b/packages/babel-plugin-transform-flow-comments/test/fixtures/flow-comments/optional-parameters/expected.js
similarity index 100%
rename from packages/babel-plugin-flow-comments/test/fixtures/flow-comments/optional-parameters/expected.js
rename to packages/babel-plugin-transform-flow-comments/test/fixtures/flow-comments/optional-parameters/expected.js
diff --git a/packages/babel-plugin-flow-comments/test/fixtures/flow-comments/optional-type/actual.js b/packages/babel-plugin-transform-flow-comments/test/fixtures/flow-comments/optional-type/actual.js
similarity index 100%
rename from packages/babel-plugin-flow-comments/test/fixtures/flow-comments/optional-type/actual.js
rename to packages/babel-plugin-transform-flow-comments/test/fixtures/flow-comments/optional-type/actual.js
diff --git a/packages/babel-plugin-flow-comments/test/fixtures/flow-comments/optional-type/expected.js b/packages/babel-plugin-transform-flow-comments/test/fixtures/flow-comments/optional-type/expected.js
similarity index 100%
rename from packages/babel-plugin-flow-comments/test/fixtures/flow-comments/optional-type/expected.js
rename to packages/babel-plugin-transform-flow-comments/test/fixtures/flow-comments/optional-type/expected.js
diff --git a/packages/babel-plugin-transform-flow-comments/test/fixtures/flow-comments/options.json b/packages/babel-plugin-transform-flow-comments/test/fixtures/flow-comments/options.json
new file mode 100644
index 0000000000..76e3f90b12
--- /dev/null
+++ b/packages/babel-plugin-transform-flow-comments/test/fixtures/flow-comments/options.json
@@ -0,0 +1,3 @@
+{
+  "plugins": ["transform-flow-comments"]
+}
diff --git a/packages/babel-plugin-flow-comments/test/fixtures/flow-comments/type-alias-with-comment/actual.js b/packages/babel-plugin-transform-flow-comments/test/fixtures/flow-comments/type-alias-with-comment/actual.js
similarity index 100%
rename from packages/babel-plugin-flow-comments/test/fixtures/flow-comments/type-alias-with-comment/actual.js
rename to packages/babel-plugin-transform-flow-comments/test/fixtures/flow-comments/type-alias-with-comment/actual.js
diff --git a/packages/babel-plugin-flow-comments/test/fixtures/flow-comments/type-alias-with-comment/expected.js b/packages/babel-plugin-transform-flow-comments/test/fixtures/flow-comments/type-alias-with-comment/expected.js
similarity index 100%
rename from packages/babel-plugin-flow-comments/test/fixtures/flow-comments/type-alias-with-comment/expected.js
rename to packages/babel-plugin-transform-flow-comments/test/fixtures/flow-comments/type-alias-with-comment/expected.js
diff --git a/packages/babel-plugin-flow-comments/test/fixtures/flow-comments/type-alias/actual.js b/packages/babel-plugin-transform-flow-comments/test/fixtures/flow-comments/type-alias/actual.js
similarity index 100%
rename from packages/babel-plugin-flow-comments/test/fixtures/flow-comments/type-alias/actual.js
rename to packages/babel-plugin-transform-flow-comments/test/fixtures/flow-comments/type-alias/actual.js
diff --git a/packages/babel-plugin-flow-comments/test/fixtures/flow-comments/type-alias/expected.js b/packages/babel-plugin-transform-flow-comments/test/fixtures/flow-comments/type-alias/expected.js
similarity index 100%
rename from packages/babel-plugin-flow-comments/test/fixtures/flow-comments/type-alias/expected.js
rename to packages/babel-plugin-transform-flow-comments/test/fixtures/flow-comments/type-alias/expected.js
diff --git a/packages/babel-plugin-flow-comments/test/fixtures/flow-comments/type-cast/actual.js b/packages/babel-plugin-transform-flow-comments/test/fixtures/flow-comments/type-cast/actual.js
similarity index 100%
rename from packages/babel-plugin-flow-comments/test/fixtures/flow-comments/type-cast/actual.js
rename to packages/babel-plugin-transform-flow-comments/test/fixtures/flow-comments/type-cast/actual.js
diff --git a/packages/babel-plugin-flow-comments/test/fixtures/flow-comments/type-cast/expected.js b/packages/babel-plugin-transform-flow-comments/test/fixtures/flow-comments/type-cast/expected.js
similarity index 100%
rename from packages/babel-plugin-flow-comments/test/fixtures/flow-comments/type-cast/expected.js
rename to packages/babel-plugin-transform-flow-comments/test/fixtures/flow-comments/type-cast/expected.js
diff --git a/packages/babel-plugin-flow-comments/test/fixtures/flow-comments/type/actual.js b/packages/babel-plugin-transform-flow-comments/test/fixtures/flow-comments/type/actual.js
similarity index 100%
rename from packages/babel-plugin-flow-comments/test/fixtures/flow-comments/type/actual.js
rename to packages/babel-plugin-transform-flow-comments/test/fixtures/flow-comments/type/actual.js
diff --git a/packages/babel-plugin-flow-comments/test/fixtures/flow-comments/type/expected.js b/packages/babel-plugin-transform-flow-comments/test/fixtures/flow-comments/type/expected.js
similarity index 100%
rename from packages/babel-plugin-flow-comments/test/fixtures/flow-comments/type/expected.js
rename to packages/babel-plugin-transform-flow-comments/test/fixtures/flow-comments/type/expected.js
diff --git a/packages/babel-plugin-flow-comments/test/index.js b/packages/babel-plugin-transform-flow-comments/test/index.js
similarity index 100%
rename from packages/babel-plugin-flow-comments/test/index.js
rename to packages/babel-plugin-transform-flow-comments/test/index.js