diff --git a/pype/ftrack/ftrack_server/event_server_cli.py b/pype/ftrack/ftrack_server/event_server_cli.py
index 2106da3b5f..ec7cac9d6a 100644
--- a/pype/ftrack/ftrack_server/event_server_cli.py
+++ b/pype/ftrack/ftrack_server/event_server_cli.py
@@ -126,7 +126,7 @@ def process_event_paths(event_paths):
     return os.pathsep.join(return_paths), not_found
 
 
-def old_way_server(ftrack_url):
+def legacy_server(ftrack_url):
     # Current file
     file_path = os.path.dirname(os.path.realpath(__file__))
 
@@ -135,7 +135,7 @@ def old_way_server(ftrack_url):
     wait_time_after_max_fail = 10
 
     subproc = None
-    subproc_path = "{}/sub_old_way.py".format(file_path)
+    subproc_path = "{}/sub_legacy_server.py".format(file_path)
     subproc_last_failed = datetime.datetime.now()
     subproc_failed_count = 0
 
@@ -459,7 +459,7 @@ def main(argv):
         action="store_true"
     )
     parser.add_argument(
-        '-oldway',
+        '-legacy',
         help="Load creadentials from apps dir",
         action="store_true"
     )
@@ -487,7 +487,7 @@ def main(argv):
     if kwargs.ftrackapikey:
         api_key = kwargs.ftrackapikey
 
-    oldway = kwargs.oldway
+    legacy = kwargs.legacy
     # Check url regex and accessibility
     ftrack_url = check_ftrack_url(ftrack_url)
     if not ftrack_url:
@@ -519,8 +519,8 @@ def main(argv):
     os.environ["FTRACK_API_KEY"] = api_key
     os.environ["FTRACK_EVENTS_PATH"] = event_paths
 
-    if oldway:
-        return old_way_server(ftrack_url)
+    if legacy:
+        return legacy_server(ftrack_url)
 
     return main_loop(ftrack_url)
 
diff --git a/pype/ftrack/ftrack_server/sub_old_way.py b/pype/ftrack/ftrack_server/sub_legacy_server.py
similarity index 96%
rename from pype/ftrack/ftrack_server/sub_old_way.py
rename to pype/ftrack/ftrack_server/sub_legacy_server.py
index 92e7c0cf8c..c162b1abe1 100644
--- a/pype/ftrack/ftrack_server/sub_old_way.py
+++ b/pype/ftrack/ftrack_server/sub_legacy_server.py
@@ -10,7 +10,7 @@ from pype.vendor import ftrack_api
 from pype.vendor.ftrack_api.event.hub import EventHub
 from pypeapp import Logger
 
-log = Logger().get_logger("Event Server Old")
+log = Logger().get_logger("Event Server Legacy")
 
 
 class TimerChecker(threading.Thread):
@@ -67,7 +67,7 @@ def main(args):
         check_thread = TimerChecker(server, session)
         check_thread.start()
 
-        log.debug("Launching Ftrack Event Old Way Server")
+        log.debug("Launching Ftrack Event Legacy Server")
         server.run_server(session)
 
     except Exception as exc: