diff --git a/demo/src/components/App/components/Example11/Example11.js b/demo/src/components/App/components/Example11/Example11.js
index 4abc810..bf95320 100644
--- a/demo/src/components/App/components/Example11/Example11.js
+++ b/demo/src/components/App/components/Example11/Example11.js
@@ -24,7 +24,7 @@ const theme = {
     borderBottomLeftRadius: 0,
     borderBottomRightRadius: 0
   },
-  inputFocus: {
+  inputFocused: {
     outline: 'none'
   },
   itemsContainer: {
@@ -54,7 +54,7 @@ const theme = {
     cursor: 'pointer',
     padding: '10px 20px'
   },
-  itemHighlight: {
+  itemHighlighted: {
     backgroundColor: '#ddd'
   }
 };
diff --git a/demo/src/components/App/components/theme.less b/demo/src/components/App/components/theme.less
index d375ed4..05b9a29 100644
--- a/demo/src/components/App/components/theme.less
+++ b/demo/src/components/App/components/theme.less
@@ -21,7 +21,7 @@
   border-bottom-right-radius: 0;
 }
 
-.inputFocus {
+.inputFocused {
   outline: none;
 }
 
@@ -56,7 +56,7 @@
   padding: 10px 20px;
 }
 
-.itemHighlight {
+.itemHighlighted {
   background-color: #ddd;
 }
 
diff --git a/demo/standalone/app.css b/demo/standalone/app.css
index a4c57a8..eb4fbbe 100644
--- a/demo/standalone/app.css
+++ b/demo/standalone/app.css
@@ -14,7 +14,7 @@
   -webkit-appearance: none;
 }
 
-.react-autowhatever__input--focus {
+.react-autowhatever__input--focused {
   outline: none;
 }
 
@@ -57,6 +57,6 @@
   padding: 10px 20px;
 }
 
-.react-autowhatever__item--highlight {
+.react-autowhatever__item--highlighted {
   background-color: #ddd;
 }
diff --git a/src/Autowhatever.js b/src/Autowhatever.js
index d9d4264..5f7ba85 100644
--- a/src/Autowhatever.js
+++ b/src/Autowhatever.js
@@ -14,12 +14,12 @@ const defaultTheme = {
   containerOpen: 'react-autowhatever__container--open',
   input: 'react-autowhatever__input',
   inputOpen: 'react-autowhatever__input--open',
-  inputFocus: 'react-autowhatever__input--focus',
+  inputFocused: 'react-autowhatever__input--focused',
   itemsContainer: 'react-autowhatever__items-container',
   itemsContainerOpen: 'react-autowhatever__items-container--open',
   itemsList: 'react-autowhatever__items-list',
   item: 'react-autowhatever__item',
-  itemHighlight: 'react-autowhatever__item--highlight',
+  itemHighlighted: 'react-autowhatever__item--highlighted',
   sectionContainer: 'react-autowhatever__section-container',
   sectionContainerFirst: 'react-autowhatever__section-container--first',
   sectionTitle: 'react-autowhatever__section-title'
@@ -329,7 +329,7 @@ export default class Autowhatever extends Component {
         `react-autowhatever-${id}-input`,
         'input',
         isOpen && 'inputOpen',
-        isInputFocused && 'inputFocus'
+        isInputFocused && 'inputFocused'
       ),
       ...this.props.inputProps,
       onFocus: this.onFocus,
diff --git a/src/ItemsList.js b/src/ItemsList.js
index c624944..4c643ca 100644
--- a/src/ItemsList.js
+++ b/src/ItemsList.js
@@ -48,7 +48,7 @@ export default class ItemsList extends Component {
             const itemPropsObj = isItemPropsFunction ? itemProps({ sectionIndex, itemIndex }) : itemProps;
             const allItemProps = {
               id: getItemId(sectionIndex, itemIndex),
-              ...theme(itemKey, 'item', isHighlighted && 'itemHighlight'),
+              ...theme(itemKey, 'item', isHighlighted && 'itemHighlighted'),
               ...itemPropsObj
             };