diff --git a/app/Commands/Component/AddComponentCommand.php b/app/Commands/Component/AddComponentCommand.php
index 24161911..5b26698f 100644
--- a/app/Commands/Component/AddComponentCommand.php
+++ b/app/Commands/Component/AddComponentCommand.php
@@ -63,10 +63,10 @@ final class AddComponentCommand
     public $rules = [
         'name'        => 'required|string',
         'description' => 'string',
-        'status'      => 'required|integer',
+        'status'      => 'required|int',
         'link'        => 'url',
-        'order'       => 'integer',
-        'group_id'    => 'integer',
+        'order'       => 'int',
+        'group_id'    => 'int',
     ];
 
     /**
diff --git a/app/Commands/Component/UpdateComponentCommand.php b/app/Commands/Component/UpdateComponentCommand.php
index c48ddeaa..8e50ca0a 100644
--- a/app/Commands/Component/UpdateComponentCommand.php
+++ b/app/Commands/Component/UpdateComponentCommand.php
@@ -72,10 +72,10 @@ final class UpdateComponentCommand
     public $rules = [
         'name'        => 'string',
         'description' => 'string',
-        'status'      => 'integer',
+        'status'      => 'int',
         'link'        => 'url',
-        'order'       => 'integer',
-        'group_id'    => 'integer',
+        'order'       => 'int',
+        'group_id'    => 'int',
     ];
 
     /**
diff --git a/app/Commands/ComponentGroup/AddComponentGroupCommand.php b/app/Commands/ComponentGroup/AddComponentGroupCommand.php
index 90d74150..b4424d7f 100644
--- a/app/Commands/ComponentGroup/AddComponentGroupCommand.php
+++ b/app/Commands/ComponentGroup/AddComponentGroupCommand.php
@@ -34,7 +34,7 @@ final class AddComponentGroupCommand
      */
     public $rules = [
         'name'  => 'required|string',
-        'order' => 'integer',
+        'order' => 'int',
     ];
 
     /**
diff --git a/app/Commands/ComponentGroup/UpdateComponentGroupCommand.php b/app/Commands/ComponentGroup/UpdateComponentGroupCommand.php
index d9b6ce87..fd969770 100644
--- a/app/Commands/ComponentGroup/UpdateComponentGroupCommand.php
+++ b/app/Commands/ComponentGroup/UpdateComponentGroupCommand.php
@@ -43,7 +43,7 @@ final class UpdateComponentGroupCommand
      */
     public $rules = [
         'name'  => 'string',
-        'order' => 'integer',
+        'order' => 'int',
     ];
 
     /**
diff --git a/app/Commands/Incident/ReportIncidentCommand.php b/app/Commands/Incident/ReportIncidentCommand.php
index da99e773..56fcecda 100644
--- a/app/Commands/Incident/ReportIncidentCommand.php
+++ b/app/Commands/Incident/ReportIncidentCommand.php
@@ -76,11 +76,11 @@ final class ReportIncidentCommand
      */
     public $rules = [
         'name'             => 'required|string',
-        'status'           => 'required|integer',
+        'status'           => 'required|int',
         'message'          => 'string',
         'visible'          => 'boolean',
-        'component_id'     => 'integer',
-        'component_status' => 'integer',
+        'component_id'     => 'int',
+        'component_status' => 'int',
         'notify'           => 'boolean',
         'incident_date'    => 'string',
     ];
diff --git a/app/Commands/Incident/UpdateIncidentCommand.php b/app/Commands/Incident/UpdateIncidentCommand.php
index 0a60618f..ded9453f 100644
--- a/app/Commands/Incident/UpdateIncidentCommand.php
+++ b/app/Commands/Incident/UpdateIncidentCommand.php
@@ -85,11 +85,11 @@ final class UpdateIncidentCommand
      */
     public $rules = [
         'name'             => 'string',
-        'status'           => 'integer',
+        'status'           => 'int',
         'message'          => 'string',
         'visible'          => 'boolean',
-        'component_id'     => 'integer',
-        'component_status' => 'integer',
+        'component_id'     => 'int',
+        'component_status' => 'int',
         'notify'           => 'boolean',
     ];
 
diff --git a/app/Commands/Metric/AddMetricCommand.php b/app/Commands/Metric/AddMetricCommand.php
index e5147a76..7a1a28b8 100644
--- a/app/Commands/Metric/AddMetricCommand.php
+++ b/app/Commands/Metric/AddMetricCommand.php
@@ -72,10 +72,10 @@ final class AddMetricCommand
         'suffix'        => 'required|string',
         'description'   => 'string',
         'display_chart' => 'boolean',
