diff --git a/types/elasticsearch/index.d.ts b/types/elasticsearch/index.d.ts
index 008d5acd8a..b9318c6e60 100644
--- a/types/elasticsearch/index.d.ts
+++ b/types/elasticsearch/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for elasticsearch 5.0
-// Project: http://www.elastic.co/guide/en/elasticsearch/client/javascript-api/current/index.html
+// Project: https://www.elastic.co/guide/en/elasticsearch/client/javascript-api/16.x/index.html
 // Definitions by: Casper Skydt <https://github.com/CasperSkydt>
 //                 Blake Smith <https://github.com/bfsmith>
 //                 Dave Dunkin <https://github.com/ddunkin>
diff --git a/types/storybook__addon-actions/index.d.ts b/types/storybook__addon-actions/index.d.ts
index a7a02c7513..b27a447b97 100644
--- a/types/storybook__addon-actions/index.d.ts
+++ b/types/storybook__addon-actions/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for @storybook/addon-actions 3.4
-// Project: https://github.com/storybooks/storybook, https://github.com/storybooks/storybook/tree/master/addons/actions
+// Project: https://github.com/storybookjs/storybook, https://github.com/storybookjs/storybook/tree/master/addons/actions
 // Definitions by: Joscha Feth <https://github.com/joscha>, June <https://github.com/jicjjang>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
diff --git a/types/storybook__addon-backgrounds/index.d.ts b/types/storybook__addon-backgrounds/index.d.ts
index 095bbe5154..5ccbf66f59 100644
--- a/types/storybook__addon-backgrounds/index.d.ts
+++ b/types/storybook__addon-backgrounds/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for @storybook/addon-backgrounds 4.1
-// Project: https://github.com/storybooks/storybook, https://github.com/storybooks/storybook/tree/master/addons/backgrounds
+// Project: https://github.com/storybookjs/storybook, https://github.com/storybookjs/storybook/tree/master/addons/backgrounds
 // Definitions by: HyunSeob <https://github.com/hyunseob>
 //                 An Dohyung <https://github.com/adhrinae>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/storybook__addon-centered/index.d.ts b/types/storybook__addon-centered/index.d.ts
index 2345e9ed83..ef4cf8aeb6 100644
--- a/types/storybook__addon-centered/index.d.ts
+++ b/types/storybook__addon-centered/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for @storybook/addon-centered 3.4
-// Project: https://github.com/storybooks/storybook, https://github.com/storybooks/storybook/tree/master/addons/centered
+// Project: https://github.com/storybookjs/storybook, https://github.com/storybookjs/storybook/tree/master/addons/centered
 // Definitions by: kiyopikko <https://github.com/kiyopikko>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
diff --git a/types/storybook__addon-info/index.d.ts b/types/storybook__addon-info/index.d.ts
index ed0f9a78d3..09c9a856ac 100644
--- a/types/storybook__addon-info/index.d.ts
+++ b/types/storybook__addon-info/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for @storybook/addon-info 4.1
-// Project: https://github.com/storybooks/storybook, https://github.com/storybooks/storybook/tree/master/addons/info
+// Project: https://github.com/storybookjs/storybook, https://github.com/storybookjs/storybook/tree/master/addons/info
 // Definitions by: Mark Kornblum <https://github.com/mkornblum>
 //                 Mattias Wikstrom <https://github.com/fyrkant>
 //                 Kevin Lee <https://github.com/RunningCoderLee>
diff --git a/types/storybook__addon-jest/index.d.ts b/types/storybook__addon-jest/index.d.ts
index 59329b7f59..34f6ff2e0a 100644
--- a/types/storybook__addon-jest/index.d.ts
+++ b/types/storybook__addon-jest/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for @storybook/addon-jest 3.4
-// Project: https://github.com/storybooks/storybook, https://github.com/storybooks/storybook/tree/master/addons/jest
+// Project: https://github.com/storybookjs/storybook, https://github.com/storybookjs/storybook/tree/master/addons/jest
 // Definitions by: Matt Oliver <https://github.com/halfmatthalfcat>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
