diff --git a/concrete/blocks/switch_language/templates/flags/view.php b/concrete/blocks/switch_language/templates/flags/view.php
index e19c8c7bf58..6403f38a205 100644
--- a/concrete/blocks/switch_language/templates/flags/view.php
+++ b/concrete/blocks/switch_language/templates/flags/view.php
@@ -1,4 +1,29 @@
-<?php defined('C5_EXECUTE') or die('Access Denied.');
+<?php
+defined('C5_EXECUTE') or die('Access Denied.');
+
+/* @var Concrete\Core\Form\Service\Form $form */
+/* @var Concrete\Core\Block\View\BlockView $view */
+
+// The text label as configured by the user
+/* @var string $label */
+
+// Array keys are the multilingual section IDs, array values are the language names (in their own language)
+/* @var array $languages */
+
+// The list of multilanguage language sections
+/* @var Concrete\Core\Multilingual\Page\Section\Section[] $languageSections */
+
+// The ID of the currently active multilingual section (if available)
+/* @var int|null $activeLanguage */
+
+// The default multilingual section
+/* @var Concrete\Core\Multilingual\Page\Section\Section $defaultLocale */
+
+// The current language code (without Country code)
+/* @var string $locale */
+
+// The ID of the current page
+/* @var int $cID */
 $ih = Core::make('multilingual/interface/flag');
 ?>
 <div class="ccm-block-switch-language-flags">
@@ -6,7 +31,7 @@
     <?php
     foreach ($languageSections as $ml) {
         ?>
-        <a href="<?= $controller->resolve_language_url($cID, $ml->getCollectionID()) ?>" title="<?= $ml->getLanguageText($locale) ?>" class="<?php if ($activeLanguage == $ml->getCollectionID()) { ?>ccm-block-switch-language-active-flag<?php } ?>"><?= $ih->getSectionFlagIcon($ml) ?></a>
+        <a href="<?= $controller->resolve_language_url($cID, $ml->getCollectionID()) ?>" title="<?= $languages[$ml->getCollectionID()] ?>" class="<?php if ($activeLanguage == $ml->getCollectionID()) { ?>ccm-block-switch-language-active-flag<?php } ?>"><?= $ih->getSectionFlagIcon($ml) ?></a>
         <?php
     }
     ?>
diff --git a/concrete/blocks/switch_language/templates/flags_set_default/view.php b/concrete/blocks/switch_language/templates/flags_set_default/view.php
index d8371993abe..90eaac031cf 100644
--- a/concrete/blocks/switch_language/templates/flags_set_default/view.php
+++ b/concrete/blocks/switch_language/templates/flags_set_default/view.php
@@ -1,4 +1,29 @@
-<?php defined('C5_EXECUTE') or die('Access Denied.');
+<?php
+defined('C5_EXECUTE') or die('Access Denied.');
+
+/* @var Concrete\Core\Form\Service\Form $form */
+/* @var Concrete\Core\Block\View\BlockView $view */
+
+// The text label as configured by the user
+/* @var string $label */
+
+// Array keys are the multilingual section IDs, array values are the language names (in their own language)
+/* @var array $languages */
+
+// The list of multilanguage language sections
+/* @var Concrete\Core\Multilingual\Page\Section\Section[] $languageSections */
+
+// The ID of the currently active multilingual section (if available)
+/* @var int|null $activeLanguage */
+
+// The default multilingual section
+/* @var Concrete\Core\Multilingual\Page\Section\Section $defaultLocale */
+
+// The current language code (without Country code)
+/* @var string $locale */
+
+// The ID of the current page
+/* @var int $cID */
 $ih = Core::make('multilingual/interface/flag');
 ?>
 
@@ -20,7 +45,7 @@
                     <label>
                         <input type="radio" name="language" value="<?= $ml->getCollectionID() ?>" <?php if (is_object($defaultLocale) && $defaultLocale->getCollectionID() == $ml->getCollectionID()) { ?> checked="checked" <?php } ?> />
                         <?= $ih->getSectionFlagIcon($ml) ?>
-                        <?= $ml->getLanguageText($locale) ?>
+                        <?= $languages[$ml->getCollectionID()] ?>
                     </label>
                 </div>
                 <?php
diff --git a/concrete/blocks/switch_language/view.php b/concrete/blocks/switch_language/view.php
index 0f01c3b47d0..a7fdc59a49a 100644
--- a/concrete/blocks/switch_language/view.php
+++ b/concrete/blocks/switch_language/view.php
@@ -4,14 +4,26 @@
 /* @var Concrete\Core\Form\Service\Form $form */
 /* @var Concrete\Core\Block\View\BlockView $view */
 
-/* @var string $label The text label as configured by the user */
-
-/* @var array $languages Array keys are the multilingual section IDs, array values are the language names (in their own language) */
-/* @var Concrete\Core\Multilingual\Page\Section\Section[] $languageSections The list of multilanguage language sections */
-/* @var int|null $activeLanguage The ID of the currently active multilingual section (if available) */
-/* @var Concrete\Core\Multilingual\Page\Section\Section $defaultLocale The default multilingual section */
-/* @var string $locale The current language code (without Country code) */
-/* @var int $cID The ID of the current page */
+// The text label as configured by the user
+/* @var string $label */
+
+// Array keys are the multilingual section IDs, array values are the language names (in their own language)
+/* @var array $languages */
+
+// The list of multilanguage language sections
+/* @var Concrete\Core\Multilingual\Page\Section\Section[] $languageSections */
+
+// The ID of the currently active multilingual section (if available)
+/* @var int|null $activeLanguage */
+
+// The default multilingual section
+/* @var Concrete\Core\Multilingual\Page\Section\Section $defaultLocale */
+
+// The current language code (without Country code)
+/* @var string $locale */
+
+// The ID of the current page
+/* @var int $cID */
 ?>
 
 <div class="ccm-block-switch-language">