diff --git a/js/functions.js b/js/functions.js
index 518582d5fd..7766365cff 100644
--- a/js/functions.js
+++ b/js/functions.js
@@ -5147,7 +5147,7 @@ Functions.configGet = function (key, cached) {
 };
 
 /**
- * Return POST data as stored by Util::linkOrButton
+ * Return POST data as stored by Generator::linkOrButton
  */
 Functions.getPostData = function () {
     var dataPost = this.attr('data-post');
diff --git a/libraries/classes/Twig/UtilExtension.php b/libraries/classes/Twig/UtilExtension.php
index 3a81521473..d9935f2170 100644
--- a/libraries/classes/Twig/UtilExtension.php
+++ b/libraries/classes/Twig/UtilExtension.php
@@ -118,7 +118,7 @@ class UtilExtension extends AbstractExtension
             ),
             new TwigFunction(
                 'get_start_and_number_of_rows_panel',
-                'PhpMyAdmin\Util::getStartAndNumberOfRowsPanel',
+                'PhpMyAdmin\Generator::getStartAndNumberOfRowsPanel',
                 ['is_safe' => ['html']]
             ),
             new TwigFunction(
@@ -132,12 +132,12 @@ class UtilExtension extends AbstractExtension
             ),
             new TwigFunction(
                 'link_or_button',
-                'PhpMyAdmin\Util::linkOrButton',
+                'PhpMyAdmin\Generator::linkOrButton',
                 ['is_safe' => ['html']]
             ),
             new TwigFunction(
                 'link_to_var_documentation',
-                'PhpMyAdmin\Util::linkToVarDocumentation',
+                'PhpMyAdmin\Generator::linkToVarDocumentation',
                 ['is_safe' => ['html']]
             ),
             new TwigFunction(