diff --git a/types/storybook__addon-knobs/index.d.ts b/types/storybook__addon-knobs/index.d.ts
index 7fd72faeb9..b4402c0196 100644
--- a/types/storybook__addon-knobs/index.d.ts
+++ b/types/storybook__addon-knobs/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for @storybook/addon-knobs 5.0
-// Project: https://github.com/storybooks/storybook, https://github.com/storybooks/storybook/tree/master/addons/knobs
+// Project: https://github.com/storybookjs/storybook, https://github.com/storybookjs/storybook/tree/master/addons/knobs
 // Definitions by: Joscha Feth <https://github.com/joscha>
 //                 Martynas Kadisa <https://github.com/martynaskadisa>
 //                 A.MacLeay <https://github.com/amacleay>
diff --git a/types/storybook__addon-links/index.d.ts b/types/storybook__addon-links/index.d.ts
index 129f02969a..2cc1d07cc5 100644
--- a/types/storybook__addon-links/index.d.ts
+++ b/types/storybook__addon-links/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for @storybook/addon-links 3.3
-// Project: https://github.com/storybooks/storybook, https://github.com/storybooks/storybook/tree/master/addons/links
+// Project: https://github.com/storybookjs/storybook, https://github.com/storybookjs/storybook/tree/master/addons/links
 // Definitions by: Joscha Feth <https://github.com/joscha>,
 //                 Jesse Pinho <https://github.com/jessepinho>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/storybook__addon-options/index.d.ts b/types/storybook__addon-options/index.d.ts
index 38e9203f30..f39324ba99 100644
--- a/types/storybook__addon-options/index.d.ts
+++ b/types/storybook__addon-options/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for @storybook/addon-options 4.0
-// Project: https://github.com/storybooks/storybook, https://github.com/storybooks/storybook/tree/master/addons/options
+// Project: https://github.com/storybookjs/storybook, https://github.com/storybookjs/storybook/tree/master/addons/options
 // Definitions by: Joscha Feth <https://github.com/joscha>
 //                 Simon Helle Nielsen <https://github.com/simonhn>
 //                 A.MacLeay <https://github.com/amacleay>
diff --git a/types/storybook__addon-storyshots/index.d.ts b/types/storybook__addon-storyshots/index.d.ts
index db7b304c0e..f7955b2b01 100644
--- a/types/storybook__addon-storyshots/index.d.ts
+++ b/types/storybook__addon-storyshots/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for @storybook/addon-storyshots 4.0
-// Project: https://github.com/storybooks/storybook/tree/master/addons/storyshots, https://github.com/storybooks/storybook/tree/master/addons/storyshots/storyshots-core
+// Project: https://github.com/storybookjs/storybook/tree/master/addons/storyshots, https://github.com/storybookjs/storybook/tree/master/addons/storyshots/storyshots-core
 // Definitions by: Bradley Ayers <https://github.com/bradleyayers>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 3.1
diff --git a/types/storybook__addon-viewport/index.d.ts b/types/storybook__addon-viewport/index.d.ts
index 2576ab85cc..89c706f9f5 100644
--- a/types/storybook__addon-viewport/index.d.ts
+++ b/types/storybook__addon-viewport/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for @storybook/addon-viewport 4.1
-// Project: https://github.com/storybooks/storybook/tree/master/addons/viewport
+// Project: https://github.com/storybookjs/storybook/tree/master/addons/viewport
 // Definitions by: Vincent Tunru <https://github.com/Vinnl>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
diff --git a/types/storybook__addons/index.d.ts b/types/storybook__addons/index.d.ts
index 5db0e048a1..d8cfd68cc4 100644
--- a/types/storybook__addons/index.d.ts
+++ b/types/storybook__addons/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for @storybook/addons 4.1
-// Project: https://github.com/storybooks/storybook/tree/master/lib/addons
+// Project: https://github.com/storybookjs/storybook/tree/master/lib/addons
 // Definitions by: Bob Matcuk <https://github.com/bmatcuk>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 3.1
