diff --git a/src/olympic/studio/applib/src/CMakeLists.txt b/src/olympic/studio/applib/src/CMakeLists.txt
index 773f36cf..f3d48657 100644
--- a/src/olympic/studio/applib/src/CMakeLists.txt
+++ b/src/olympic/studio/applib/src/CMakeLists.txt
@@ -1,17 +1,17 @@
 add_library(
 	StudioAppLib
 		aboutpopup.cpp
+		app.cpp
 		clawviewer.cpp
 		deleteconfirmation.cpp
 		filedialogmanager.cpp
-		main.cpp
 		makecopypopup.cpp
 		newdir.cpp
 		newmenu.cpp
 		newproject.cpp
 		projectexplorer.cpp
 		renamefile.cpp
-		studioapp.cpp
+		studioui.cpp
 )
 target_compile_definitions(
 	StudioAppLib PUBLIC
diff --git a/src/olympic/studio/applib/src/main.cpp b/src/olympic/studio/applib/src/app.cpp
similarity index 96%
rename from src/olympic/studio/applib/src/main.cpp
rename to src/olympic/studio/applib/src/app.cpp
index 440b070c..94081198 100644
--- a/src/olympic/studio/applib/src/main.cpp
+++ b/src/olympic/studio/applib/src/app.cpp
@@ -11,8 +11,7 @@
 #include <turbine/turbine.hpp>
 
 #include <studio/context.hpp>
-#include <studioapp/studioapp.hpp>
-#include "studioapp.hpp"
+#include "studioui.hpp"
 
 namespace studio {
 
diff --git a/src/olympic/studio/applib/src/studioapp.cpp b/src/olympic/studio/applib/src/studioui.cpp
similarity index 99%
rename from src/olympic/studio/applib/src/studioapp.cpp
rename to src/olympic/studio/applib/src/studioui.cpp
index 67826032..a9744443 100644
--- a/src/olympic/studio/applib/src/studioapp.cpp
+++ b/src/olympic/studio/applib/src/studioui.cpp
@@ -14,7 +14,7 @@
 #include <studio/configio.hpp>
 #include "clawviewer.hpp"
 #include "filedialogmanager.hpp"
-#include "studioapp.hpp"
+#include "studioui.hpp"
 
 namespace studio {
 
diff --git a/src/olympic/studio/applib/src/studioapp.hpp b/src/olympic/studio/applib/src/studioui.hpp
similarity index 100%
rename from src/olympic/studio/applib/src/studioapp.hpp
rename to src/olympic/studio/applib/src/studioui.hpp