diff --git a/.eslintrc.js b/.eslintrc.js
index 63bf21aef7..056195208a 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -115,7 +115,6 @@ module.exports = {
         eqeqeq: 'off', // about 20 errors to be fixed manually
         'global-require': 'off', // about 30 errors to be fixed manually
         'no-shadow': 'off', // about 220 errors to be fixed manually
-        'no-shadow-restricted-names': 'off', // TODO https://github.com/fomantic/Fomantic-UI/pull/2604
         'prefer-arrow-callback': 'off', // about 350 errors (all autofixable)
     },
     reportUnusedDisableDirectives: true,
diff --git a/src/definitions/behaviors/api.js b/src/definitions/behaviors/api.js
index 5704776e12..388cd97670 100644
--- a/src/definitions/behaviors/api.js
+++ b/src/definitions/behaviors/api.js
@@ -8,7 +8,7 @@
  *
  */
 
-(function ($, window, document, undefined) {
+(function ($, window, document) {
     'use strict';
 
     function isWindow(obj) {
diff --git a/src/definitions/behaviors/form.js b/src/definitions/behaviors/form.js
index d86c8fb619..34f0eab534 100644
--- a/src/definitions/behaviors/form.js
+++ b/src/definitions/behaviors/form.js
@@ -8,7 +8,7 @@
  *
  */
 
-(function ($, window, document, undefined) {
+(function ($, window, document) {
     'use strict';
 
     function isFunction(obj) {
diff --git a/src/definitions/behaviors/state.js b/src/definitions/behaviors/state.js
index 419eab4f55..c794368531 100644
--- a/src/definitions/behaviors/state.js
+++ b/src/definitions/behaviors/state.js
@@ -8,7 +8,7 @@
  *
  */
 
-(function ($, window, document, undefined) {
+(function ($, window, document) {
     'use strict';
 
     function isFunction(obj) {
diff --git a/src/definitions/behaviors/visibility.js b/src/definitions/behaviors/visibility.js
index 0969cc540f..f3fc689518 100755
--- a/src/definitions/behaviors/visibility.js
+++ b/src/definitions/behaviors/visibility.js
@@ -8,7 +8,7 @@
  *
  */
 
-(function ($, window, document, undefined) {
+(function ($, window, document) {
     'use strict';
 
     function isFunction(obj) {
diff --git a/src/definitions/globals/site.js b/src/definitions/globals/site.js
index f54fdbadcf..6e035af852 100644
--- a/src/definitions/globals/site.js
+++ b/src/definitions/globals/site.js
@@ -8,7 +8,7 @@
  *
  */
 
-(function ($, window, document, undefined) {
+(function ($, window, document) {
     'use strict';
 
     function isFunction(obj) {
diff --git a/src/definitions/modules/accordion.js b/src/definitions/modules/accordion.js
index 371e68ac64..47d68c9ce0 100644
--- a/src/definitions/modules/accordion.js
+++ b/src/definitions/modules/accordion.js
@@ -8,7 +8,7 @@
  *
  */
 
-(function ($, window, document, undefined) {
+(function ($, window, document) {
     'use strict';
 
     function isFunction(obj) {
diff --git a/src/definitions/modules/calendar.js b/src/definitions/modules/calendar.js
index 796a3e8e76..0b1f329b8a 100644
--- a/src/definitions/modules/calendar.js
+++ b/src/definitions/modules/calendar.js
@@ -8,7 +8,7 @@
  *
  */
 
-(function ($, window, document, undefined) {
+(function ($, window, document) {
     'use strict';
 
     function isFunction(obj) {
diff --git a/src/definitions/modules/checkbox.js b/src/definitions/modules/checkbox.js
index bf985c1d33..815145c973 100644
--- a/src/definitions/modules/checkbox.js
+++ b/src/definitions/modules/checkbox.js
@@ -8,7 +8,7 @@
  *
  */
 
-(function ($, window, document, undefined) {
+(function ($, window, document) {
     'use strict';
 
     function isFunction(obj) {
diff --git a/src/definitions/modules/dimmer.js b/src/definitions/modules/dimmer.js
index 596f9c8deb..3ce62e5394 100755
--- a/src/definitions/modules/dimmer.js
+++ b/src/definitions/modules/dimmer.js
@@ -8,7 +8,7 @@
  *
  */
 
-(function ($, window, document, undefined) {
+(function ($, window, document) {
     'use strict';
 
     function isFunction(obj) {
diff --git a/src/definitions/modules/dropdown.js b/src/definitions/modules/dropdown.js
index 81c82df177..829c08a63c 100644
--- a/src/definitions/modules/dropdown.js
+++ b/src/definitions/modules/dropdown.js
@@ -8,7 +8,7 @@
  *
  */
 
-(function ($, window, document, undefined) {
+(function ($, window, document) {
     'use strict';
 
     function isFunction(obj) {
diff --git a/src/definitions/modules/embed.js b/src/definitions/modules/embed.js
index 25a88f7fdc..febaf884ba 100644
--- a/src/definitions/modules/embed.js
+++ b/src/definitions/modules/embed.js
@@ -8,7 +8,7 @@
  *
  */
 
-(function ($, window, document, undefined) {
+(function ($, window, document) {
     'use strict';
 
     function isFunction(obj) {
diff --git a/src/definitions/modules/flyout.js b/src/definitions/modules/flyout.js
index 90d13d9034..7379a3ede0 100644
--- a/src/definitions/modules/flyout.js
+++ b/src/definitions/modules/flyout.js
@@ -8,7 +8,7 @@
  *
  */
 
-(function ($, window, document, undefined) {
+(function ($, window, document) {
     'use strict';
 
     function isFunction(obj) {
diff --git a/src/definitions/modules/modal.js b/src/definitions/modules/modal.js
index 0db5c3f41a..54e0ee5cd7 100755
--- a/src/definitions/modules/modal.js
+++ b/src/definitions/modules/modal.js
@@ -8,7 +8,7 @@
  *
  */
 
-(function ($, window, document, undefined) {
+(function ($, window, document) {
     'use strict';
 
     function isFunction(obj) {
diff --git a/src/definitions/modules/nag.js b/src/definitions/modules/nag.js
index 207b14035a..c0f2e4d590 100644
--- a/src/definitions/modules/nag.js
+++ b/src/definitions/modules/nag.js
@@ -8,7 +8,7 @@
  *
  */
 
-(function ($, window, document, undefined) {
+(function ($, window, document) {
     'use strict';
 
     function isFunction(obj) {
diff --git a/src/definitions/modules/popup.js b/src/definitions/modules/popup.js
index bf7d97187c..201dc9f417 100644
--- a/src/definitions/modules/popup.js
+++ b/src/definitions/modules/popup.js
@@ -8,7 +8,7 @@
  *
  */
 
-(function ($, window, document, undefined) {
+(function ($, window, document) {
     'use strict';
 
     function isFunction(obj) {
diff --git a/src/definitions/modules/progress.js b/src/definitions/modules/progress.js
index 5d81e120a2..f1bb682aed 100644
--- a/src/definitions/modules/progress.js
+++ b/src/definitions/modules/progress.js
@@ -8,7 +8,7 @@
  *
  */
 
-(function ($, window, document, undefined) {
+(function ($, window, document) {
     'use strict';
 
     function isFunction(obj) {
diff --git a/src/definitions/modules/rating.js b/src/definitions/modules/rating.js
index 19e08272d5..3c8603616d 100644
--- a/src/definitions/modules/rating.js
+++ b/src/definitions/modules/rating.js
@@ -8,7 +8,7 @@
  *
  */
 
-(function ($, window, document, undefined) {
+(function ($, window, document) {
     'use strict';
 
     function isFunction(obj) {
diff --git a/src/definitions/modules/search.js b/src/definitions/modules/search.js
index f648b4759f..9eb27be7e9 100644
--- a/src/definitions/modules/search.js
+++ b/src/definitions/modules/search.js
@@ -8,7 +8,7 @@
  *
  */
 
-(function ($, window, document, undefined) {
+(function ($, window, document) {
     'use strict';
 
     function isFunction(obj) {
diff --git a/src/definitions/modules/shape.js b/src/definitions/modules/shape.js
index 6f325f01cc..350cbf4616 100644
--- a/src/definitions/modules/shape.js
+++ b/src/definitions/modules/shape.js
@@ -8,7 +8,7 @@
  *
  */
 
-(function ($, window, document, undefined) {
+(function ($, window, document) {
     'use strict';
 
     function isFunction(obj) {
diff --git a/src/definitions/modules/sidebar.js b/src/definitions/modules/sidebar.js
index c9753a9523..32af257271 100644
--- a/src/definitions/modules/sidebar.js
+++ b/src/definitions/modules/sidebar.js
@@ -8,7 +8,7 @@
  *
  */
 
-(function ($, window, document, undefined) {
+(function ($, window, document) {
     'use strict';
 
     function isFunction(obj) {
diff --git a/src/definitions/modules/slider.js b/src/definitions/modules/slider.js
index 7711a2307b..5bac1f475a 100644
--- a/src/definitions/modules/slider.js
+++ b/src/definitions/modules/slider.js
@@ -8,7 +8,7 @@
  *
  */
 
-(function ($, window, document, undefined) {
+(function ($, window, document) {
     'use strict';
 
     function isFunction(obj) {
diff --git a/src/definitions/modules/sticky.js b/src/definitions/modules/sticky.js
index cd7c912886..55e71edfbc 100755
--- a/src/definitions/modules/sticky.js
+++ b/src/definitions/modules/sticky.js
@@ -8,7 +8,7 @@
  *
  */
 
-(function ($, window, document, undefined) {
+(function ($, window, document) {
     'use strict';
 
     function isFunction(obj) {
diff --git a/src/definitions/modules/tab.js b/src/definitions/modules/tab.js
index 8ed375d8a3..f81def478e 100644
--- a/src/definitions/modules/tab.js
+++ b/src/definitions/modules/tab.js
@@ -8,7 +8,7 @@
  *
  */
 
-(function ($, window, document, undefined) {
+(function ($, window, document) {
     'use strict';
 
     function isWindow(obj) {
diff --git a/src/definitions/modules/toast.js b/src/definitions/modules/toast.js
index 3d602d7609..cc8bce2089 100644
--- a/src/definitions/modules/toast.js
+++ b/src/definitions/modules/toast.js
@@ -8,7 +8,7 @@
  *
  */
 
-(function ($, window, document, undefined) {
+(function ($, window, document) {
     'use strict';
 
     function isFunction(obj) {
diff --git a/src/definitions/modules/transition.js b/src/definitions/modules/transition.js
index 8e2e35593d..fbd4c958c0 100644
--- a/src/definitions/modules/transition.js
+++ b/src/definitions/modules/transition.js
@@ -8,7 +8,7 @@
  *
  */
 
-(function ($, window, document, undefined) {
+(function ($, window, document) {
     'use strict';
 
     function isFunction(obj) {