-        'default_value' => 'integer',
-        'calc_type'     => 'integer',
-        'display_chart' => 'integer',
-        'places'        => 'integer|between:0,4',
+        'default_value' => 'int',
+        'calc_type'     => 'int',
+        'display_chart' => 'int',
+        'places'        => 'int|between:0,4',
     ];
 
     /**
diff --git a/app/Commands/Metric/AddMetricPointCommand.php b/app/Commands/Metric/AddMetricPointCommand.php
index 3f42a544..70ca536f 100644
--- a/app/Commands/Metric/AddMetricPointCommand.php
+++ b/app/Commands/Metric/AddMetricPointCommand.php
@@ -42,7 +42,7 @@ final class AddMetricPointCommand
      * @var string[]
      */
     public $rules = [
-        'value'      => 'integer',
+        'value'      => 'int',
         'created_at' => 'string',
     ];
 
diff --git a/app/Commands/Metric/UpdateMetricCommand.php b/app/Commands/Metric/UpdateMetricCommand.php
index 1b123918..40c63733 100644
--- a/app/Commands/Metric/UpdateMetricCommand.php
+++ b/app/Commands/Metric/UpdateMetricCommand.php
@@ -82,8 +82,8 @@ final class UpdateMetricCommand
         'description'   => 'string',
         'display_chart' => 'boolean',
         'default_value' => 'numeric',
-        'calc_type'     => 'integer|in:0,1',
-        'display_chart' => 'integer',
+        'calc_type'     => 'int|in:0,1',
+        'display_chart' => 'int',
         'places'        => 'numeric|min:0|max:4',
     ];
 
diff --git a/app/Commands/Metric/UpdateMetricPointCommand.php b/app/Commands/Metric/UpdateMetricPointCommand.php
index bb4024de..6015af70 100644
--- a/app/Commands/Metric/UpdateMetricPointCommand.php
+++ b/app/Commands/Metric/UpdateMetricPointCommand.php
@@ -50,7 +50,7 @@ final class UpdateMetricPointCommand
      * @var string[]
      */
     public $rules = [
-        'value'      => 'integer',
+        'value'      => 'int',
         'created_at' => 'string',
     ];
 
diff --git a/app/Commands/User/AddTeamMemberCommand.php b/app/Commands/User/AddTeamMemberCommand.php
index c55a8499..22372ab0 100644
--- a/app/Commands/User/AddTeamMemberCommand.php
+++ b/app/Commands/User/AddTeamMemberCommand.php
@@ -49,7 +49,7 @@ final class AddTeamMemberCommand
     public $rules = [
         'name'     => 'required|string',
         'password' => 'string',
-        'level'    => 'integer',
+        'level'    => 'int',
     ];
 
     /**
diff --git a/app/Models/Component.php b/app/Models/Component.php
index aebb7efa..5eba3fc2 100644
--- a/app/Models/Component.php
+++ b/app/Models/Component.php
@@ -70,7 +70,7 @@ class Component extends Model implements HasPresenter
      */
     public $rules = [
         'name'   => 'required|string',
-        'status' => 'integer|required',
+        'status' => 'int|required',
         'link'   => 'url',
     ];
 
diff --git a/app/Models/ComponentGroup.php b/app/Models/ComponentGroup.php
index f78aa276..4521b139 100644
--- a/app/Models/ComponentGroup.php
+++ b/app/Models/ComponentGroup.php
@@ -43,7 +43,7 @@ class ComponentGroup extends Model
      */
     public $rules = [
         'name'  => 'required|string',
-        'order' => 'integer',
+        'order' => 'int',
     ];
 
     /**
diff --git a/app/Models/Incident.php b/app/Models/Incident.php
index dc15a14e..d2262170 100644
--- a/app/Models/Incident.php
+++ b/app/Models/Incident.php
@@ -63,9 +63,9 @@ class Incident extends Model implements HasPresenter
      * @var string[]
      */
     public $rules = [
-        'component_id' => 'integer',
+        'component_id' => 'int',
         'name'         => 'required',
-        'status'       => 'required|integer',
+        'status'       => 'required|int',
         'visible'      => 'required|boolean',
         'message'      => 'required',
     ];