diff --git a/Controller.php b/Controller.php
index 935e010..f60caa1 100644
--- a/Controller.php
+++ b/Controller.php
@@ -40,7 +40,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.
@@ -48,7 +48,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.
@@ -56,7 +56,7 @@ class Controller extends ModuleAbstract implements WebInterface
      * @var string
      * @since 1.0.0
      */
-    /* public */ const MODULE_NAME = 'Accounting';
+    public const MODULE_NAME = 'Accounting';
 
     /**
      * Module id.
@@ -64,7 +64,7 @@ class Controller extends ModuleAbstract implements WebInterface
      * @var int
      * @since 1.0.0
      */
-    /* public */ const MODULE_ID = 1002600000;
+    public const MODULE_ID = 1002600000;
 
     /**
      * Providing.
diff --git a/Models/AccountType.php b/Models/AccountType.php
index 372ca99..8f026c4 100644
--- a/Models/AccountType.php
+++ b/Models/AccountType.php
@@ -26,8 +26,8 @@ use phpOMS\Stdlib\Base\Enum;
  */
 abstract class AccountType extends Enum
 {
-    /* public */ const IMPERSONAL = 0;
-    /* public */ const PERSONAL   = 1;
-    /* public */ const CREDITOR   = 2;
-    /* public */ const DEBITOR    = 4;
+    public const IMPERSONAL = 0;
+    public const PERSONAL   = 1;
+    public const CREDITOR   = 2;
+    public const DEBITOR    = 4;
 }
diff --git a/Models/TimeRangeType.php b/Models/TimeRangeType.php
index f00c802..e6a9f66 100644
--- a/Models/TimeRangeType.php
+++ b/Models/TimeRangeType.php
@@ -26,8 +26,8 @@ use phpOMS\Stdlib\Base\Enum;
  */
 abstract class TimeRangeType extends Enum
 {
-    /* public */ const ENTRY_DATE      = 0; /* Date of when the entry happened */
-    /* public */ const DUE_DATE        = 1; /* Date of when the entry is due (only for invoices) */
-    /* public */ const RECEIPT_DATE    = 2; /* Date of the receipt */
-    /* public */ const ASSOCIATED_DATE = 3; /* Date of the association (e.g. when did the articles arrive) */
+    public const ENTRY_DATE      = 0; /* Date of when the entry happened */
+    public const DUE_DATE        = 1; /* Date of when the entry is due (only for invoices) */
+    public const RECEIPT_DATE    = 2; /* Date of the receipt */
+    public const ASSOCIATED_DATE = 3; /* Date of the association (e.g. when did the articles arrive) */
 }