diff --git a/Controller.php b/Controller.php
index 2d177be..b1ee29f 100644
--- a/Controller.php
+++ b/Controller.php
@@ -50,7 +50,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.
@@ -58,7 +58,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.
@@ -66,7 +66,7 @@ class Controller extends ModuleAbstract implements WebInterface
      * @var string
      * @since 1.0.0
      */
-    /* public */ const MODULE_NAME = 'Organization';
+    public const MODULE_NAME = 'Organization';
 
     /**
      * Module id.
@@ -74,7 +74,7 @@ class Controller extends ModuleAbstract implements WebInterface
      * @var int
      * @since 1.0.0
      */
-    /* public */ const MODULE_ID = 1004700000;
+    public const MODULE_ID = 1004700000;
 
     /**
      * Providing.
diff --git a/Models/PermissionState.php b/Models/PermissionState.php
index 796ffd9..38f0cc1 100644
--- a/Models/PermissionState.php
+++ b/Models/PermissionState.php
@@ -26,7 +26,7 @@ use phpOMS\Stdlib\Base\Enum;
  */
 abstract class PermissionState extends Enum
 {
-    /* public */ const UNIT       = 1;
-    /* public */ const DEPARTMENT = 2;
-    /* public */ const POSITION   = 3;
+    public const UNIT       = 1;
+    public const DEPARTMENT = 2;
+    public const POSITION   = 3;
 }
diff --git a/Models/Status.php b/Models/Status.php
index 94ae97c..11c5c35 100644
--- a/Models/Status.php
+++ b/Models/Status.php
@@ -26,7 +26,7 @@ use phpOMS\Stdlib\Base\Enum;
  */
 abstract class Status extends Enum
 {
-    /* public */ const ACTIVE   = 1;
-    /* public */ const INACTIVE = 2;
-    /* public */ const HIDDEN   = 4;
+    public const ACTIVE   = 1;
+    public const INACTIVE = 2;
+    public const HIDDEN   = 4;
 }