diff --git a/src/components/base/Bar/stories.js b/src/components/base/Bar/stories.js
index 8e920897..8783acde 100644
--- a/src/components/base/Bar/stories.js
+++ b/src/components/base/Bar/stories.js
@@ -7,6 +7,6 @@ import { storiesOf } from '@storybook/react'
 
 import Bar from 'components/base/Bar'
 
-const stories = storiesOf('Components', module)
+const stories = storiesOf('Components/base', module)
 
 stories.add('Bar', () => <Bar size={number('size', 1)} color="grey" />)
diff --git a/src/components/base/Box/stories.js b/src/components/base/Box/stories.js
index 6c43b679..f9c77a55 100644
--- a/src/components/base/Box/stories.js
+++ b/src/components/base/Box/stories.js
@@ -8,7 +8,7 @@ import styled from 'styled-components'
 
 import Box from 'components/base/Box'
 
-const stories = storiesOf('Components/Box', module)
+const stories = storiesOf('Components/base/Box', module)
 
 const align = [
   undefined,
diff --git a/src/components/base/Button/stories.js b/src/components/base/Button/stories.js
index 72bd84f2..d779c637 100644
--- a/src/components/base/Button/stories.js
+++ b/src/components/base/Button/stories.js
@@ -6,7 +6,7 @@ import styled from 'styled-components'
 
 import Button from 'components/base/Button'
 
-const stories = storiesOf('Components', module)
+const stories = storiesOf('Components/base', module)
 
 const Th = styled.th`
   padding: 20px;
diff --git a/src/components/base/CheckBox/stories.js b/src/components/base/CheckBox/stories.js
index f196de87..4f015c03 100644
--- a/src/components/base/CheckBox/stories.js
+++ b/src/components/base/CheckBox/stories.js
@@ -5,7 +5,7 @@ import { action } from '@storybook/addon-actions'
 
 import CheckBox from 'components/base/CheckBox'
 
-const stories = storiesOf('Components', module)
+const stories = storiesOf('Components/base', module)
 
 stories.add('CheckBox', () => (
   <CheckBox isChecked={boolean('isChecked', false)} onChange={action('onChange')} />
diff --git a/src/components/base/GrowScroll/stories.js b/src/components/base/GrowScroll/stories.js
index ec18ad21..7bcd8cda 100644
--- a/src/components/base/GrowScroll/stories.js
+++ b/src/components/base/GrowScroll/stories.js
@@ -7,7 +7,7 @@ import { boolean } from '@storybook/addon-knobs'
 import Box from 'components/base/Box'
 import GrowScroll from 'components/base/GrowScroll'
 
-const stories = storiesOf('Components', module)
+const stories = storiesOf('Components/base', module)
 
 stories.add('GrowScroll', () => {
   const reverseColor = boolean('reverseColor', false)
diff --git a/src/components/base/Input/stories.js b/src/components/base/Input/stories.js
index 196a7b12..14e3d3ed 100644
--- a/src/components/base/Input/stories.js
+++ b/src/components/base/Input/stories.js
@@ -5,6 +5,6 @@ import { storiesOf } from '@storybook/react'
 
 import Input from 'components/base/Input'
 
-const stories = storiesOf('Components', module)
+const stories = storiesOf('Components/base', module)
 
 stories.add('Input', () => <Input placeholder="Foo bar" />)
diff --git a/src/components/base/InputCurrency/stories.js b/src/components/base/InputCurrency/stories.js
index dbf9d25d..a64fd73b 100644
--- a/src/components/base/InputCurrency/stories.js
+++ b/src/components/base/InputCurrency/stories.js
@@ -8,7 +8,7 @@ import { getDefaultUnitByCoinType } from '@ledgerhq/currencies'
 
 import InputCurrency from 'components/base/InputCurrency'
 
-const stories = storiesOf('Components', module)
+const stories = storiesOf('Components/base', module)
 
 const unit = getDefaultUnitByCoinType(1)
 
diff --git a/src/components/base/Modal/stories.js b/src/components/base/Modal/stories.js
index a105b6ca..0516912a 100644
--- a/src/components/base/Modal/stories.js
+++ b/src/components/base/Modal/stories.js
@@ -8,7 +8,7 @@ import { Modal, ModalBody, ModalTitle, ModalContent, ModalFooter } from 'compone
 import Box from 'components/base/Box'
 import Button from 'components/base/Button'
 
-const stories = storiesOf('Components', module)
+const stories = storiesOf('Components/base', module)
 
 stories.add('Modal', () => {
   const isOpened = boolean('isOpened', true)
diff --git a/src/components/base/NewChart/stories.js b/src/components/base/NewChart/stories.js
index a4209187..f10d59f8 100644
--- a/src/components/base/NewChart/stories.js
+++ b/src/components/base/NewChart/stories.js
@@ -10,7 +10,7 @@ import { color } from '@storybook/addon-knobs/react'
 
 import Chart from 'components/base/NewChart'
 
-const stories = storiesOf('Components', module)
+const stories = storiesOf('Components/base', module)
 
 const data = generateRandomData(365)
 const unit = getDefaultUnitByCoinType(0)
diff --git a/src/components/base/Pills/stories.js b/src/components/base/Pills/stories.js
index 5344c775..b8e4b68b 100644
--- a/src/components/base/Pills/stories.js
+++ b/src/components/base/Pills/stories.js
@@ -5,7 +5,7 @@ import { storiesOf } from '@storybook/react'
 
 import Pills from 'components/base/Pills'
 
-const stories = storiesOf('Components', module)
+const stories = storiesOf('Components/base', module)
 
 type State = {
   key: string,
diff --git a/src/components/base/QRCode/stories.js b/src/components/base/QRCode/stories.js
index 77613165..068159bd 100644
--- a/src/components/base/QRCode/stories.js
+++ b/src/components/base/QRCode/stories.js
@@ -7,6 +7,6 @@ import { text, number } from '@storybook/addon-knobs'
 
 import QRCode from 'components/base/QRCode'
 
-const stories = storiesOf('Components', module)
+const stories = storiesOf('Components/base', module)
 
 stories.add('QRCode', () => <QRCode data={text('data', 'sample')} size={number('size', 200)} />)
diff --git a/src/components/base/Radio/stories.js b/src/components/base/Radio/stories.js
index f84e73d5..001839c0 100644
--- a/src/components/base/Radio/stories.js
+++ b/src/components/base/Radio/stories.js
@@ -5,7 +5,7 @@ import { boolean } from '@storybook/addon-knobs'
 
 import Radio from 'components/base/Radio'
 
-const stories = storiesOf('Components', module)
+const stories = storiesOf('Components/base', module)
 
 stories.add('Radio', () => (
   <Radio isChecked={boolean('checked', false)} onChange={action('onChange')} />
diff --git a/src/components/base/Select/stories.js b/src/components/base/Select/stories.js
index eb44b448..ba750dd5 100644
--- a/src/components/base/Select/stories.js
+++ b/src/components/base/Select/stories.js
@@ -7,7 +7,7 @@ import Box from 'components/base/Box'
 import Select from 'components/base/Select'
 import Text from 'components/base/Text'
 
-const stories = storiesOf('Components/Select', module)
+const stories = storiesOf('Components/base/Select', module)
 
 const itemsChessPlayers = [
   { key: 'aleksandr-grichtchouk', name: 'Aleksandr Grichtchouk' },
diff --git a/src/components/base/Tabs/stories.js b/src/components/base/Tabs/stories.js
index 2447b428..bb89efcc 100644
--- a/src/components/base/Tabs/stories.js
+++ b/src/components/base/Tabs/stories.js
@@ -6,7 +6,7 @@ import { storiesOf } from '@storybook/react'
 
 import Tabs from 'components/base/Tabs'
 
-const stories = storiesOf('Components', module)
+const stories = storiesOf('Components/base', module)
 
 stories.add('Tabs', () => (
   <Tabs
diff --git a/src/components/base/Text/stories.js b/src/components/base/Text/stories.js
index 94d1f35b..3a7117fd 100644
--- a/src/components/base/Text/stories.js
+++ b/src/components/base/Text/stories.js
@@ -10,7 +10,7 @@ import Text from 'components/base/Text'
 
 import { fontFamilies, fontSizes } from 'styles/theme'
 
-const stories = storiesOf('Common/Text', module)
+const stories = storiesOf('Common', module)
 
 const Title = ({ children }: { children: string }) => (
   <Text style={{ fontFamily: 'monospace' }} fontSize={5}>
@@ -56,7 +56,7 @@ const FontSizes = () => (
   </Box>
 )
 
-stories.add('all fonts styles', () => (
+stories.add('Text styles', () => (
   <Box flow={4}>
     <FontStyles txt={text('text', 'The quick brown fox jumps over the lazy dog')} />
     <FontSizes />
diff --git a/src/components/base/Tooltip/stories.js b/src/components/base/Tooltip/stories.js
index 369585d7..9a73391a 100644
--- a/src/components/base/Tooltip/stories.js
+++ b/src/components/base/Tooltip/stories.js
@@ -5,6 +5,6 @@ import { storiesOf } from '@storybook/react'
 
 import Tooltip from 'components/base/Tooltip'
 
-const stories = storiesOf('Components', module)
+const stories = storiesOf('Components/base', module)
 
 stories.add('Tooltip', () => <Tooltip render={() => <div>Oyo!</div>}>Hover me!</Tooltip>)
diff --git a/src/stories/currencies.stories.js b/src/stories/currencies.stories.js
index a3a3c3d3..9b2dc19e 100644
--- a/src/stories/currencies.stories.js
+++ b/src/stories/currencies.stories.js
@@ -7,11 +7,11 @@ import { getIconByCoinType } from '@ledgerhq/currencies/react'
 
 import type { Currency } from '@ledgerhq/currencies'
 
-const stories = storiesOf('Common/Currencies', module)
+const stories = storiesOf('Common', module)
 
 const currencies: Array<Currency> = listCurrencies()
 
-stories.add('currencies list', () => (
+stories.add('Currencies', () => (
   <div>
     <table border="1">
       <thead>