diff --git a/packages/babel-generator/test/fixtures/types/XJSAttribute/actual.js b/packages/babel-generator/test/fixtures/types/JSXAttribute/actual.js
similarity index 100%
rename from packages/babel-generator/test/fixtures/types/XJSAttribute/actual.js
rename to packages/babel-generator/test/fixtures/types/JSXAttribute/actual.js
diff --git a/packages/babel-generator/test/fixtures/types/XJSAttribute/expected.js b/packages/babel-generator/test/fixtures/types/JSXAttribute/expected.js
similarity index 100%
rename from packages/babel-generator/test/fixtures/types/XJSAttribute/expected.js
rename to packages/babel-generator/test/fixtures/types/JSXAttribute/expected.js
diff --git a/packages/babel-generator/test/fixtures/types/XJSAttribute/options.json b/packages/babel-generator/test/fixtures/types/JSXAttribute/options.json
similarity index 100%
rename from packages/babel-generator/test/fixtures/types/XJSAttribute/options.json
rename to packages/babel-generator/test/fixtures/types/JSXAttribute/options.json
diff --git a/packages/babel-generator/test/fixtures/types/XJSElement-XJSOpeningElement-XJSClosingElement-XJSIdentifier/actual.js b/packages/babel-generator/test/fixtures/types/JSXElement-JSXOpeningElement-JSXClosingElement-JSXIdentifier/actual.js
similarity index 100%
rename from packages/babel-generator/test/fixtures/types/XJSElement-XJSOpeningElement-XJSClosingElement-XJSIdentifier/actual.js
rename to packages/babel-generator/test/fixtures/types/JSXElement-JSXOpeningElement-JSXClosingElement-JSXIdentifier/actual.js
diff --git a/packages/babel-generator/test/fixtures/types/XJSElement-XJSOpeningElement-XJSClosingElement-XJSIdentifier/expected.js b/packages/babel-generator/test/fixtures/types/JSXElement-JSXOpeningElement-JSXClosingElement-JSXIdentifier/expected.js
similarity index 100%
rename from packages/babel-generator/test/fixtures/types/XJSElement-XJSOpeningElement-XJSClosingElement-XJSIdentifier/expected.js
rename to packages/babel-generator/test/fixtures/types/JSXElement-JSXOpeningElement-JSXClosingElement-JSXIdentifier/expected.js
diff --git a/packages/babel-generator/test/fixtures/types/XJSElement-XJSOpeningElement-XJSClosingElement-XJSIdentifier/options.json b/packages/babel-generator/test/fixtures/types/JSXElement-JSXOpeningElement-JSXClosingElement-JSXIdentifier/options.json
similarity index 100%
rename from packages/babel-generator/test/fixtures/types/XJSElement-XJSOpeningElement-XJSClosingElement-XJSIdentifier/options.json
rename to packages/babel-generator/test/fixtures/types/JSXElement-JSXOpeningElement-JSXClosingElement-JSXIdentifier/options.json
diff --git a/packages/babel-generator/test/fixtures/types/XJSEmptyExpression/actual.js b/packages/babel-generator/test/fixtures/types/JSXEmptyExpression/actual.js
similarity index 100%
rename from packages/babel-generator/test/fixtures/types/XJSEmptyExpression/actual.js
rename to packages/babel-generator/test/fixtures/types/JSXEmptyExpression/actual.js
diff --git a/packages/babel-generator/test/fixtures/types/XJSEmptyExpression/expected.js b/packages/babel-generator/test/fixtures/types/JSXEmptyExpression/expected.js
similarity index 100%
rename from packages/babel-generator/test/fixtures/types/XJSEmptyExpression/expected.js
rename to packages/babel-generator/test/fixtures/types/JSXEmptyExpression/expected.js
diff --git a/packages/babel-generator/test/fixtures/types/XJSEmptyExpression/options.json b/packages/babel-generator/test/fixtures/types/JSXEmptyExpression/options.json
similarity index 100%
rename from packages/babel-generator/test/fixtures/types/XJSEmptyExpression/options.json
rename to packages/babel-generator/test/fixtures/types/JSXEmptyExpression/options.json
diff --git a/packages/babel-generator/test/fixtures/types/XJSExpressionContainer/actual.js b/packages/babel-generator/test/fixtures/types/JSXExpressionContainer/actual.js
similarity index 100%
rename from packages/babel-generator/test/fixtures/types/XJSExpressionContainer/actual.js
rename to packages/babel-generator/test/fixtures/types/JSXExpressionContainer/actual.js
diff --git a/packages/babel-generator/test/fixtures/types/XJSExpressionContainer/expected.js b/packages/babel-generator/test/fixtures/types/JSXExpressionContainer/expected.js
similarity index 100%
rename from packages/babel-generator/test/fixtures/types/XJSExpressionContainer/expected.js
rename to packages/babel-generator/test/fixtures/types/JSXExpressionContainer/expected.js
diff --git a/packages/babel-generator/test/fixtures/types/XJSExpressionContainer/options.json b/packages/babel-generator/test/fixtures/types/JSXExpressionContainer/options.json
similarity index 100%
rename from packages/babel-generator/test/fixtures/types/XJSExpressionContainer/options.json
rename to packages/babel-generator/test/fixtures/types/JSXExpressionContainer/options.json
diff --git a/packages/babel-generator/test/fixtures/types/XJSFragment-XJSOpeningFragment-XJSClosingFragment/actual.js b/packages/babel-generator/test/fixtures/types/JSXFragment-JSXOpeningFragment-JSXClosingFragment/actual.js
similarity index 100%
rename from packages/babel-generator/test/fixtures/types/XJSFragment-XJSOpeningFragment-XJSClosingFragment/actual.js
rename to packages/babel-generator/test/fixtures/types/JSXFragment-JSXOpeningFragment-JSXClosingFragment/actual.js
diff --git a/packages/babel-generator/test/fixtures/types/XJSFragment-XJSOpeningFragment-XJSClosingFragment/expected.js b/packages/babel-generator/test/fixtures/types/JSXFragment-JSXOpeningFragment-JSXClosingFragment/expected.js
similarity index 100%
rename from packages/babel-generator/test/fixtures/types/XJSFragment-XJSOpeningFragment-XJSClosingFragment/expected.js
rename to packages/babel-generator/test/fixtures/types/JSXFragment-JSXOpeningFragment-JSXClosingFragment/expected.js
diff --git a/packages/babel-generator/test/fixtures/types/XJSFragment-XJSOpeningFragment-XJSClosingFragment/options.json b/packages/babel-generator/test/fixtures/types/JSXFragment-JSXOpeningFragment-JSXClosingFragment/options.json
similarity index 100%
rename from packages/babel-generator/test/fixtures/types/XJSFragment-XJSOpeningFragment-XJSClosingFragment/options.json
rename to packages/babel-generator/test/fixtures/types/JSXFragment-JSXOpeningFragment-JSXClosingFragment/options.json
diff --git a/packages/babel-generator/test/fixtures/types/XJSMemberExpression/actual.js b/packages/babel-generator/test/fixtures/types/JSXMemberExpression/actual.js
similarity index 100%
rename from packages/babel-generator/test/fixtures/types/XJSMemberExpression/actual.js
rename to packages/babel-generator/test/fixtures/types/JSXMemberExpression/actual.js
diff --git a/packages/babel-generator/test/fixtures/types/XJSMemberExpression/expected.js b/packages/babel-generator/test/fixtures/types/JSXMemberExpression/expected.js
similarity index 100%
rename from packages/babel-generator/test/fixtures/types/XJSMemberExpression/expected.js
rename to packages/babel-generator/test/fixtures/types/JSXMemberExpression/expected.js
diff --git a/packages/babel-generator/test/fixtures/types/XJSMemberExpression/options.json b/packages/babel-generator/test/fixtures/types/JSXMemberExpression/options.json
similarity index 100%
rename from packages/babel-generator/test/fixtures/types/XJSMemberExpression/options.json
rename to packages/babel-generator/test/fixtures/types/JSXMemberExpression/options.json
diff --git a/packages/babel-generator/test/fixtures/types/XJSNamespacedName/actual.js b/packages/babel-generator/test/fixtures/types/JSXNamespacedName/actual.js
similarity index 100%
rename from packages/babel-generator/test/fixtures/types/XJSNamespacedName/actual.js
rename to packages/babel-generator/test/fixtures/types/JSXNamespacedName/actual.js
diff --git a/packages/babel-generator/test/fixtures/types/XJSNamespacedName/expected.js b/packages/babel-generator/test/fixtures/types/JSXNamespacedName/expected.js
similarity index 100%
rename from packages/babel-generator/test/fixtures/types/XJSNamespacedName/expected.js
rename to packages/babel-generator/test/fixtures/types/JSXNamespacedName/expected.js
diff --git a/packages/babel-generator/test/fixtures/types/XJSNamespacedName/options.json b/packages/babel-generator/test/fixtures/types/JSXNamespacedName/options.json
similarity index 100%
rename from packages/babel-generator/test/fixtures/types/XJSNamespacedName/options.json
rename to packages/babel-generator/test/fixtures/types/JSXNamespacedName/options.json
diff --git a/packages/babel-generator/test/fixtures/types/XJSSpreadAttribute/actual.js b/packages/babel-generator/test/fixtures/types/JSXSpreadAttribute/actual.js
similarity index 100%
rename from packages/babel-generator/test/fixtures/types/XJSSpreadAttribute/actual.js
rename to packages/babel-generator/test/fixtures/types/JSXSpreadAttribute/actual.js
diff --git a/packages/babel-generator/test/fixtures/types/XJSSpreadAttribute/expected.js b/packages/babel-generator/test/fixtures/types/JSXSpreadAttribute/expected.js
similarity index 100%
rename from packages/babel-generator/test/fixtures/types/XJSSpreadAttribute/expected.js
rename to packages/babel-generator/test/fixtures/types/JSXSpreadAttribute/expected.js
diff --git a/packages/babel-generator/test/fixtures/types/XJSSpreadAttribute/options.json b/packages/babel-generator/test/fixtures/types/JSXSpreadAttribute/options.json
similarity index 100%
rename from packages/babel-generator/test/fixtures/types/XJSSpreadAttribute/options.json
rename to packages/babel-generator/test/fixtures/types/JSXSpreadAttribute/options.json
diff --git a/packages/babel-generator/test/fixtures/types/XJSSpreadChildren/actual.js b/packages/babel-generator/test/fixtures/types/JSXSpreadChildren/actual.js
similarity index 100%
rename from packages/babel-generator/test/fixtures/types/XJSSpreadChildren/actual.js
rename to packages/babel-generator/test/fixtures/types/JSXSpreadChildren/actual.js
diff --git a/packages/babel-generator/test/fixtures/types/XJSSpreadChildren/expected.js b/packages/babel-generator/test/fixtures/types/JSXSpreadChildren/expected.js
similarity index 100%
rename from packages/babel-generator/test/fixtures/types/XJSSpreadChildren/expected.js
rename to packages/babel-generator/test/fixtures/types/JSXSpreadChildren/expected.js
diff --git a/packages/babel-generator/test/fixtures/types/XJSSpreadChildren/options.json b/packages/babel-generator/test/fixtures/types/JSXSpreadChildren/options.json
similarity index 100%
rename from packages/babel-generator/test/fixtures/types/XJSSpreadChildren/options.json
rename to packages/babel-generator/test/fixtures/types/JSXSpreadChildren/options.json
diff --git a/packages/babel-generator/test/fixtures/types/XJSText/actual.js b/packages/babel-generator/test/fixtures/types/JSXText/actual.js
similarity index 100%
rename from packages/babel-generator/test/fixtures/types/XJSText/actual.js
rename to packages/babel-generator/test/fixtures/types/JSXText/actual.js
diff --git a/packages/babel-generator/test/fixtures/types/XJSText/expected.js b/packages/babel-generator/test/fixtures/types/JSXText/expected.js
similarity index 100%
rename from packages/babel-generator/test/fixtures/types/XJSText/expected.js
rename to packages/babel-generator/test/fixtures/types/JSXText/expected.js
diff --git a/packages/babel-generator/test/fixtures/types/XJSText/options.json b/packages/babel-generator/test/fixtures/types/JSXText/options.json
similarity index 100%
rename from packages/babel-generator/test/fixtures/types/XJSText/options.json
rename to packages/babel-generator/test/fixtures/types/JSXText/options.json