diff --git a/src/services/codefixes/fixReactClassNameAndHTMLFor.ts b/src/services/codefixes/fixReactClassNameAndHTMLFor.ts
new file mode 100644
index 00000000000..aa3a92a6a1d
--- /dev/null
+++ b/src/services/codefixes/fixReactClassNameAndHTMLFor.ts
@@ -0,0 +1,60 @@
+/* @internal */
+namespace ts.codefix {
+    const fixID = "fixReactClassNameAndHTMLFor";
+    const errorCodes = [Diagnostics.Type_0_is_not_assignable_to_type_1.code];
+    registerCodeFix({
+        errorCodes,
+        getCodeActions: context => {
+            const { jsx } = context.program.getCompilerOptions();
+            if (jsx !== JsxEmit.React) {
+                return undefined;
+            }
+            const { sourceFile, span } = context;
+            const node = getTokenAtPosition(sourceFile, span.start);
+            if (!shouldFix(node)) return undefined;
+            const changes = textChanges.ChangeTracker.with(context, t => doChange(t, sourceFile, node));
+            return [createCodeFixAction(fixID, changes, [Diagnostics.Did_you_mean_0, getCorrectName(node)], fixID, Diagnostics.Fix_all_detected_spelling_errors)];
+        },
+        fixIds: [fixID],
+        getAllCodeActions: context => codeFixAll(context, errorCodes, (changes, diag) => {
+            const node = getTokenAtPosition(context.sourceFile, diag.start);
+            if (!shouldFix(node)) return;
+            doChange(changes, context.sourceFile, node);
+        }),
+    });
+
+    function doChange(changeTracker: textChanges.ChangeTracker, sf: SourceFile, node: Identifier) {
+        changeTracker.replaceNode(sf, node, createIdentifier(getCorrectName(node)));
+    }
+
+    function getCorrectName(node: Identifier) {
+        const text = node.text;
+        if (text === "class") return "className";
+        if (text === "for") return "htmlFor";
+        return Debug.fail();
+    }
+
+    function shouldFix(node: Node): node is Identifier {
+        // <label for="content">, the error is on the `for`
+        if (!isIdentifier(node)) return false;
+
+        const id = node.text;
+        // Only fix class => className and for => htmlFor
+        if (id !== "for" && id !== "class") return false;
+
+        if (!isJsxAttribute(node.parent)) return false;
+        const parent = node.parent.parent.parent;
+        if (!isIdentifier(parent.tagName)) return false;
+        const tagName = parent.tagName.text;
+        // html for only appear on label tag
+        if (tagName !== "label" && id === "for") return false;
+        const firstChar = tagName[0];
+        // Only fix for html elements. Non-lowercase elements are React Elements
+        if (firstChar.toLowerCase() !== firstChar) return false;
+
+        // See https://reactjs.org/docs/web-components.html#using-web-components-in-react
+        // "One common confusion is that Web Components use “class” instead of “className”."
+        if (tagName.indexOf("-") !== -1 && id === "class") return false;
+        return true;
+    }
+}
diff --git a/src/services/tsconfig.json b/src/services/tsconfig.json
index 9567185c7a9..56af5be2b74 100644
--- a/src/services/tsconfig.json
+++ b/src/services/tsconfig.json
@@ -88,6 +88,7 @@
         "codefixes/fixPropertyOverrideAccessor.ts",
         "codefixes/inferFromUsage.ts",
         "codefixes/fixReturnTypeInAsyncFunction.ts",
+        "codefixes/fixReactClassNameAndHTMLFor.ts",
         "codefixes/disableJsDiagnostics.ts",
         "codefixes/helpers.ts",
         "codefixes/generateAccessors.ts",
