diff --git a/formula10/openf1/model/api_driver.py b/formula10/openf1/model/openf1_driver.py
similarity index 96%
rename from formula10/openf1/model/api_driver.py
rename to formula10/openf1/model/openf1_driver.py
index 3e69841..7161ee7 100644
--- a/formula10/openf1/model/api_driver.py
+++ b/formula10/openf1/model/openf1_driver.py
@@ -1,7 +1,7 @@
 from typing import Any, Callable, Dict
 
 
-class ApiDriver:
+class OpenF1Driver:
     __type_conversion_map__: Dict[str, Callable[[Any], Any]] = {
         "session_key": int,
         "meeting_key": int,
@@ -30,7 +30,7 @@ class ApiDriver:
 
             setattr(self, key, self.__type_conversion_map__[key](response[key]))
 
-        print("ApiDriver:", self.__dict__)
+        print("OpenF1Driver:", self.__dict__)
 
     def to_params(self) -> Dict[str, str]:
         params: Dict[str, str] = dict()
diff --git a/formula10/openf1/model/api_position.py b/formula10/openf1/model/openf1_position.py
similarity index 94%
rename from formula10/openf1/model/api_position.py
rename to formula10/openf1/model/openf1_position.py
index c9ac20a..bc504a1 100644
--- a/formula10/openf1/model/api_position.py
+++ b/formula10/openf1/model/openf1_position.py
@@ -2,7 +2,7 @@ from datetime import datetime
 from typing import Any, Callable, Dict
 
 
-class ApiPosition:
+class OpenF1Position:
     __type_conversion_map__: Dict[str, Callable[[Any], Any]] = {
         "session_key": int,
         "meeting_key": int,
@@ -24,7 +24,7 @@ class ApiPosition:
 
             setattr(self, key, self.__type_conversion_map__[key](response[key]))
 
-        print("ApiPosition:", self.__dict__)
+        print("OpenF1Position:", self.__dict__)
 
     def to_params(self) -> Dict[str, str]:
         params: Dict[str, str] = dict()
diff --git a/formula10/openf1/model/api_session.py b/formula10/openf1/model/openf1_session.py
similarity index 97%
rename from formula10/openf1/model/api_session.py
rename to formula10/openf1/model/openf1_session.py
index 3d97d1b..4538186 100644
--- a/formula10/openf1/model/api_session.py
+++ b/formula10/openf1/model/openf1_session.py
@@ -2,7 +2,7 @@ from datetime import datetime, time
 from typing import Any, Callable, Dict
 
 
-class ApiSession:
+class OpenF1Session:
     __type_conversion_map__: Dict[str, Callable[[Any], Any]] = {
         "location": str,
         "country_key": int,
@@ -35,7 +35,7 @@ class ApiSession:
 
             setattr(self, key, self.__type_conversion_map__[key](response[key]))
 
-        print("ApiSession:", self.__dict__)
+        print("OpenF1Session:", self.__dict__)
 
     def to_params(self) -> Dict[str, str]:
         params: Dict[str, str] = dict()
diff --git a/formula10/openf1/openf1_fetcher.py b/formula10/openf1/openf1_fetcher.py
index b4c668b..3b54e7f 100644
--- a/formula10/openf1/openf1_fetcher.py
+++ b/formula10/openf1/openf1_fetcher.py
@@ -3,12 +3,12 @@ import json
 from typing import Any, Callable, Dict, List, cast
 from requests import Response, get
 
-from formula10.openf1.model.api_driver import ApiDriver
-from formula10.openf1.model.api_position import ApiPosition
-from formula10.openf1.model.api_session import ApiSession
+from formula10.openf1.model.openf1_driver import OpenF1Driver
+from formula10.openf1.model.openf1_position import OpenF1Position
+from formula10.openf1.model.openf1_session import OpenF1Session
 from formula10.openf1.openf1_definitions import OPENF1_DRIVER_ENDPOINT, OPENF1_POSITION_ENDPOINT, OPENF1_SESSION_ENDPOINT, OPENF1_SESSION_NAME_RACE, OPENF1_SESSION_NAME_SPRINT, OPENF1_SESSION_TYPE_RACE
 
-def request_helper(endpoint: str, params: Dict[str, str]) -> List[Dict[str, str]]:
+def openf1_request_helper(endpoint: str, params: Dict[str, str]) -> List[Dict[str, str]]:
     response: Response = get(endpoint, params=params)
     if not response.ok:
         raise Exception(f"OpenF1 request to {response.request.url} failed")
@@ -23,54 +23,54 @@ def request_helper(endpoint: str, params: Dict[str, str]) -> List[Dict[str, str]
         raise Exception(f"Unexpected OpenF1 response from {response.request.url}: {obj}")
 
 
-def fetch_openf1_latest_session(session_name: str) -> ApiSession:
+def openf1_fetch_latest_session(session_name: str) -> OpenF1Session:
     # ApiSession object only supports integer session_keys
-    response: List[Dict[str, str]] = request_helper(OPENF1_SESSION_ENDPOINT, {
+    response: List[Dict[str, str]] = openf1_request_helper(OPENF1_SESSION_ENDPOINT, {
         "session_key": "latest",
         "session_type": OPENF1_SESSION_TYPE_RACE,
         "session_name": session_name
     })
 
-    return ApiSession(response[0])
+    return OpenF1Session(response[0])
 
 
-def fetch_openf1_latest_race_session_key() -> int:
-    return fetch_openf1_latest_session(OPENF1_SESSION_NAME_RACE).session_key
+def openf1_fetch_latest_race_session_key() -> int:
+    return openf1_fetch_latest_session(OPENF1_SESSION_NAME_RACE).session_key
 
 
-def fetch_openf1_latest_sprint_session_key() -> int:
-    return fetch_openf1_latest_session(OPENF1_SESSION_NAME_SPRINT).session_key
+def openf1_fetch_latest_sprint_session_key() -> int:
+    return openf1_fetch_latest_session(OPENF1_SESSION_NAME_SPRINT).session_key
 
 
-def fetch_openf1_session(session_name: str, country_code: str) -> ApiSession:
-    _session: ApiSession = ApiSession(None)
+def openf1_fetch_session(session_name: str, country_code: str) -> OpenF1Session:
+    _session: OpenF1Session = OpenF1Session(None)
     _session.session_type = OPENF1_SESSION_TYPE_RACE  # includes races + sprints
     _session.year = 2024
     _session.country_code = country_code
     _session.session_name = session_name
 
-    response: List[Dict[str, str]] = request_helper(OPENF1_SESSION_ENDPOINT, _session.to_params())
+    response: List[Dict[str, str]] = openf1_request_helper(OPENF1_SESSION_ENDPOINT, _session.to_params())
 
-    return ApiSession(response[0])
+    return OpenF1Session(response[0])
 
 
-def fetch_openf1_driver(session_key: int, name_acronym: str) -> ApiDriver:
-    _driver: ApiDriver = ApiDriver(None)
+def openf1_fetch_driver(session_key: int, name_acronym: str) -> OpenF1Driver:
+    _driver: OpenF1Driver = OpenF1Driver(None)
     _driver.name_acronym = name_acronym
     _driver.session_key = session_key
 
-    response: List[Dict[str, str]] = request_helper(OPENF1_DRIVER_ENDPOINT, _driver.to_params())
+    response: List[Dict[str, str]] = openf1_request_helper(OPENF1_DRIVER_ENDPOINT, _driver.to_params())
 
-    return ApiDriver(response[0])
+    return OpenF1Driver(response[0])
 
 
-def fetch_openf1_position(session_key: int, position: int):
-    _position: ApiPosition = ApiPosition(None)
+def openf1_fetch_position(session_key: int, position: int):
+    _position: OpenF1Position = OpenF1Position(None)
     _position.session_key = session_key
     _position.position = position
 
-    response: List[Dict[str, str]] = request_helper(OPENF1_POSITION_ENDPOINT, _position.to_params())
+    response: List[Dict[str, str]] = openf1_request_helper(OPENF1_POSITION_ENDPOINT, _position.to_params())
 
     # Find the last driver that was on this position at last
     predicate: Callable[[Dict[str, str]], datetime] = lambda position: datetime.strptime(position["date"], "%Y-%m-%dT%H:%M:%S.%f")
-    return ApiPosition(max(response, key=predicate))
\ No newline at end of file
+    return OpenF1Position(max(response, key=predicate))
\ No newline at end of file