diff --git a/library/Icingadb/Model/HostState.php b/library/Icingadb/Model/HostState.php
index 11953d84..c7d66d5a 100644
--- a/library/Icingadb/Model/HostState.php
+++ b/library/Icingadb/Model/HostState.php
@@ -31,7 +31,7 @@ class HostState extends State
             'hard_state'                    => t('Host Hard State'),
             'previous_soft_state'           => t('Host Previous Soft State'),
             'previous_hard_state'           => t('Host Previous Hard State'),
-            'attempt'                       => t('Host State Attempt No.'),
+            'check_attempt'                 => t('Host State Attempt No.'),
             'severity'                      => t('Host State Severity'),
             'output'                        => t('Host State Output'),
             'long_output'                   => t('Host State Long Output'),
@@ -48,7 +48,7 @@ class HostState extends State
             'in_downtime'                   => t('Host State In Downtime'),
             'execution_time'                => t('Host State Execution Time'),
             'latency'                       => t('Host State Latency'),
-            'timeout'                       => t('Host State Timeout'),
+            'check_timeout'                 => t('Host State Timeout'),
             'check_source'                  => t('Host State Check Source'),
             'last_update'                   => t('Host State Last Update'),
             'last_state_change'             => t('Host State Last State Change'),
diff --git a/library/Icingadb/Model/ServiceState.php b/library/Icingadb/Model/ServiceState.php
index 868a92ea..204ed3fd 100644
--- a/library/Icingadb/Model/ServiceState.php
+++ b/library/Icingadb/Model/ServiceState.php
@@ -28,7 +28,7 @@ class ServiceState extends State
             'hard_state'                    => t('Service Hard State'),
             'previous_soft_state'           => t('Service Previous Soft State'),
             'previous_hard_state'           => t('Service Previous Hard State'),
-            'attempt'                       => t('Service State Attempt No.'),
+            'check_attempt'                 => t('Service State Attempt No.'),
             'severity'                      => t('Service State Severity'),
             'output'                        => t('Service State Output'),
             'long_output'                   => t('Service State Long Output'),
@@ -45,7 +45,7 @@ class ServiceState extends State
             'in_downtime'                   => t('Service State In Downtime'),
             'execution_time'                => t('Service State Execution Time'),
             'latency'                       => t('Service State Latency'),
-            'timeout'                       => t('Service State Timeout'),
+            'check_timeout'                 => t('Service State Timeout'),
             'check_source'                  => t('Service State Check Source'),
             'last_update'                   => t('Service State Last Update'),
             'last_state_change'             => t('Service State Last State Change'),
diff --git a/library/Icingadb/Model/State.php b/library/Icingadb/Model/State.php
index 5000b9a7..acd37693 100644
--- a/library/Icingadb/Model/State.php
+++ b/library/Icingadb/Model/State.php
@@ -24,7 +24,7 @@ abstract class State extends Model
             'hard_state',
             'previous_soft_state',
             'previous_hard_state',
-            'attempt',
+            'check_attempt',
             'severity',
             'output',
             'long_output',
@@ -42,7 +42,7 @@ abstract class State extends Model
             'in_downtime',
             'execution_time',
             'latency',
-            'timeout',
+            'check_timeout',
             'check_source',
             'scheduling_source',
             'last_update',