diff --git a/types/storybook__channels/index.d.ts b/types/storybook__channels/index.d.ts
index f9e43d156e..a8ee783d9c 100644
--- a/types/storybook__channels/index.d.ts
+++ b/types/storybook__channels/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for @storybook/channels 4.1
-// Project: https://github.com/storybooks/storybook/tree/master/lib/channels
+// Project: https://github.com/storybookjs/storybook/tree/master/lib/channels
 // Definitions by: Bob Matcuk <https://github.com/bmatcuk>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 3.1
diff --git a/types/storybook__html/index.d.ts b/types/storybook__html/index.d.ts
index 633c1279b0..9a1f0b42b9 100644
--- a/types/storybook__html/index.d.ts
+++ b/types/storybook__html/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for @storybook/html 5.0
-// Project: https://github.com/storybooks/storybook, https://github.com/storybooks/storybook/tree/master/app/html
+// Project: https://github.com/storybookjs/storybook, https://github.com/storybookjs/storybook/tree/master/app/html
 // Definitions by: Christian Murphy <https://github.com/ChristianMurphy>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
diff --git a/types/storybook__preact/index.d.ts b/types/storybook__preact/index.d.ts
index 0917f2cd21..f543d7034f 100644
--- a/types/storybook__preact/index.d.ts
+++ b/types/storybook__preact/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for @storybook/preact 5.0
-// Project: https://github.com/storybooks/storybook, https://github.com/storybooks/storybook/tree/master/app/preact
+// Project: https://github.com/storybookjs/storybook, https://github.com/storybookjs/storybook/tree/master/app/preact
 // Definitions by: Keisuke Kan <https://github.com/9renpoto>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 3.3
diff --git a/types/storybook__react-native/index.d.ts b/types/storybook__react-native/index.d.ts
index fccd0ad385..e400ab7871 100644
--- a/types/storybook__react-native/index.d.ts
+++ b/types/storybook__react-native/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for @storybook/react-native 3.0
-// Project: https://github.com/storybooks/storybook, https://github.com/storybooks/storybook/tree/master/app/react-native
+// Project: https://github.com/storybookjs/storybook, https://github.com/storybookjs/storybook/tree/master/app/react-native
 // Definitions by: Joscha Feth <https://github.com/joscha>
 //                 Anton Izmailov <https://github.com/wapgear>
 //                 Alec Hill <https://github.com/alechill>
diff --git a/types/storybook__react/index.d.ts b/types/storybook__react/index.d.ts
index aa1d839d42..41de7498b3 100644
--- a/types/storybook__react/index.d.ts
+++ b/types/storybook__react/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for @storybook/react 4.0
-// Project: https://github.com/storybooks/storybook, https://github.com/storybooks/storybook/tree/master/app/react
+// Project: https://github.com/storybookjs/storybook, https://github.com/storybookjs/storybook/tree/master/app/react
 // Definitions by: Joscha Feth <https://github.com/joscha>
 //                 Anton Izmailov <https://github.com/wapgear>
 //                 Dan Dean <https://github.com/dandean>
diff --git a/types/storybook__vue/index.d.ts b/types/storybook__vue/index.d.ts
index 0584e76248..59f04b65d1 100644
--- a/types/storybook__vue/index.d.ts
+++ b/types/storybook__vue/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for @storybook/vue 5.0
-// Project: https://github.com/storybooks/storybook, https://github.com/storybooks/storybook/tree/master/app/vue
+// Project: https://github.com/storybookjs/storybook, https://github.com/storybookjs/storybook/tree/master/app/vue
 // Definitions by: Punit Gupta <https://github.com/pntgupta>
 //                 Jurgis Rudaks <https://github.com/jurgisrudaks>
 //                 Yoyo Young <https://github.com/yoyoys>