diff --git a/tests/cases/fourslash/codeFixReactClassNameAndHTMLFor1.ts b/tests/cases/fourslash/codeFixReactClassNameAndHTMLFor1.ts
new file mode 100644
index 00000000000..e13573ec5e4
--- /dev/null
+++ b/tests/cases/fourslash/codeFixReactClassNameAndHTMLFor1.ts
@@ -0,0 +1,15 @@
+/// <reference path='fourslash.ts' />
+
+// @jsx: react
+// @Filename: /a.tsx
+////declare namespace JSX {
+////    interface Element {}
+////    interface IntrinsicElements {
+////        div: {
+////            className?: string
+////        }
+////    }
+////}
+////[|const div = <div class="a" />|]
+
+verify.rangeAfterCodeFix(`const div = <div className="a" />`, /*includeWhiteSpace*/false, /*errorCode*/ 2322, /*index*/ 0);
diff --git a/tests/cases/fourslash/codeFixReactClassNameAndHTMLFor2.ts b/tests/cases/fourslash/codeFixReactClassNameAndHTMLFor2.ts
new file mode 100644
index 00000000000..c607e23b29a
--- /dev/null
+++ b/tests/cases/fourslash/codeFixReactClassNameAndHTMLFor2.ts
@@ -0,0 +1,15 @@
+/// <reference path='fourslash.ts' />
+
+// @jsx: react
+// @Filename: /a.tsx
+////declare namespace JSX {
+////    interface Element {}
+////    interface IntrinsicElements {
+////        label: {
+////            htmlFor?: string
+////        }
+////    }
+////}
+////[|<label for="a" />|]
+
+verify.rangeAfterCodeFix(`<label htmlFor="a" />`, /*includeWhiteSpace*/false, /*errorCode*/ 2322, /*index*/ 0);
diff --git a/tests/cases/fourslash/codeFixReactClassNameAndHTMLFor3-1.ts b/tests/cases/fourslash/codeFixReactClassNameAndHTMLFor3-1.ts
new file mode 100644
index 00000000000..706c38fca50
--- /dev/null
+++ b/tests/cases/fourslash/codeFixReactClassNameAndHTMLFor3-1.ts
@@ -0,0 +1,16 @@
+/// <reference path='fourslash.ts' />
+
+// @jsx: react
+// @Filename: /a.tsx
+////<div for="a" />;
+////declare namespace JSX {
+////    interface Element {}
+////    interface IntrinsicElements {
+////        div: {
+////            className?: string
+////        }
+////        'my-tag': { className?: string }
+////    }
+////}
+
+verify.not.codeFixAvailable("fixReactClassNameAndHTMLFor");
diff --git a/tests/cases/fourslash/codeFixReactClassNameAndHTMLFor3-2.ts b/tests/cases/fourslash/codeFixReactClassNameAndHTMLFor3-2.ts
new file mode 100644
index 00000000000..5fe9321836b
--- /dev/null
+++ b/tests/cases/fourslash/codeFixReactClassNameAndHTMLFor3-2.ts
@@ -0,0 +1,17 @@
+/// <reference path='fourslash.ts' />
+
+// @jsx: react
+// @Filename: /a.tsx
+////function MyComponent(props: {className?: string}) {}
+////<MyComponent class="a" />;
+////declare namespace JSX {
+////    interface Element {}
+////    interface IntrinsicElements {
+////        div: {
+////            className?: string
+////        }
+////        'my-tag': { className?: string }
+////    }
+////}
+
+verify.not.codeFixAvailable("fixReactClassNameAndHTMLFor");
diff --git a/tests/cases/fourslash/codeFixReactClassNameAndHTMLFor3-3.ts b/tests/cases/fourslash/codeFixReactClassNameAndHTMLFor3-3.ts
new file mode 100644
index 00000000000..f75cc9c5353
--- /dev/null
+++ b/tests/cases/fourslash/codeFixReactClassNameAndHTMLFor3-3.ts
@@ -0,0 +1,16 @@
+/// <reference path='fourslash.ts' />
+
+// @jsx: react
+// @Filename: /a.tsx
+////<my-tag class="a" />;
+////declare namespace JSX {
+////    interface Element {}
+////    interface IntrinsicElements {
+////        div: {
+////            className?: string
+////        }
+////        'my-tag': { className?: string }
+////    }
+////}
+
+verify.not.codeFixAvailable("fixReactClassNameAndHTMLFor");
diff --git a/tests/cases/fourslash/codeFixReactClassNameAndHTMLFor4.ts b/tests/cases/fourslash/codeFixReactClassNameAndHTMLFor4.ts
new file mode 100644
index 00000000000..77a6f7e5ce6
--- /dev/null
+++ b/tests/cases/fourslash/codeFixReactClassNameAndHTMLFor4.ts
@@ -0,0 +1,30 @@
+/// <reference path='fourslash.ts' />
+
+// @jsx: react
+// @Filename: /a.tsx
+////declare namespace JSX {
+////interface Element {}
+////interface IntrinsicElements {
+////div: { className?: string }
+////label: { htmlFor?: string }
+////}}
+////<div class="a" />;
+////<label for="a" />;
+////<div class="a" />;
+////<div class="a" id="a" />;
+////<div id="b" />;
+
+verify.codeFixAll({
+    newFileContent: `declare namespace JSX {
+interface Element {}
+interface IntrinsicElements {
+div: { className?: string }
+label: { htmlFor?: string }
+}}
+<div className="a" />;
+<label htmlFor="a" />;
+<div className="a" />;
+<div className="a" id="a" />;
+<div id="b" />;`, fixId: "fixReactClassNameAndHTMLFor",
+    fixAllDescription: "Fix all detected spelling errors"
+});