diff --git a/source/Options/Options.jsx b/source/Options/Options.jsx
index 50a4a99..bd5e360 100644
--- a/source/Options/Options.jsx
+++ b/source/Options/Options.jsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import * as React from 'react';
 
 import './styles.scss';
 
@@ -7,12 +7,12 @@ const Options = () => {
     <div>
       <form>
         <p>
-          <label htmlFor="name">Name</label>
+          <label htmlFor="username">Your Name</label>
           <br />
           <input
             type="text"
-            id="name"
-            name="name"
+            id="username"
+            name="username"
             spellCheck="false"
             autoComplete="off"
             required
diff --git a/source/Options/index.jsx b/source/Options/index.jsx
index 1d8bed4..b20aee0 100644
--- a/source/Options/index.jsx
+++ b/source/Options/index.jsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import * as React from 'react';
 import ReactDOM from 'react-dom';
 
 import Options from './Options';
diff --git a/source/Popup/Popup.jsx b/source/Popup/Popup.jsx
index e6d04a1..0863dcd 100644
--- a/source/Popup/Popup.jsx
+++ b/source/Popup/Popup.jsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import * as React from 'react';
 import browser from 'webextension-polyfill';
 
 import './styles.scss';
diff --git a/source/Popup/index.jsx b/source/Popup/index.jsx
index 17939b0..90b0950 100644
--- a/source/Popup/index.jsx
+++ b/source/Popup/index.jsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import * as React from 'react';
 import ReactDOM from 'react-dom';
 
 import Popup from './Popup';