diff --git a/src/delta_barth/_management.py b/src/delta_barth/_management.py
index 34a8f32..67afbc1 100644
--- a/src/delta_barth/_management.py
+++ b/src/delta_barth/_management.py
@@ -1,3 +1,3 @@
-from delta_barth.errors import STATE_HANDLER
+from delta_barth.errors import STATUS_HANDLER
 
-__all__ = ["STATE_HANDLER"]
+__all__ = ["STATUS_HANDLER"]
diff --git a/src/delta_barth/analysis/forecast.py b/src/delta_barth/analysis/forecast.py
index 21300ce..04c5033 100644
--- a/src/delta_barth/analysis/forecast.py
+++ b/src/delta_barth/analysis/forecast.py
@@ -10,7 +10,7 @@ from xgboost import XGBRegressor
 
 from delta_barth.analysis import parse
 from delta_barth.constants import COL_MAP_SALES_PROGNOSIS, FEATURES_SALES_PROGNOSIS
-from delta_barth.errors import STATE_HANDLER
+from delta_barth.errors import STATUS_HANDLER
 from delta_barth.types import CustomerDataSalesForecast, DataPipeStates, PipeResult
 
 if TYPE_CHECKING:
@@ -103,7 +103,7 @@ def sales_per_customer(
 
     # check data availability
     if len(df_cust) < min_num_data_points:
-        return PipeResult(status=STATE_HANDLER.pipe_states.TOO_FEW_POINTS, data=None)
+        return PipeResult(status=STATUS_HANDLER.pipe_states.TOO_FEW_POINTS, data=None)
     else:
         # Entwicklung der Umsätze: definierte Zeiträume Monat
         df_cust["year"] = df_cust["date"].dt.year
@@ -142,4 +142,4 @@ def sales_per_customer(
         test = test.reset_index(drop=True)
 
         # umsetzung, prognose
-        return PipeResult(status=STATE_HANDLER.pipe_states.SUCCESS, data=test)
+        return PipeResult(status=STATUS_HANDLER.pipe_states.SUCCESS, data=test)
diff --git a/src/delta_barth/api/common.py b/src/delta_barth/api/common.py
index 7b26001..c42e32b 100644
--- a/src/delta_barth/api/common.py
+++ b/src/delta_barth/api/common.py
@@ -7,9 +7,8 @@ import requests
 from pydantic import BaseModel
 from requests import Response
 
-from delta_barth.constants import HTTP_BASE_CONTENT_HEADERS
 from delta_barth.errors import (
-    STATE_HANDLER,
+    STATUS_HANDLER,
     UnspecifiedRequestType,
 )
 from delta_barth.types import (
@@ -115,12 +114,12 @@ class Session:
         status: Status
         if resp.status_code == 200:
             response = LoginResponse(**resp.json())
-            status = STATE_HANDLER.pipe_states.SUCCESS
+            status = STATUS_HANDLER.pipe_states.SUCCESS
             self._add_session_token(response.token)
         else:
             response = LoginResponse(token="")
             err = DelBarApiError(status_code=resp.status_code, **resp.json())
-            status = STATE_HANDLER.api_error(err)
+            status = STATUS_HANDLER.api_error(err)
 
         return response, status
 
@@ -138,11 +137,11 @@ class Session:
         response = None
         status: Status
         if resp.status_code == 200:
-            status = STATE_HANDLER.SUCCESS
+            status = STATUS_HANDLER.SUCCESS
             self._remove_session_token()
         else:
             err = DelBarApiError(status_code=resp.status_code, **resp.json())
-            status = STATE_HANDLER.api_error(err)
+            status = STATUS_HANDLER.api_error(err)
 
         return response, status
 
@@ -172,14 +171,14 @@ class Session:
             # TODO use to check for catching unknown exceptions
             # response = LoginResponse(**resp.json())
             response = LoginResponse(token=self.session_token)
-            status = STATE_HANDLER.SUCCESS
+            status = STATUS_HANDLER.SUCCESS
         elif resp.status_code == 401:
             self._remove_session_token()
             response, status = self.login()
         else:  # pragma: no cover
             response = LoginResponse(token="")
             err = DelBarApiError(status_code=resp.status_code, **resp.json())
-            status = STATE_HANDLER.api_error(err)
+            status = STATUS_HANDLER.api_error(err)
 
         return response, status
 
diff --git a/src/delta_barth/api/requests.py b/src/delta_barth/api/requests.py
index 5ca5a43..3b93719 100644
--- a/src/delta_barth/api/requests.py
+++ b/src/delta_barth/api/requests.py
@@ -7,7 +7,7 @@ import requests
 from pydantic import BaseModel, PositiveInt, SkipValidation
 
 from delta_barth.api.common import combine_route
-from delta_barth.errors import STATE_HANDLER
+from delta_barth.errors import STATUS_HANDLER
 from delta_barth.types import DelBarApiError, Status
 
 if TYPE_CHECKING:
@@ -55,10 +55,10 @@ def get_sales_prognosis_data(
     status: Status
     if resp.status_code == 200:
         response = SalesPrognosisResponse(**resp.json())
-        status = STATE_HANDLER.SUCCESS
+        status = STATUS_HANDLER.SUCCESS
     else:
         response = SalesPrognosisResponse(daten=tuple())
         err = DelBarApiError(status_code=resp.status_code, **resp.json())
-        status = STATE_HANDLER.api_error(err)
+        status = STATUS_HANDLER.api_error(err)
 
     return response, status
diff --git a/src/delta_barth/errors.py b/src/delta_barth/errors.py
index 677408b..2709698 100644
--- a/src/delta_barth/errors.py
+++ b/src/delta_barth/errors.py
@@ -147,4 +147,4 @@ class StatusHandler:
             raise _construct_exception(UApiError, descr, msg, add_info)
 
 
-STATE_HANDLER: Final[StatusHandler] = StatusHandler()
+STATUS_HANDLER: Final[StatusHandler] = StatusHandler()