diff --git a/modules/backend/behaviors/FormController.php b/modules/backend/behaviors/FormController.php
index e484ef9353..645332cb62 100644
--- a/modules/backend/behaviors/FormController.php
+++ b/modules/backend/behaviors/FormController.php
@@ -46,17 +46,17 @@ class FormController extends ControllerBehavior
     /**
      * @var string Default context for "create" pages.
      */
-    const CONTEXT_CREATE = 'create';
+    public const CONTEXT_CREATE = 'create';
 
     /**
      * @var string Default context for "update" pages.
      */
-    const CONTEXT_UPDATE = 'update';
+    public const CONTEXT_UPDATE = 'update';
 
     /**
      * @var string Default context for "preview" pages.
      */
-    const CONTEXT_PREVIEW = 'preview';
+    public const CONTEXT_PREVIEW = 'preview';
 
     /**
      * @var \Backend\Classes\Controller|FormController Reference to the back end controller.
diff --git a/modules/backend/behaviors/RelationController.php b/modules/backend/behaviors/RelationController.php
index 112c1795d1..337e114a42 100644
--- a/modules/backend/behaviors/RelationController.php
+++ b/modules/backend/behaviors/RelationController.php
@@ -35,17 +35,17 @@ class RelationController extends ControllerBehavior
     /**
      * @var const Postback parameter for the active relationship field.
      */
-    const PARAM_FIELD = '_relation_field';
+    public const PARAM_FIELD = '_relation_field';
 
     /**
      * @var const Postback parameter for the active management mode.
      */
-    const PARAM_MODE = '_relation_mode';
+    public const PARAM_MODE = '_relation_mode';
 
     /**
      * @var const Postback parameter for read only mode.
      */
