diff --git a/cli/src/service.py b/cli/src/service.py
index 1fb548b..624f68f 100644
--- a/cli/src/service.py
+++ b/cli/src/service.py
@@ -55,7 +55,10 @@ def add(
     ),
 ):
     init_logging()
-    gui_config = GuiConfig(_gui_option=gui_option, _ui_filename=ui_filename)
+    if gui_option == GuiOption.NEW:
+        ui_filename = name
+    gui_config = GuiConfig(gui_option=gui_option, raw_ui_filename=ui_filename)
+
     ctx = ServicesContext.load_from_disk(Paths())
     service_creator = ServiceCreator(ctx=ctx, repo_manager=GitRepoManager(REPO_ROOT))
     service_creator.add_service(
diff --git a/cli/tests/fixtures/expected_output/qt/A_BD_ServiceManager.ui b/cli/tests/fixtures/expected_output/qt/A_BD_ServiceManager.ui
index 5ad06fc..808be77 100644
--- a/cli/tests/fixtures/expected_output/qt/A_BD_ServiceManager.ui
+++ b/cli/tests/fixtures/expected_output/qt/A_BD_ServiceManager.ui
@@ -138,7 +138,7 @@ caLabel[statusTip="Operation"]{
        </rect>
       </property>
       <property name="macro">
-       <string>IOC=AGEBD-CPCL-DBPM3CURR,service=DBPM3CURR,name=DBPM3Current,panel=1,svc_exist=1,panelcmd=A_BD_DBPM3Current.ui;IOC=AGEBD-CPCL-TAUBPM,service=TAUBPM,name=TauBPM,panel=1,svc_exist=1,panelcmd=A_BD_TauBPM.ui;IOC=AGEBD-CPCL-TAUPCT,service=TAUPCT,name=TauPCT,panel=1,svc_exist=1,panelcmd=A_BD_TauPCT.ui;IOC=AGEBD-CPCL-TIMING,service=TIMING,name=Timing,panel=1,svc_exist=1,panelcmd=A_BD_Timing.ui;IOC=AGEBD-CPCL-SCRUBBING,service=SCRUBBING,name=Scrubbing,panel=1,svc_exist=1,panelcmd=A_BD_Scrubbing.ui;IOC=AGEBD-CPCL-INJECTIONGUARD,service=INJECTIONGUARD,name=InjectionGuard,panel=1,svc_exist=1,panelcmd=A_BD_InjectionGuard.ui;IOC=AGEBD-CPCL-POSTMORTEMLOG,service=POSTMORTEMLOG,name=PostMortemLog,panel=1,svc_exist=1,panelcmd=A_BD_PostMortemLog.ui;IOC=AGEBD-CPCL-TUNEBUMP,service=TUNEBUMP,name=TuneBump,panel=1,svc_exist=1,panelcmd=A_BD_TuneBump.ui;IOC=AGEBD-CPCL-PLOTS,service=PLOTS,name=Plots,panel=0,svc_exist=1,panelcmd=A_BD_Plots.ui;IOC=AGEBD-CPCL-ORBITBUMP,service=ORBITBUMP,name=OrbitBump,panel=1,svc_exist=0,panelcmd=A_BD_OrbitBump.ui;IOC=AGEBD-CPCL-TUNEFBX,service=TUNEFBX,name=Hor. Tune Feedback,panel=1,svc_exist=1,panelcmd=A_BD_TuneBump.ui;IOC=AGEBD-CPCL-TUNEFBY,service=TUNEFBY,name=Ver. Tune Feedback,panel=1,svc_exist=1,panelcmd=A_BD_TuneBump.ui;IOC=AGEBD-CPCL-TESTSERVICE99-X00,service=TESTSERVICE99-X00,name=TestService99-X00,panel=1,svc_exist=1,panelcmd=A_BD_TestService.ui</string>
+       <string>IOC=AGEBD-CPCL-DBPM3CURR,service=DBPM3CURR,name=DBPM3Current,panel=1,svc_exist=1,panelcmd=A_BD_DBPM3Current.ui;IOC=AGEBD-CPCL-TAUBPM,service=TAUBPM,name=TauBPM,panel=1,svc_exist=1,panelcmd=A_BD_TauBPM.ui;IOC=AGEBD-CPCL-TAUPCT,service=TAUPCT,name=TauPCT,panel=1,svc_exist=1,panelcmd=A_BD_TauPCT.ui;IOC=AGEBD-CPCL-TIMING,service=TIMING,name=Timing,panel=1,svc_exist=1,panelcmd=A_BD_Timing.ui;IOC=AGEBD-CPCL-SCRUBBING,service=SCRUBBING,name=Scrubbing,panel=1,svc_exist=1,panelcmd=A_BD_Scrubbing.ui;IOC=AGEBD-CPCL-INJECTIONGUARD,service=INJECTIONGUARD,name=InjectionGuard,panel=1,svc_exist=1,panelcmd=A_BD_InjectionGuard.ui;IOC=AGEBD-CPCL-POSTMORTEMLOG,service=POSTMORTEMLOG,name=PostMortemLog,panel=1,svc_exist=1,panelcmd=A_BD_PostMortemLog.ui;IOC=AGEBD-CPCL-TUNEBUMP,service=TUNEBUMP,name=TuneBump,panel=1,svc_exist=1,panelcmd=A_BD_TuneBump.ui;IOC=AGEBD-CPCL-PLOTS,service=PLOTS,name=Plots,panel=0,svc_exist=1,panelcmd=A_BD_Plots.ui;IOC=AGEBD-CPCL-ORBITBUMP,service=ORBITBUMP,name=OrbitBump,panel=1,svc_exist=0,panelcmd=A_BD_OrbitBump.ui;IOC=AGEBD-CPCL-TUNEFBX,service=TUNEFBX,name=Hor. Tune Feedback,panel=1,svc_exist=1,panelcmd=A_BD_TuneBump.ui;IOC=AGEBD-CPCL-TUNEFBY,service=TUNEFBY,name=Ver. Tune Feedback,panel=1,svc_exist=1,panelcmd=A_BD_TuneBump.ui;IOC=AGEBD-CPCL-TESTSERVICE99-X00,service=TESTSERVICE99-X00,name=TestService99-X00,panel=1,svc_exist=1,panelcmd=A_BD_TestService99-X00.ui</string>
       </property>
       <property name="filename" stdset="0">
        <string notr="true">A_BD_ServiceManager_inc.ui</string>
diff --git a/cli/tests/fixtures/expected_output/qt/A_BD_TestService.ui b/cli/tests/fixtures/expected_output/qt/A_BD_TestService99-X00.ui
similarity index 100%
rename from cli/tests/fixtures/expected_output/qt/A_BD_TestService.ui
rename to cli/tests/fixtures/expected_output/qt/A_BD_TestService99-X00.ui
diff --git a/cli/tests/tests/test_service_creator.py b/cli/tests/tests/test_service_creator.py
index 274401f..a3cf3c8 100644
--- a/cli/tests/tests/test_service_creator.py
+++ b/cli/tests/tests/test_service_creator.py
@@ -68,10 +68,11 @@ def test_add_new_service(tmp_path, mocker: MockerFixture):
     ctx = ServicesContext.load_from_disk(paths)
     ctx._write_paths = write_paths
 
-    gui_config = GuiConfig(gui_option=GuiOption.NEW, raw_ui_filename="TestService")
+    service_name = "TestService99-X00"
+    gui_config = GuiConfig(gui_option=GuiOption.NEW, raw_ui_filename=service_name)
     creator = ServiceCreator(ctx=ctx, repo_manager=mocker.Mock(spec=GitRepoManager))
     creator.add_service(
-        name="TestService99-X00",
+        name=service_name,
         ioc_owner="test_user",
         ioc_description="Test Description",
         gui_config=gui_config,