diff --git a/validation/graylog/driver.py b/validation/graylog/driver.py
index fba9792..aa706eb 100644
--- a/validation/graylog/driver.py
+++ b/validation/graylog/driver.py
@@ -1,14 +1,14 @@
 import time
-from graylog.graylog_server import GraylogServer
-from graylog.graylog_rest_api import GraylogRestApi
+from graylog.server import Server
+from graylog.rest_api import RestApi
 from graylog.server_timeout_error import ServerTimeoutError
 
 
 class Driver:
 
     def __init__(self, docker_compose_path):
-        self._server = GraylogServer(docker_compose_path)
-        self._api = GraylogRestApi()
+        self._server = Server(docker_compose_path)
+        self._api = RestApi()
 
     def _wait(self, condition, attempts, sleep_duration=1):
         count = 0
diff --git a/validation/graylog/graylog_rest_api.py b/validation/graylog/rest_api.py
similarity index 99%
rename from validation/graylog/graylog_rest_api.py
rename to validation/graylog/rest_api.py
index cb08c6b..48201f4 100644
--- a/validation/graylog/graylog_rest_api.py
+++ b/validation/graylog/rest_api.py
@@ -10,7 +10,7 @@
 _DEFAULT_LOG_BODY = 'type: alert\nid: ${logging_alert.id}\nseverity: ${logging_alert.severity}\napp: graylog\nsubject: ${event_definition_title}\nbody: ${event_definition_description}\n${if backlog && backlog[0]} src: ${backlog[0].fields.src_ip}\nsrc_category: ${backlog[0].fields.src_category}\ndest: ${backlog[0].fields.dest_ip}\ndest_category: ${backlog[0].fields.dest_category}\n${end}'
 
 
-class GraylogRestApi:
+class RestApi:
 
     def _build_url(self, path):
         return parse.urljoin('http://127.0.0.1:9000/api/', path)
diff --git a/validation/graylog/graylog_server.py b/validation/graylog/server.py
similarity index 97%
rename from validation/graylog/graylog_server.py
rename to validation/graylog/server.py
index 03172c5..8a9735d 100644
--- a/validation/graylog/graylog_server.py
+++ b/validation/graylog/server.py
@@ -1,7 +1,7 @@
 import subprocess
 
 
-class GraylogServer:
+class Server:
 
     def __init__(self, docker_compose_path):
         self._docker_compose_path = docker_compose_path