-    const PARAM_EXTRA_CONFIG = '_relation_extra_config';
+    public const PARAM_EXTRA_CONFIG = '_relation_extra_config';
 
     /**
      * @var Backend\Widgets\Search Reference to the search widget object.
diff --git a/modules/backend/behaviors/importexportcontroller/TranscodeFilter.php b/modules/backend/behaviors/importexportcontroller/TranscodeFilter.php
index f32248befe..95c4678c1e 100644
--- a/modules/backend/behaviors/importexportcontroller/TranscodeFilter.php
+++ b/modules/backend/behaviors/importexportcontroller/TranscodeFilter.php
@@ -13,7 +13,7 @@
  */
 class TranscodeFilter extends php_user_filter
 {
-    const FILTER_NAME = 'winter.csv.transcode.';
+    public const FILTER_NAME = 'winter.csv.transcode.';
 
     protected $encodingFrom = 'auto';
 
diff --git a/modules/backend/classes/FormField.php b/modules/backend/classes/FormField.php
index d861e144b3..3a19e814a5 100644
--- a/modules/backend/classes/FormField.php
+++ b/modules/backend/classes/FormField.php
@@ -21,12 +21,12 @@ class FormField
     /**
      * @var int Value returned when the form field should not contribute any save data.
      */
-    const NO_SAVE_DATA = -1;
+    public const NO_SAVE_DATA = -1;
 
     /**
      * @var string A special character in yaml config files to indicate a field higher in hierarchy
      */
-    const HIERARCHY_UP = '^';
+    public const HIERARCHY_UP = '^';
 
     /**
      * @var string Form field name.
diff --git a/modules/backend/classes/FormTabs.php b/modules/backend/classes/FormTabs.php
index 462671ad4d..0e96caedf8 100644
--- a/modules/backend/classes/FormTabs.php
+++ b/modules/backend/classes/FormTabs.php
@@ -16,9 +16,9 @@
  */
 class FormTabs implements IteratorAggregate, ArrayAccess
 {
-    const SECTION_OUTSIDE = 'outside';
-    const SECTION_PRIMARY = 'primary';
-    const SECTION_SECONDARY = 'secondary';
+    public const SECTION_OUTSIDE = 'outside';
+    public const SECTION_PRIMARY = 'primary';
+    public const SECTION_SECONDARY = 'secondary';
 
     /**
      * @var string Specifies the form section these tabs belong to.
diff --git a/modules/backend/formwidgets/ColorPicker.php b/modules/backend/formwidgets/ColorPicker.php
index 068bdbc696..457b1dadcc 100644
--- a/modules/backend/formwidgets/ColorPicker.php
+++ b/modules/backend/formwidgets/ColorPicker.php
@@ -18,7 +18,7 @@
 class ColorPicker extends FormWidgetBase
 {
     // All color formats supported
-    const ALL_FORMATS = ['cmyk', 'hex', 'hsl', 'rgb'];
+    public const ALL_FORMATS = ['cmyk', 'hex', 'hsl', 'rgb'];
 
     //
     // Configurable properties
diff --git a/modules/backend/formwidgets/TagList.php b/modules/backend/formwidgets/TagList.php
index 8841d29393..755d83e166 100644
--- a/modules/backend/formwidgets/TagList.php
+++ b/modules/backend/formwidgets/TagList.php
@@ -12,9 +12,9 @@ class TagList extends FormWidgetBase
 {
     use \Backend\Traits\FormModelWidget;
 
-    const MODE_ARRAY = 'array';
-    const MODE_STRING = 'string';
-    const MODE_RELATION = 'relation';
+    public const MODE_ARRAY = 'array';
+    public const MODE_STRING = 'string';
+    public const MODE_RELATION = 'relation';
 
     //
     // Configurable properties
diff --git a/modules/backend/models/BrandSetting.php b/modules/backend/models/BrandSetting.php
index bd39d837dc..abb5d103e8 100644
--- a/modules/backend/models/BrandSetting.php
+++ b/modules/backend/models/BrandSetting.php
@@ -52,13 +52,13 @@ class BrandSetting extends Model
      */
     public $cacheKey = 'backend::brand.custom_css';
 
-    const PRIMARY_COLOR   = '#34495e'; // Wet Asphalt
-    const SECONDARY_COLOR = '#e67e22'; // Pumpkin
-    const ACCENT_COLOR    = '#3498db'; // Peter River
+    public const PRIMARY_COLOR   = '#34495e'; // Wet Asphalt
+    public const SECONDARY_COLOR = '#e67e22'; // Pumpkin
+    public const ACCENT_COLOR    = '#3498db'; // Peter River
 
-    const INLINE_MENU   = 'inline';
-    const TILE_MENU     = 'tile';
-    const COLLAPSE_MENU = 'collapse';
+    public const INLINE_MENU   = 'inline';
+    public const TILE_MENU     = 'tile';
+    public const COLLAPSE_MENU = 'collapse';
 
     /**
      * Validation rules
diff --git a/modules/backend/models/Preference.php b/modules/backend/models/Preference.php
index 03fa8f453d..954dcdc3de 100644
--- a/modules/backend/models/Preference.php
+++ b/modules/backend/models/Preference.php
@@ -22,7 +22,7 @@ class Preference extends Model
 {
     use \Winter\Storm\Database\Traits\Validation;
 
-    const DEFAULT_THEME = 'twilight';
+    public const DEFAULT_THEME = 'twilight';
 
     /**
      * @var array Behaviors implemented by this model.
diff --git a/modules/backend/models/UserGroup.php b/modules/backend/models/UserGroup.php
index 76970e9d17..3d0ed71d12 100644
--- a/modules/backend/models/UserGroup.php
+++ b/modules/backend/models/UserGroup.php
@@ -12,7 +12,7 @@
  */
 class UserGroup extends GroupBase
 {
-    const CODE_OWNERS = 'owners';
+    public const CODE_OWNERS = 'owners';
 
     /**
      * @var string The database table used by the model.
diff --git a/modules/backend/models/UserRole.php b/modules/backend/models/UserRole.php
index e4a002ac4b..1675bd07b7 100644
--- a/modules/backend/models/UserRole.php
+++ b/modules/backend/models/UserRole.php
@@ -13,8 +13,8 @@
  */
 class UserRole extends RoleBase
 {
-    const CODE_DEVELOPER = 'developer';
-    const CODE_PUBLISHER = 'publisher';
+    public const CODE_DEVELOPER = 'developer';
+    public const CODE_PUBLISHER = 'publisher';
 
     /**
      * @var string The database table used by the model.
diff --git a/modules/backend/widgets/MediaManager.php b/modules/backend/widgets/MediaManager.php
index c64dea69ef..05dd1f0219 100644
--- a/modules/backend/widgets/MediaManager.php
+++ b/modules/backend/widgets/MediaManager.php
@@ -25,17 +25,17 @@ class MediaManager extends WidgetBase
     use \Backend\Traits\UploadableWidget;
     use \Backend\Traits\PreferenceMaker;
 
-    const FOLDER_ROOT = '/';
+    public const FOLDER_ROOT = '/';
 
-    const VIEW_MODE_GRID = 'grid';
-    const VIEW_MODE_LIST = 'list';
-    const VIEW_MODE_TILES = 'tiles';
+    public const VIEW_MODE_GRID = 'grid';
+    public const VIEW_MODE_LIST = 'list';
+    public const VIEW_MODE_TILES = 'tiles';
 
-    const SELECTION_MODE_NORMAL = 'normal';
-    const SELECTION_MODE_FIXED_RATIO = 'fixed-ratio';
-    const SELECTION_MODE_FIXED_SIZE = 'fixed-size';
+    public const SELECTION_MODE_NORMAL = 'normal';
+    public const SELECTION_MODE_FIXED_RATIO = 'fixed-ratio';
+    public const SELECTION_MODE_FIXED_SIZE = 'fixed-size';
 
-    const FILTER_ALL = 'all';
+    public const FILTER_ALL = 'all';
 
     /**
      * @var boolean Determines whether the widget is in readonly mode or not.
diff --git a/modules/backend/widgets/form/partials/_field_range.php b/modules/backend/widgets/form/partials/_field_range.php
index 77f774821b..8370131227 100644
--- a/modules/backend/widgets/form/partials/_field_range.php
+++ b/modules/backend/widgets/form/partials/_field_range.php
@@ -28,7 +28,7 @@
     <span style="position: absolute; transform: translateX(-50%)"></span>
     <script>
         (() => {
-            const input = document.getElementById("<?= $field->getId() ?>");
+            public const input = document.getElementById("<?= $field->getId() ?>");
             input.addEventListener("input", function () {
                 this.nextElementSibling.innerHTML = this.value;
                 var pos = ((this.value - <?= $min ?>) / (<?= $max ?> - <?= $min ?>) * 100);
diff --git a/modules/cms/classes/Layout.php b/modules/cms/classes/Layout.php
index f2c6500198..5af5ab4e38 100644
--- a/modules/cms/classes/Layout.php
+++ b/modules/cms/classes/Layout.php
@@ -13,7 +13,7 @@ class Layout extends CmsCompoundObject
     /**
      * Fallback layout name.
      */
-    const FALLBACK_FILE_NAME = 'fallback';
+    public const FALLBACK_FILE_NAME = 'fallback';
 
     /**
      * @var string The container name associated with the model, eg: pages.
diff --git a/modules/cms/classes/Theme.php b/modules/cms/classes/Theme.php
index a57ceb04be..202d9eaaf4 100644
--- a/modules/cms/classes/Theme.php
+++ b/modules/cms/classes/Theme.php
@@ -60,8 +60,8 @@ class Theme extends CmsObject
      */
     protected $defaultExtension = 'yaml';
 
-    const ACTIVE_KEY = 'cms::theme.active';
-    const EDIT_KEY = 'cms::theme.edit';
+    public const ACTIVE_KEY = 'cms::theme.active';
+    public const EDIT_KEY = 'cms::theme.edit';
 
     /**
      * Loads the theme.
diff --git a/modules/cms/models/ThemeLog.php b/modules/cms/models/ThemeLog.php
index 4cceaabc36..ef4007dd87 100644
--- a/modules/cms/models/ThemeLog.php
+++ b/modules/cms/models/ThemeLog.php
@@ -17,9 +17,9 @@
  */
 class ThemeLog extends Model
 {
-    const TYPE_CREATE = 'create';
-    const TYPE_UPDATE = 'update';
-    const TYPE_DELETE = 'delete';
+    public const TYPE_CREATE = 'create';
+    public const TYPE_UPDATE = 'update';
+    public const TYPE_DELETE = 'delete';
 
     /**
      * @var string The database table used by the model.
diff --git a/modules/cms/twig/DebugExtension.php b/modules/cms/twig/DebugExtension.php
index 5724bf348e..edbf94bf24 100644
--- a/modules/cms/twig/DebugExtension.php
+++ b/modules/cms/twig/DebugExtension.php
@@ -15,10 +15,10 @@
 
 class DebugExtension extends TwigExtension
 {
-    const PAGE_CAPTION = 'Page variables';
-    const ARRAY_CAPTION = 'Array variables';
-    const OBJECT_CAPTION = 'Object variables';
-    const COMPONENT_CAPTION = 'Component variables';
+    public const PAGE_CAPTION = 'Page variables';
+    public const ARRAY_CAPTION = 'Array variables';
+    public const OBJECT_CAPTION = 'Object variables';
+    public const COMPONENT_CAPTION = 'Component variables';
 
     /**
      * @var integer Helper for rendering table row styles.
diff --git a/modules/cms/widgets/TemplateList.php b/modules/cms/widgets/TemplateList.php
index 457a518774..110ec98c7b 100644
--- a/modules/cms/widgets/TemplateList.php
+++ b/modules/cms/widgets/TemplateList.php
@@ -21,7 +21,7 @@ class TemplateList extends WidgetBase
     use \Backend\Traits\SelectableWidget;
     use \Backend\Traits\CollapsableWidget;
 
-    const SORTING_FILENAME = 'fileName';
+    public const SORTING_FILENAME = 'fileName';
 
     protected $searchTerm = false;
 
diff --git a/modules/system/classes/MarkupManager.php b/modules/system/classes/MarkupManager.php
index cf030380df..7b1f05fafd 100644
--- a/modules/system/classes/MarkupManager.php
+++ b/modules/system/classes/MarkupManager.php
@@ -24,9 +24,9 @@ class MarkupManager
 {
     use \Winter\Storm\Support\Traits\Singleton;
 
-    const EXTENSION_FILTER = 'filters';
-    const EXTENSION_FUNCTION = 'functions';
-    const EXTENSION_TOKEN_PARSER = 'tokens';
+    public const EXTENSION_FILTER = 'filters';
+    public const EXTENSION_FUNCTION = 'functions';
+    public const EXTENSION_TOKEN_PARSER = 'tokens';
 
     /**
      * @var array Cache of registration callbacks.
diff --git a/modules/system/classes/MediaLibrary.php b/modules/system/classes/MediaLibrary.php
index ca446b4035..c1c62e8d3a 100644
--- a/modules/system/classes/MediaLibrary.php
+++ b/modules/system/classes/MediaLibrary.php
@@ -25,11 +25,11 @@ class MediaLibrary
 {
     use \Winter\Storm\Support\Traits\Singleton;
 
-    const SORT_BY_TITLE = 'title';
-    const SORT_BY_SIZE = 'size';
-    const SORT_BY_MODIFIED = 'modified';
-    const SORT_DIRECTION_ASC = 'asc';
-    const SORT_DIRECTION_DESC = 'desc';
+    public const SORT_BY_TITLE = 'title';
+    public const SORT_BY_SIZE = 'size';
+    public const SORT_BY_MODIFIED = 'modified';
+    public const SORT_DIRECTION_ASC = 'asc';
+    public const SORT_DIRECTION_DESC = 'desc';
 
     /**
      * @var string Cache key
diff --git a/modules/system/classes/MediaLibraryItem.php b/modules/system/classes/MediaLibraryItem.php
index b6566a96d6..ef09a9cf7f 100644
--- a/modules/system/classes/MediaLibraryItem.php
+++ b/modules/system/classes/MediaLibraryItem.php
@@ -15,13 +15,13 @@
  */
 class MediaLibraryItem
 {
-    const TYPE_FILE = 'file';
-    const TYPE_FOLDER = 'folder';
+    public const TYPE_FILE = 'file';
+    public const TYPE_FOLDER = 'folder';
 
-    const FILE_TYPE_IMAGE = 'image';
-    const FILE_TYPE_VIDEO = 'video';
-    const FILE_TYPE_AUDIO = 'audio';
-    const FILE_TYPE_DOCUMENT = 'document';
+    public const FILE_TYPE_IMAGE = 'image';
+    public const FILE_TYPE_VIDEO = 'video';
+    public const FILE_TYPE_AUDIO = 'audio';
+    public const FILE_TYPE_DOCUMENT = 'document';
 
     /**
      * @var string Specifies the item path relative to the Library root.
diff --git a/modules/system/classes/SettingsManager.php b/modules/system/classes/SettingsManager.php
index c8b7bda076..0ad0b26556 100644
--- a/modules/system/classes/SettingsManager.php
+++ b/modules/system/classes/SettingsManager.php
@@ -21,20 +21,20 @@ class SettingsManager
     /**
      * Allocated category types
      */
-    const CATEGORY_CMS = 'system::lang.system.categories.cms';
-    const CATEGORY_MISC = 'system::lang.system.categories.misc';
-    const CATEGORY_MAIL = 'system::lang.system.categories.mail';
-    const CATEGORY_LOGS = 'system::lang.system.categories.logs';
-    const CATEGORY_SHOP = 'system::lang.system.categories.shop';
-    const CATEGORY_TEAM = 'system::lang.system.categories.team';
-    const CATEGORY_USERS = 'system::lang.system.categories.users';
-    const CATEGORY_SOCIAL = 'system::lang.system.categories.social';
-    const CATEGORY_SYSTEM = 'system::lang.system.categories.system';
-    const CATEGORY_EVENTS = 'system::lang.system.categories.events';
-    const CATEGORY_BACKEND = 'system::lang.system.categories.backend';
-    const CATEGORY_CUSTOMERS = 'system::lang.system.categories.customers';
-    const CATEGORY_MYSETTINGS = 'system::lang.system.categories.my_settings';
-    const CATEGORY_NOTIFICATIONS = 'system::lang.system.categories.notifications';
+    public const CATEGORY_CMS = 'system::lang.system.categories.cms';
+    public const CATEGORY_MISC = 'system::lang.system.categories.misc';
+    public const CATEGORY_MAIL = 'system::lang.system.categories.mail';
+    public const CATEGORY_LOGS = 'system::lang.system.categories.logs';
+    public const CATEGORY_SHOP = 'system::lang.system.categories.shop';
+    public const CATEGORY_TEAM = 'system::lang.system.categories.team';
+    public const CATEGORY_USERS = 'system::lang.system.categories.users';
+    public const CATEGORY_SOCIAL = 'system::lang.system.categories.social';
+    public const CATEGORY_SYSTEM = 'system::lang.system.categories.system';
+    public const CATEGORY_EVENTS = 'system::lang.system.categories.events';
+    public const CATEGORY_BACKEND = 'system::lang.system.categories.backend';
+    public const CATEGORY_CUSTOMERS = 'system::lang.system.categories.customers';
+    public const CATEGORY_MYSETTINGS = 'system::lang.system.categories.my_settings';
+    public const CATEGORY_NOTIFICATIONS = 'system::lang.system.categories.notifications';
 
     /**
      * @var array Cache of registration callbacks.
diff --git a/modules/system/classes/VersionManager.php b/modules/system/classes/VersionManager.php
index cb4c40115e..3a1ef0f3b4 100644
--- a/modules/system/classes/VersionManager.php
+++ b/modules/system/classes/VersionManager.php
@@ -26,13 +26,13 @@ class VersionManager
     /**
      * Value when no updates are found.
      */
-    const NO_VERSION_VALUE = 0;
+    public const NO_VERSION_VALUE = 0;
 
     /**
      * Morph types for history table.
      */
-    const HISTORY_TYPE_COMMENT = 'comment';
-    const HISTORY_TYPE_SCRIPT = 'script';
+    public const HISTORY_TYPE_COMMENT = 'comment';
+    public const HISTORY_TYPE_SCRIPT = 'script';
 
     /**
      * @var \Illuminate\Console\OutputStyle
diff --git a/modules/system/console/asset/npm/NpmVersion.php b/modules/system/console/asset/npm/NpmVersion.php
index f119c53f74..823a824041 100644
--- a/modules/system/console/asset/npm/NpmVersion.php
+++ b/modules/system/console/asset/npm/NpmVersion.php
@@ -6,7 +6,7 @@
 
 class NpmVersion extends NpmCommand
 {
-    const NPM_MINIMUM_SUPPORTED_VERSION = '7.0';
+    public const NPM_MINIMUM_SUPPORTED_VERSION = '7.0';
 
     /**
      * @var string|null The default command name for lazy loading.
diff --git a/modules/system/models/MailBrandSetting.php b/modules/system/models/MailBrandSetting.php
index 89506af4cc..f69d801477 100644
--- a/modules/system/models/MailBrandSetting.php
+++ b/modules/system/models/MailBrandSetting.php
@@ -43,18 +43,18 @@ class MailBrandSetting extends Model
      */
     public $cacheKey = 'system::mailbrand.custom_css';
 
-    const WHITE_COLOR = '#fff';
-    const BODY_BG = '#f5f8fa';
-    const PRIMARY_BG = '#3498db';
-    const POSITIVE_BG = '#31ac5f';
-    const NEGATIVE_BG = '#ab2a1c';
-    const HEADER_COLOR = '#bbbfc3';
-    const HEADING_COLOR = '#2f3133';
-    const TEXT_COLOR = '#74787e';
-    const LINK_COLOR = '#0181b9';
-    const FOOTER_COLOR = '#aeaeae';
-    const BORDER_COLOR = '#edeff2';
-    const PROMOTION_BORDER_COLOR = '#9ba2ab';
+    public const WHITE_COLOR = '#fff';
+    public const BODY_BG = '#f5f8fa';
+    public const PRIMARY_BG = '#3498db';
+    public const POSITIVE_BG = '#31ac5f';
+    public const NEGATIVE_BG = '#ab2a1c';
+    public const HEADER_COLOR = '#bbbfc3';
+    public const HEADING_COLOR = '#2f3133';
+    public const TEXT_COLOR = '#74787e';
+    public const LINK_COLOR = '#0181b9';
+    public const FOOTER_COLOR = '#aeaeae';
+    public const BORDER_COLOR = '#edeff2';
+    public const PROMOTION_BORDER_COLOR = '#9ba2ab';
 
     /**
      * Validation rules
diff --git a/modules/system/models/MailSetting.php b/modules/system/models/MailSetting.php
index e0f45bcc5c..72a738d5e1 100644
--- a/modules/system/models/MailSetting.php
+++ b/modules/system/models/MailSetting.php
@@ -15,10 +15,10 @@ class MailSetting extends Model
 {
     use \Winter\Storm\Database\Traits\Validation;
 
-    const MODE_LOG       = 'log';
-    const MODE_MAIL      = 'mail';
-    const MODE_SENDMAIL  = 'sendmail';
-    const MODE_SMTP      = 'smtp';
+    public const MODE_LOG       = 'log';
+    public const MODE_MAIL      = 'mail';
+    public const MODE_SENDMAIL  = 'sendmail';
+    public const MODE_SMTP      = 'smtp';
 
     /**
      * @var array Behaviors implemented by this model.
diff --git a/modules/system/tests/classes/PluginManagerTest.php b/modules/system/tests/classes/PluginManagerTest.php
index 8aacfedfa1..859fe2bdad 100644
--- a/modules/system/tests/classes/PluginManagerTest.php
+++ b/modules/system/tests/classes/PluginManagerTest.php
@@ -8,10 +8,10 @@
 
 class PluginManagerTest extends PluginManagerTestCase
 {
-    const INSTALLED_PLUGIN_COUNT = 17;
-    const ENABLED_PLUGIN_COUNT = 14;
-    const PLUGIN_NAMESPACE_COUNT = 18;
-    const PLUGIN_VENDOR_COUNT = 5;
+    public const INSTALLED_PLUGIN_COUNT = 17;
+    public const ENABLED_PLUGIN_COUNT = 14;
+    public const PLUGIN_NAMESPACE_COUNT = 18;
+    public const PLUGIN_VENDOR_COUNT = 5;
 
     //
     // Tests