diff --git a/functionMap.php b/functionMap.php
index 0cb4cbc4..31a00424 100644
--- a/functionMap.php
+++ b/functionMap.php
@@ -78,13 +78,12 @@
     'block_core_navigation_build_css_font_sizes' => ['array{css_classes: list<string>, inline_styles: string}'],
     'block_core_navigation_link_build_css_colors' => ['array{css_classes: list<string>, inline_styles: string}'],
     'block_core_navigation_link_build_css_font_sizes' => ['array{css_classes: list<string>, inline_styles: string}'],
-    'block_core_navigation_link_render_submenu_icon' => ['non-falsy-string'],
     'block_core_navigation_render_submenu_icon' => ['non-falsy-string'],
     'block_core_navigation_submenu_build_css_font_sizes' => ['array{css_classes: list<string>, inline_styles: string}'],
-    'block_core_navigation_submenu_render_submenu_icon' => ['non-falsy-string'],
     'block_core_page_list_build_css_colors' => ['array{css_classes: list<string>, inline_styles: string, overlay_css_classes: list<string>, overlay_inline_styles: string}'],
     'block_core_page_list_build_css_font_sizes' => ['array{css_classes: list<string>, inline_styles: string}'],
     'block_core_post_time_to_read_word_count' => ['int<0, max>'],
+    'block_core_shared_navigation_render_submenu_icon' => ['non-falsy-string'],
     'block_version' => ["(\$content is '' ? 0 : 0|1)", '@phpstan-pure' => ''],
     'bool_from_yn' => ["(\$yn is 'y' ? true : false)", '@phpstan-pure' => ''],
     'build_dropdown_script_block_core_categories' => ['non-falsy-string'],
diff --git a/src/Visitor.php b/src/Visitor.php
index 1455fcc6..018f42f9 100644
--- a/src/Visitor.php
+++ b/src/Visitor.php
@@ -457,7 +457,7 @@ private function getAdditionalTagsFromMap(string $symbolName): array
 
         foreach ($parameters as $paramName => $paramType) {
             if (str_starts_with($paramName, '@')) {
-                $format = ( $paramType === '' ) ? '%s' : '%s %s';
+                $format = ($paramType === '') ? '%s' : '%s %s';
                 $additions[] = sprintf(
                     $format,
                     $paramName,
@@ -684,8 +684,8 @@ private static function getTypeNameFromString(string $tagVariable): ?string
 
         $tagVariableType = str_replace(
             [
-            'stdClass',
-            '\\object',
+                'stdClass',
+                '\\object',
             ],
             'object',
             $tagVariableType
diff --git a/tests/data/assert/wp-is-numeric-array.php b/tests/data/assert/wp-is-numeric-array.php
index 0e6a1770..7800ac15 100644
--- a/tests/data/assert/wp-is-numeric-array.php
+++ b/tests/data/assert/wp-is-numeric-array.php
@@ -64,7 +64,7 @@
 // Check with mixed keys constant array
 $data = [1 => 'intKey', 'key' => 'stringKey'];
 if (wp_is_numeric_array($data)) {
-    assertType("non-empty-array<1, 'intKey'|'stringKey'>", $data);
+    assertType("array{1: 'intKey'}", $data);
 }
 if (! wp_is_numeric_array($data)) {
     assertType("array{1: 'intKey', key: 'stringKey'}", $data);
diff --git a/tests/data/return/block-core.php b/tests/data/return/block-core.php
index fe482753..ef2458bb 100644
--- a/tests/data/return/block-core.php
+++ b/tests/data/return/block-core.php
@@ -10,9 +10,8 @@
 assertType('non-falsy-string', build_dropdown_script_block_core_categories(Faker::string()));
 
 // Submenu icon
-assertType('non-falsy-string', block_core_navigation_link_render_submenu_icon());
 assertType('non-falsy-string', block_core_navigation_render_submenu_icon());
-assertType('non-falsy-string', block_core_navigation_submenu_render_submenu_icon());
+assertType('non-falsy-string', block_core_shared_navigation_render_submenu_icon());
 
 // Render block
 assertType('non-falsy-string', render_block_core_archives(Faker::array()));
diff --git a/wordpress-stubs.php b/wordpress-stubs.php
index 8c3a7a27..cef3ab0a 100644
--- a/wordpress-stubs.php
+++ b/wordpress-stubs.php
@@ -114656,6 +114656,7 @@ function block_core_shared_navigation_item_should_render($attributes, $block)
      * @since 5.9.0
      *
      * @return string
+     * @phpstan-return non-falsy-string
      */
     function block_core_shared_navigation_render_submenu_icon()
     {