diff --git a/src/stories/button.js b/src/stories/button.js
index 11cbb2458fd1a354cec076bd0ff392caf259571a..1295ac8d4602b32c446488563932f4d3e4c7d064 100644
--- a/src/stories/button.js
+++ b/src/stories/button.js
@@ -2,10 +2,7 @@ import React from 'react'
 import { Button } from '../lib'
 import { storiesOf } from '@storybook/react'
 
-export default storiesOf('Atoms/Button', module)
-  .add('Without Text', () => (
-    <Button />
-  ))
-  .add('With Text', () => (
+export default storiesOf('Atom', module)
+  .add('Button', () => (
     <Button value="beauftragen" />
   ))
diff --git a/src/stories/icon.js b/src/stories/icon.js
index c085941fdbae88ef6da2b4cc63f4b6da2e81e0a6..fe0eee554bfb953de441565e7012f81218a64454 100644
--- a/src/stories/icon.js
+++ b/src/stories/icon.js
@@ -2,7 +2,7 @@ import React from 'react'
 import { Icon, LingualaIcon } from '../lib'
 import { storiesOf } from '@storybook/react'
 
-export default storiesOf('Examples/Icon', module)
+export default storiesOf('Experimental/Icon', module)
   .add('Generic Icon', () => (
     <Icon />
   ))
diff --git a/src/stories/logo.js b/src/stories/logo.js
index b33f818cff3d005ffb5f7a0f8e2b5caf4df54ab3..0b99baaecaefeb99d9ef3795a6c6acf1a9e09737 100644
--- a/src/stories/logo.js
+++ b/src/stories/logo.js
@@ -1,16 +1,11 @@
 import React from 'react'
 import { storiesOf } from '@storybook/react'
 import { withKnobs, number } from '@storybook/addon-knobs'
-import { withInfo } from '@storybook/addon-info'
 
 import { Logo } from '../lib'
 
-export default storiesOf('Atoms/Linguala Logo', module)
+export default storiesOf('Atom', module)
   .addDecorator(withKnobs)
-  .add('default',
-    withInfo(`
-      this is our Logo
-    `)(() => <Logo />))
-  .add('custom sized', () => (
-    <Logo size={number('Size', 5)} />
+  .add('Logo', () => (
+    <Logo size={number('Size', 8)} />
   ))
diff --git a/src/stories/pin.js b/src/stories/pin.js
index 62a8a3981ade32b44ac13cdc82930e6407a0323e..c9eef4b2597c5f5485a843088692660b6338d298 100644
--- a/src/stories/pin.js
+++ b/src/stories/pin.js
@@ -20,10 +20,10 @@ const knobsColors = {
   [grey]: 'Idle',
 }
 
-storiesOf('Atoms/Linguala Pin', module)
+storiesOf('Atom/Shape', module)
   .addDecorator(withKnobs)
-  .add('Shape Pin', withInfo(`
-    Atom: Standalone Pin
+  .add('Lens Border', withInfo(`
+    Lens Border
   `)(() => (
     <Pin
       size={number('Size in units', 10, {
@@ -40,7 +40,7 @@ storiesOf('Atoms/Linguala Pin', module)
     />
   )))
 
-storiesOf('Molecules/Linguala Pin', module)
+storiesOf('Molecules/Pin', module)
   .addDecorator(withKnobs)
   .add('Logo + Pin Composition', withInfo(`
     Molecule: Logo + Pin
diff --git a/src/stories/text.js b/src/stories/text.js
index 8bba610d28134954d80a8b8e1ad73674bd7e6d2b..cb86af3b4ea280502315704d64b45f91d358f912 100644
--- a/src/stories/text.js
+++ b/src/stories/text.js
@@ -4,7 +4,7 @@ import {
   Text,
 } from '../lib'
 
-storiesOf('Examples/Linguala Text', module)
+storiesOf('Experimental/Styled Text', module)
   .add('default styled component', () => (
     <Text>Hello world!</Text>
   ))