diff --git a/src/docs/addons/addon-galary.js b/src/docs/addons/addon-gallery.js
similarity index 97%
rename from src/docs/addons/addon-galary.js
rename to src/docs/addons/addon-gallery.js
index e562eac5988c..89cf6443971b 100644
--- a/src/docs/addons/addon-galary.js
+++ b/src/docs/addons/addon-gallery.js
@@ -1,8 +1,8 @@
 import {stripIndent} from 'common-tags'
 
 export default {
-  id: "addon-galary",
-  title: "Addon Galary",
+  id: "addon-gallery",
+  title: "Addon Gallery",
   content: stripIndent`
     This is a list of available addons for Storybook.
 
diff --git a/src/docs/addons/api.js b/src/docs/addons/api.js
index 07087eafb508..e08ed1a62a70 100644
--- a/src/docs/addons/api.js
+++ b/src/docs/addons/api.js
@@ -60,12 +60,12 @@ export default {
     You also pass the channel and the Storybook API into that. See:
 
     ~~~js
-    addonAPI.register('kadira/notes', (api) => {
+    addonAPI.register('kadira/notes', (storybookAPI) => {
       // Also need to set a unique name to the panel.
       addonAPI.addPanel('kadira/notes/panel', {
         title: 'Notes',
         render: () => (
-          <Notes channel={addons.getChannel()} api={api}/>
+          <Notes channel={addons.getChannel()} api={storybookAPI}/>
         ),
       })
     })
diff --git a/src/docs/addons/introduction.js b/src/docs/addons/introduction.js
index 2cba9369a430..86a41788aee3 100644
--- a/src/docs/addons/introduction.js
+++ b/src/docs/addons/introduction.js
@@ -8,7 +8,7 @@ export default {
   id: "introduction",
   title: "Introduction",
   content: stripIndent`
-    By default, Storybook comes with a way to list stories and visualize them. Addons implements extra features for Storybook to make Storybook more useful.
+    By default, Storybook comes with a way to list stories and visualize them. Addons implement extra features for Storybooks to make them more useful.
 
     Basically, there are two types of addons. (Decorators and Native Addons)
 
@@ -105,7 +105,7 @@ export default {
     See the following links to learn more about native addons:
 
     * [Using addons](/docs/addons/using-addons)
-    * [Addon Galary](/docs/addons/addon-galary)
+    * [Addon gallery](/docs/addons/addon-gallery)
     * [Write your own addon](/docs/addons/writing-addons)
   `
 };
diff --git a/src/docs/addons/using-addons.js b/src/docs/addons/using-addons.js
index 0b77c6c9529f..9d6cd40cefda 100644
--- a/src/docs/addons/using-addons.js
+++ b/src/docs/addons/using-addons.js
@@ -62,7 +62,7 @@ export default {
 
     ![Stories with notes](${images.storiesWithNotes})
 
-    Just like this, you can install any other addon and use it. Have a look at our [addon gallery](/docs/addons/addon-galary) to discover more addons.
+    Just like this, you can install any other addon and use it. Have a look at our [addon gallery](/docs/addons/addon-gallery) to discover more addons.
 
     > This particular addon has created a panel in Storybook. Some addons may not create a panel and may use some other Storybook platform features.
     >
diff --git a/src/docs/addons/writing-addons.js b/src/docs/addons/writing-addons.js
index 8230199f4b1c..9e10b4788580 100644
--- a/src/docs/addons/writing-addons.js
+++ b/src/docs/addons/writing-addons.js
@@ -34,7 +34,7 @@ export default {
     * Select a story.
     * Register keyboard shortcuts (coming soon).
 
-    With this, you can write some pretty cool addons. Look at our [Addon Galary](/docs/addons/addon-galary) to have a look at some sample addons.
+    With this, you can write some pretty cool addons. Look at our [Addon gallery](/docs/addons/addon-gallery) to have a look at some sample addons.
 
     ## Getting Started
 
diff --git a/src/docs/index.js b/src/docs/index.js
index 2d4a13aa8f7f..3e9ebe9347e4 100644
--- a/src/docs/index.js
+++ b/src/docs/index.js
@@ -29,7 +29,7 @@ const data = {
       items: [
         require('./addons/introduction').default,
         require('./addons/using-addons').default,
-        require('./addons/addon-galary').default,
+        require('./addons/addon-gallery').default,
         require('./addons/writing-addons').default,
         require('./addons/api').default,
       ]