diff --git a/Controller.php b/Controller.php
index 301d233..918524d 100644
--- a/Controller.php
+++ b/Controller.php
@@ -37,7 +37,7 @@ class Controller extends ModuleAbstract implements WebInterface
      * @var string
      * @since 1.0.0
      */
-    /* public */ const MODULE_PATH = __DIR__;
+    public const MODULE_PATH = __DIR__;
 
     /**
      * Module version.
@@ -45,7 +45,7 @@ class Controller extends ModuleAbstract implements WebInterface
      * @var string
      * @since 1.0.0
      */
-    /* public */ const MODULE_VERSION = '1.0.0';
+    public const MODULE_VERSION = '1.0.0';
 
     /**
      * Module name.
@@ -53,7 +53,7 @@ class Controller extends ModuleAbstract implements WebInterface
      * @var string
      * @since 1.0.0
      */
-    /* public */ const MODULE_NAME = 'Workflow';
+    public const MODULE_NAME = 'Workflow';
 
     /**
      * Module id.
@@ -61,7 +61,7 @@ class Controller extends ModuleAbstract implements WebInterface
      * @var int
      * @since 1.0.0
      */
-    /* public */ const MODULE_ID = 1005500000;
+    public const MODULE_ID = 1005500000;
 
     /**
      * Providing.
diff --git a/Models/WorkflowStatus.php b/Models/WorkflowStatus.php
index c9fc798..ef27259 100644
--- a/Models/WorkflowStatus.php
+++ b/Models/WorkflowStatus.php
@@ -26,10 +26,10 @@ use phpOMS\Stdlib\Base\Enum;
  */
 abstract class WorkflowStatus extends Enum
 {
-    /* public */ const OPEN      = 1;
-    /* public */ const WORKING   = 2;
-    /* public */ const SUSPENDED = 3;
-    /* public */ const CANCELED  = 4;
-    /* public */ const DONE      = 5;
-    /* public */ const CLOSED    = 6;
+    public const OPEN      = 1;
+    public const WORKING   = 2;
+    public const SUSPENDED = 3;
+    public const CANCELED  = 4;
+    public const DONE      = 5;
+    public const CLOSED    = 6;
 }
diff --git a/Templates/Permission/PermissionStatus.php b/Templates/Permission/PermissionStatus.php
index fb47bc1..9b6cc6a 100644
--- a/Templates/Permission/PermissionStatus.php
+++ b/Templates/Permission/PermissionStatus.php
@@ -26,7 +26,7 @@ use phpOMS\Stdlib\Base\Enum;
  */
 abstract class PermissionStatus extends Enum
 {
-    /* public */ const PENDING   = 1;
-    /* public */ const APPROVED  = 2;
-    /* public */ const DISMISSED = 3;
+    public const PENDING   = 1;
+    public const APPROVED  = 2;
+    public const DISMISSED = 3;
 }
diff --git a/Templates/Permission/States.php b/Templates/Permission/States.php
index 3076466..829ca77 100644
--- a/Templates/Permission/States.php
+++ b/Templates/Permission/States.php
@@ -26,8 +26,8 @@ use phpOMS\Stdlib\Base\Enum;
  */
 abstract class States extends Enum
 {
-    /* public */ const DEFAULT   = 0;
-    /* public */ const PENDING   = 1;
-    /* public */ const APPROVED  = 2;
-    /* public */ const DISMISSED = 3;
+    public const DEFAULT   = 0;
+    public const PENDING   = 1;
+    public const APPROVED  = 2;
+    public const DISMISSED = 3;
 }