remove sp_priv from the names

Renamed files by removing sp_priv_ prefix

selfdrive/navd/main.cc

@@ -7,7 +7,7 @@
 #include "common/util.h"
 #include "selfdrive/ui/qt/util.h"
 #ifdef SUNNYPILOT
-#include "selfdrive/ui/sunnypilot/qt/maps/sp_priv_map_helpers.h"
+#include "selfdrive/ui/sunnypilot/qt/maps/map_helpers.h"
 #else
 #include "selfdrive/ui/qt/maps/map_helpers.h"
 #endif

selfdrive/navd/map_renderer.cc

@@ -9,7 +9,7 @@
 #include "common/timing.h"
 #include "common/swaglog.h"
 #ifdef SUNNYPILOT
-#include "selfdrive/ui/sunnypilot/qt/maps/sp_priv_map_helpers.h"
+#include "selfdrive/ui/sunnypilot/qt/maps/map_helpers.h"
 #else
 #include "selfdrive/ui/qt/maps/map_helpers.h"
 #endif

selfdrive/ui/SConscript

@@ -81,7 +81,7 @@ asset_obj = qt_env.Object("assets", assets)
 qt_env.SharedLibrary("qt/python_helpers", ["qt/qt_window.cc"], LIBS=qt_libs)
 
 # spinner and text window
-text_cc_path = "qt/text.cc" if not GetOption('sunnypilot') else "sunnypilot/qt/sp_priv_text.cc"
+text_cc_path = "qt/text.cc" if not GetOption('sunnypilot') else "sunnypilot/qt/text.cc"
 qt_env.Program("_text", [text_cc_path], LIBS=qt_libs)
 qt_env.Program("_spinner", ["qt/spinner.cc"], LIBS=qt_libs)
 

selfdrive/ui/main.cc

@@ -8,7 +8,7 @@
 #include "selfdrive/ui/qt/util.h"
 
 #ifdef SUNNYPILOT
-#include "selfdrive/ui/sunnypilot/qt/sp_priv_window.h"
+#include "selfdrive/ui/sunnypilot/qt/window.h"
 #define MainWindow MainWindowSP
 #else
 #include "selfdrive/ui/qt/window.h"

selfdrive/ui/qt/body.h

@@ -6,7 +6,7 @@
 
 #include "common/util.h"
 #ifdef SUNNYPILOT
-#include "selfdrive/ui/sunnypilot/sp_priv_ui.h"
+#include "selfdrive/ui/sunnypilot/ui.h"
 #else
 #include "selfdrive/ui/ui.h"
 #endif

selfdrive/ui/qt/home.h

@@ -16,9 +16,9 @@
 #include "selfdrive/ui/ui.h"
 
 #ifdef SUNNYPILOT
-#include "selfdrive/ui/sunnypilot/qt/widgets/sp_priv_controls.h"
-#include "selfdrive/ui/sunnypilot/qt/sp_priv_offroad_home.h"
-#include "selfdrive/ui/sunnypilot/qt/onroad/sp_priv_onroad_home.h"
+#include "selfdrive/ui/sunnypilot/qt/widgets/controls.h"
+#include "selfdrive/ui/sunnypilot/qt/offroad_home.h"
+#include "selfdrive/ui/sunnypilot/qt/onroad/onroad_home.h"
 #define OnroadWindow OnroadWindowSP
 #define OffroadHome OffroadHomeSP
 #else

selfdrive/ui/qt/maps/map.cc

@@ -8,8 +8,8 @@
 #include "common/swaglog.h"
 #include "selfdrive/ui/qt/util.h"
 #ifdef SUNNYPILOT
-#include "selfdrive/ui/sunnypilot/sp_priv_ui.h"
-#include "selfdrive/ui/sunnypilot/qt/maps/sp_priv_map_helpers.h"
+#include "selfdrive/ui/sunnypilot/ui.h"
+#include "selfdrive/ui/sunnypilot/qt/maps/map_helpers.h"
 #else
 #include "selfdrive/ui/qt/maps/map_helpers.h"
 #include "selfdrive/ui/ui.h"

selfdrive/ui/qt/maps/map.h

@@ -21,7 +21,7 @@
 #include "common/params.h"
 #include "common/util.h"
 #ifdef SUNNYPILOT
-#include "selfdrive/ui/sunnypilot/sp_priv_ui.h"
+#include "selfdrive/ui/sunnypilot/ui.h"
 #else
 #include "selfdrive/ui/ui.h"
 #endif

selfdrive/ui/qt/maps/map_eta.cc

@@ -4,8 +4,8 @@
 #include <QPainter>
 
 #ifdef SUNNYPILOT
-#include "selfdrive/ui/sunnypilot/sp_priv_ui.h"
-#include "selfdrive/ui/sunnypilot/qt/maps/sp_priv_map_helpers.h"
+#include "selfdrive/ui/sunnypilot/ui.h"
+#include "selfdrive/ui/sunnypilot/qt/maps/map_helpers.h"
 #else
 #include "selfdrive/ui/ui.h"
 #include "selfdrive/ui/qt/maps/map_helpers.h"

selfdrive/ui/qt/maps/map_helpers.cc

@@ -1,5 +1,5 @@
 #ifdef SUNNYPILOT
-#include "selfdrive/ui/sunnypilot/qt/maps/sp_priv_map_helpers.h"
+#include "selfdrive/ui/sunnypilot/qt/maps/map_helpers.h"
 #else
 #include "selfdrive/ui/qt/maps/map_helpers.h"
 #endif

selfdrive/ui/qt/maps/map_instructions.cc

@@ -4,8 +4,8 @@
 #include <QVBoxLayout>
 
 #ifdef SUNNYPILOT
-#include "selfdrive/ui/sunnypilot/sp_priv_ui.h"
-#include "selfdrive/ui/sunnypilot/qt/maps/sp_priv_map_helpers.h"
+#include "selfdrive/ui/sunnypilot/ui.h"
+#include "selfdrive/ui/sunnypilot/qt/maps/map_helpers.h"
 #else
 #include "selfdrive/ui/ui.h"
 #include "selfdrive/ui/qt/maps/map_helpers.h"

selfdrive/ui/qt/maps/map_panel.cc

@@ -6,8 +6,8 @@
 #include "selfdrive/ui/qt/maps/map_settings.h"
 #include "selfdrive/ui/qt/util.h"
 #ifdef SUNNYPILOT
-#include "selfdrive/ui/sunnypilot/sp_priv_ui.h"
-#include "selfdrive/ui/sunnypilot/qt/maps/sp_priv_map.h"
+#include "selfdrive/ui/sunnypilot/ui.h"
+#include "selfdrive/ui/sunnypilot/qt/maps/map.h"
 #else
 #include "selfdrive/ui/ui.h"
 #include "selfdrive/ui/qt/maps/map.h"

selfdrive/ui/qt/maps/map_settings.h

@@ -14,7 +14,7 @@
 #include "common/params.h"
 #include "selfdrive/ui/qt/util.h"
 #ifdef SUNNYPILOT
-#include "selfdrive/ui/sunnypilot/qt/widgets/sp_priv_controls.h"
+#include "selfdrive/ui/sunnypilot/qt/widgets/controls.h"
 #else
 #include "selfdrive/ui/qt/widgets/controls.h"
 #endif

selfdrive/ui/qt/network/networking.cc

@@ -7,7 +7,7 @@
 #include <QStyle>
 
 #ifdef SUNNYPILOT
-#include "selfdrive/ui/sunnypilot/sp_priv_ui.h"
+#include "selfdrive/ui/sunnypilot/ui.h"
 #else
 #include "selfdrive/ui/ui.h"
 #endif

selfdrive/ui/qt/network/networking.h

@@ -7,7 +7,7 @@
 #include "selfdrive/ui/qt/widgets/ssh_keys.h"
 #include "selfdrive/ui/qt/widgets/toggle.h"
 #ifdef SUNNYPILOT
-#include "selfdrive/ui/sunnypilot/qt/widgets/sp_priv_controls.h"
+#include "selfdrive/ui/sunnypilot/qt/widgets/controls.h"
 #define LabelControl LabelControlSP
 #define ElidedLabel ElidedLabelSP
 #else

selfdrive/ui/qt/network/wifi_manager.cc

@@ -3,7 +3,7 @@
 #include <utility>
 
 #ifdef SUNNYPILOT
-#include "selfdrive/ui/sunnypilot/sp_priv_ui.h"
+#include "selfdrive/ui/sunnypilot/ui.h"
 #else
 #include "selfdrive/ui/ui.h"
 #endif

selfdrive/ui/qt/offroad/settings.cc

@@ -18,7 +18,7 @@
 #include "selfdrive/ui/qt/widgets/scrollview.h"
 #include "selfdrive/ui/qt/widgets/ssh_keys.h"
 #ifdef SUNNYPILOT
-#include "selfdrive/ui/sunnypilot/sp_priv_sunnypilot_main.h"
+#include "selfdrive/ui/sunnypilot/sunnypilot_main.h"
 #endif 
 
 TogglesPanel::TogglesPanel(SettingsWindow *parent) : ListWidget(parent) {

selfdrive/ui/qt/offroad/settings.h

@@ -14,8 +14,8 @@
 #include "selfdrive/ui/qt/util.h"
 
 #ifdef SUNNYPILOT
-#include "selfdrive/ui/sunnypilot/sp_priv_ui.h"
-#include "selfdrive/ui/sunnypilot/qt/widgets/sp_priv_controls.h"
+#include "selfdrive/ui/sunnypilot/ui.h"
+#include "selfdrive/ui/sunnypilot/qt/widgets/controls.h"
 #define ListWidget ListWidgetSP
 #define ParamControl ParamControlSP
 #define ButtonControl ButtonControlSP

selfdrive/ui/qt/offroad/software_settings.cc

@@ -12,7 +12,7 @@
 #include "selfdrive/ui/ui.h"
 #include "selfdrive/ui/qt/util.h"
 #ifdef SUNNYPILOT
-#include "selfdrive/ui/sunnypilot/qt/widgets/sp_priv_controls.h"
+#include "selfdrive/ui/sunnypilot/qt/widgets/controls.h"
 #else
 #include "selfdrive/ui/qt/widgets/controls.h"
 #endif

selfdrive/ui/qt/offroad_home.h

@@ -16,9 +16,9 @@
 #include "selfdrive/ui/ui.h"
 
 #ifdef SUNNYPILOT
-#include "selfdrive/ui/sunnypilot/qt/widgets/sp_priv_controls.h"
-#include "selfdrive/ui/sunnypilot/qt/onroad/sp_priv_onroad_home.h"
-#include "selfdrive/ui/sunnypilot/qt/sp_priv_sidebar.h"
+#include "selfdrive/ui/sunnypilot/qt/widgets/controls.h"
+#include "selfdrive/ui/sunnypilot/qt/onroad/onroad_home.h"
+#include "selfdrive/ui/sunnypilot/qt/sidebar.h"
 #define OnroadWindow OnroadWindowSP
 #define OffroadHomeImp OffroadHomeSP
 #define LayoutWidget LayoutWidgetSP

selfdrive/ui/qt/onroad/buttons.h

@@ -3,7 +3,7 @@
 #include <QPushButton>
 
 #ifdef SUNNYPILOT
-#include "selfdrive/ui/sunnypilot/sp_priv_ui.h"
+#include "selfdrive/ui/sunnypilot/ui.h"
 #else
 #include "selfdrive/ui/ui.h"
 #endif

selfdrive/ui/qt/onroad/onroad_home.h

@@ -4,7 +4,7 @@
 #include "selfdrive/ui/qt/onroad/alerts.h"
 
 #if SUNNYPILOT
-#include "selfdrive/ui/sunnypilot/qt/onroad/sp_priv_annotated_camera.h"
+#include "selfdrive/ui/sunnypilot/qt/onroad/annotated_camera.h"
 #define AnnotatedCameraWidget AnnotatedCameraWidgetSP
 #define UIState UIStateSP
 #else

selfdrive/ui/qt/request_repeater.h

@@ -3,8 +3,8 @@
 #include "common/util.h"
 
 #ifdef SUNNYPILOT
-#include "selfdrive/ui/sunnypilot/sp_priv_ui.h"
-#include "selfdrive/ui/sunnypilot/qt/sp_priv_api.h"
+#include "selfdrive/ui/sunnypilot/ui.h"
+#include "selfdrive/ui/sunnypilot/qt/api.h"
 #else
 #include "selfdrive/ui/ui.h"
 #include "selfdrive/ui/qt/api.h"

selfdrive/ui/qt/sidebar.h

@@ -7,7 +7,7 @@
 #include "cereal/messaging/messaging.h"
 
 #ifdef SUNNYPILOT
-#include "selfdrive/ui/sunnypilot/sp_priv_ui.h"
+#include "selfdrive/ui/sunnypilot/ui.h"
 #else
 #include "selfdrive/ui/ui.h"
 #endif

selfdrive/ui/qt/widgets/cameraview.h

@@ -25,7 +25,7 @@
 #include "msgq/visionipc/visionipc_client.h"
 #include "system/camerad/cameras/camera_common.h"
 #ifdef SUNNYPILOT
-#include "selfdrive/ui/sunnypilot/sp_priv_ui.h"
+#include "selfdrive/ui/sunnypilot/ui.h"
 #else
 #include "selfdrive/ui/ui.h"
 #endif

selfdrive/ui/qt/widgets/ssh_keys.h

@@ -4,7 +4,7 @@
 
 #include "system/hardware/hw.h"
 #ifdef SUNNYPILOT
-#include "selfdrive/ui/sunnypilot/qt/widgets/sp_priv_controls.h"
+#include "selfdrive/ui/sunnypilot/qt/widgets/controls.h"
 #define ToggleControl ToggleControlSP
 #define ButtonControl ButtonControlSP
 #else

selfdrive/ui/qt/widgets/wifi.h

@@ -5,7 +5,7 @@
 #include <QWidget>
 
 #ifdef SUNNYPILOT
-#include "selfdrive/ui/sunnypilot/sp_priv_ui.h"
+#include "selfdrive/ui/sunnypilot/ui.h"
 #else
 #include "selfdrive/ui/ui.h"
 #endif

selfdrive/ui/sunnypilot/SConscript

@@ -1,60 +1,60 @@
 widgets_src = [
-  "sunnypilot/sp_priv_ui.cc",
-  "sunnypilot/qt/sp_priv_window.cc",
-  "sunnypilot/qt/sp_priv_request_repeater.cc",
-  "sunnypilot/qt/network/sp_priv_networking.cc",
-  "sunnypilot/qt/offroad/settings/sp_priv_display_settings.cc",
-  "sunnypilot/qt/offroad/settings/sp_priv_sunnypilot_settings.cc",
-  "sunnypilot/qt/offroad/settings/sp_priv_vehicle_settings.cc",
-  "sunnypilot/qt/offroad/settings/sp_priv_visuals_settings.cc",
-  "sunnypilot/qt/offroad/settings/sp_priv_trips_settings.cc",
-  "sunnypilot/qt/offroad/settings/sunnypilot/sp_priv_mads_settings.cc",
-  "sunnypilot/qt/offroad/settings/sunnypilot/sp_priv_lane_change_settings.cc",
-  "sunnypilot/qt/offroad/settings/sunnypilot/sp_priv_speed_limit_control_settings.cc",
-  "sunnypilot/qt/offroad/settings/sp_priv_monitoring_settings.cc",
-  "sunnypilot/qt/offroad/settings/sp_priv_osm_settings.cc",
-  "sunnypilot/qt/offroad/settings/sunnypilot/sp_priv_custom_offsets_settings.cc",
-  "sunnypilot/qt/widgets/sp_priv_drive_stats.cc",
-  "sunnypilot/qt/offroad/settings/sp_priv_software_settings.cc",
-  "sunnypilot/qt/offroad/settings/osm/sp_priv_models_fetcher.cc",
-  "sunnypilot/qt/offroad/settings/sunnypilot/sp_priv_speed_limit_warning_settings.cc",
-  "sunnypilot/qt/offroad/settings/sunnypilot/sp_priv_speed_limit_policy_settings.cc",
-  "sunnypilot/qt/offroad/settings/sp_priv_sunnylink_settings.cc",
-  "sunnypilot/qt/widgets/sp_priv_controls.cc",
-  "sunnypilot/qt/widgets/sp_priv_scrollview.cc",
-  "sunnypilot/qt/widgets/sp_priv_toggle.cc"
+  "sunnypilot/ui.cc",
+  "sunnypilot/qt/window.cc",
+  "sunnypilot/qt/request_repeater.cc",
+  "sunnypilot/qt/network/networking.cc",
+  "sunnypilot/qt/offroad/settings/display_settings.cc",
+  "sunnypilot/qt/offroad/settings/sunnypilot_settings.cc",
+  "sunnypilot/qt/offroad/settings/vehicle_settings.cc",
+  "sunnypilot/qt/offroad/settings/visuals_settings.cc",
+  "sunnypilot/qt/offroad/settings/trips_settings.cc",
+  "sunnypilot/qt/offroad/settings/sunnypilot/mads_settings.cc",
+  "sunnypilot/qt/offroad/settings/sunnypilot/lane_change_settings.cc",
+  "sunnypilot/qt/offroad/settings/sunnypilot/speed_limit_control_settings.cc",
+  "sunnypilot/qt/offroad/settings/monitoring_settings.cc",
+  "sunnypilot/qt/offroad/settings/osm_settings.cc",
+  "sunnypilot/qt/offroad/settings/sunnypilot/custom_offsets_settings.cc",
+  "sunnypilot/qt/widgets/drive_stats.cc",
+  "sunnypilot/qt/offroad/settings/software_settings.cc",
+  "sunnypilot/qt/offroad/settings/osm/models_fetcher.cc",
+  "sunnypilot/qt/offroad/settings/sunnypilot/speed_limit_warning_settings.cc",
+  "sunnypilot/qt/offroad/settings/sunnypilot/speed_limit_policy_settings.cc",
+  "sunnypilot/qt/offroad/settings/sunnylink_settings.cc",
+  "sunnypilot/qt/widgets/controls.cc",
+  "sunnypilot/qt/widgets/scrollview.cc",
+  "sunnypilot/qt/widgets/toggle.cc"
 ]
 
 sp_maps_widgets_src = [
-  "sunnypilot/qt/maps/sp_priv_map.cc"
+  "sunnypilot/qt/maps/map.cc"
 ]
 
 sp_qt_util = [
-  # "#selfdrive/ui/sunnypilot/qt/sp_priv_api.cc", 
-  "#selfdrive/ui/sunnypilot/qt/sp_priv_util.cc",
+  # "#selfdrive/ui/sunnypilot/qt/api.cc", 
+  "#selfdrive/ui/sunnypilot/qt/util.cc",
 ]
 
 network_src = [
-  "sunnypilot/qt/network/sunnylink/sp_priv_sunnylink_client.cc",
-  "sunnypilot/qt/network/sunnylink/services/sp_priv_base_device_service.cc",
-  "sunnypilot/qt/network/sunnylink/services/sp_priv_role_service.cc",
-  "sunnypilot/qt/network/sunnylink/services/sp_priv_user_service.cc"
+  "sunnypilot/qt/network/sunnylink/sunnylink_client.cc",
+  "sunnypilot/qt/network/sunnylink/services/base_device_service.cc",
+  "sunnypilot/qt/network/sunnylink/services/role_service.cc",
+  "sunnypilot/qt/network/sunnylink/services/user_service.cc"
 ]
 
 qt_src = [
-  "sunnypilot/qt/sp_priv_api.cc",
-  "sunnypilot/qt/sp_priv_home.cc",
-  "sunnypilot/qt/sp_priv_offroad_home.cc",
-  "sunnypilot/qt/sp_priv_sidebar.cc",
-  "sunnypilot/qt/offroad/settings/sp_priv_onboarding.cc",
-  "sunnypilot/qt/offroad/settings/sp_priv_device_panel.cc",
-  "sunnypilot/qt/offroad/settings/sp_priv_settings.cc",
-  "sunnypilot/qt/onroad/sp_priv_buttons.cc",
-  "sunnypilot/qt/onroad/sp_priv_onroad_home.cc",
-  "sunnypilot/qt/onroad/sp_priv_onroad_settings.cc",
-  "sunnypilot/qt/onroad/sp_priv_annotated_camera.cc",
-  "sunnypilot/qt/onroad/sp_priv_onroad_settings_panel.cc",
-  "sunnypilot/qt/onroad/developer_ui/sp_priv_developer_ui.cc",
+  "sunnypilot/qt/api.cc",
+  "sunnypilot/qt/home.cc",
+  "sunnypilot/qt/offroad_home.cc",
+  "sunnypilot/qt/sidebar.cc",
+  "sunnypilot/qt/offroad/settings/onboarding.cc",
+  "sunnypilot/qt/offroad/settings/device_panel.cc",
+  "sunnypilot/qt/offroad/settings/settings.cc",
+  "sunnypilot/qt/onroad/buttons.cc",
+  "sunnypilot/qt/onroad/onroad_home.cc",
+  "sunnypilot/qt/onroad/onroad_settings.cc",
+  "sunnypilot/qt/onroad/annotated_camera.cc",
+  "sunnypilot/qt/onroad/onroad_settings_panel.cc",
+  "sunnypilot/qt/onroad/developer_ui/developer_ui.cc",
 ]
 
 sp_widgets_src = widgets_src + network_src

selfdrive/ui/sunnypilot/qt/api.cc

@@ -1,4 +1,4 @@
-#include "selfdrive/ui/sunnypilot/qt/sp_priv_api.h"
+#include "selfdrive/ui/sunnypilot/qt/api.h"
 
 #include <openssl/pem.h>
 #include <openssl/rsa.h>
@@ -11,7 +11,7 @@
 #include <string>
 #include <common/swaglog.h>
 
-#include "sp_priv_util.h"
+#include "util.h"
 #include "common/util.h"
 #include "system/hardware/hw.h"
 #include "selfdrive/ui/qt/util.h"

selfdrive/ui/sunnypilot/qt/api.h

@@ -6,7 +6,7 @@
 #include <QTimer>
 
 #include "selfdrive/ui/qt/api.h"
-#include "selfdrive/ui/sunnypilot/qt/sp_priv_util.h"
+#include "selfdrive/ui/sunnypilot/qt/util.h"
 #include "common/util.h"
 
 namespace SunnylinkApi {

selfdrive/ui/sunnypilot/qt/home.cc

@@ -1,4 +1,4 @@
-#include "selfdrive/ui/sunnypilot/qt/sp_priv_home.h"
+#include "selfdrive/ui/sunnypilot/qt/home.h"
 
 #include <QHBoxLayout>
 #include <QMouseEvent>

selfdrive/ui/sunnypilot/qt/home.h

@@ -11,12 +11,12 @@
 #include "selfdrive/ui/qt/offroad/driverview.h"
 #include "selfdrive/ui/qt/body.h"
 #include "selfdrive/ui/qt/widgets/offroad_alerts.h"
-#include "selfdrive/ui/sunnypilot/sp_priv_ui.h"
+#include "selfdrive/ui/sunnypilot/ui.h"
 #include "selfdrive/ui/qt/home.h"
 
 #ifdef SUNNYPILOT
-#include "selfdrive/ui/sunnypilot/qt/sp_priv_sidebar.h"
-#include "selfdrive/ui/sunnypilot/qt/onroad/sp_priv_onroad_home.h"
+#include "selfdrive/ui/sunnypilot/qt/sidebar.h"
+#include "selfdrive/ui/sunnypilot/qt/onroad/onroad_home.h"
 #define OnroadWindow OnroadWindowSP
 #else
 #include "selfdrive/ui/qt/sidebar.h"

selfdrive/ui/sunnypilot/qt/maps/map.cc

@@ -1,7 +1,7 @@
-#include "selfdrive/ui/sunnypilot/qt/maps/sp_priv_map.h"
+#include "selfdrive/ui/sunnypilot/qt/maps/map.h"
 
 #include "common/swaglog.h"
-#include "selfdrive/ui/sunnypilot/qt/maps/sp_priv_map_helpers.h"
+#include "selfdrive/ui/sunnypilot/qt/maps/map_helpers.h"
 
 MapWindowSP::MapWindowSP(const QMapLibre::Settings &settings) : MapWindow(settings) {
   QObject::disconnect(uiState(), &UIState::uiUpdate, this, &MapWindow::updateState);

selfdrive/ui/sunnypilot/qt/maps/map.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "selfdrive/ui/qt/maps/map.h"
-#include "selfdrive/ui/sunnypilot/sp_priv_ui.h"
+#include "selfdrive/ui/sunnypilot/ui.h"
 
 #include <QColor>
 

selfdrive/ui/sunnypilot/qt/network/networking.cc

@@ -1,4 +1,4 @@
-#include "selfdrive/ui/sunnypilot/qt/network/sp_priv_networking.h"
+#include "selfdrive/ui/sunnypilot/qt/network/networking.h"
 
 #include <algorithm>
 
@@ -7,7 +7,7 @@
 #include <QStyle>
 #include "selfdrive/ui/qt/widgets/ssh_keys.h"
 
-#include "selfdrive/ui/sunnypilot/sp_priv_ui.h"
+#include "selfdrive/ui/sunnypilot/ui.h"
 #include "selfdrive/ui/qt/qt_window.h"
 #include "selfdrive/ui/qt/util.h"
 #include "selfdrive/ui/qt/widgets/scrollview.h"

selfdrive/ui/sunnypilot/qt/network/networking.h

@@ -4,7 +4,7 @@
 #include <vector>
 
 #include "selfdrive/ui/qt/network/wifi_manager.h"
-#include "selfdrive/ui/sunnypilot/qt/widgets/sp_priv_controls.h"
+#include "selfdrive/ui/sunnypilot/qt/widgets/controls.h"
 
 class WifiItemSP : public QWidget {
   Q_OBJECT

selfdrive/ui/sunnypilot/qt/network/sunnylink/services/base_device_service.cc

@@ -1,10 +1,10 @@
-#include "selfdrive/ui/sunnypilot/qt/network/sunnylink//services/sp_priv_base_device_service.h"
+#include "selfdrive/ui/sunnypilot/qt/network/sunnylink//services/base_device_service.h"
 
-#include <selfdrive/ui/sunnypilot/qt/sp_priv_request_repeater.h>
+#include "selfdrive/ui/sunnypilot/qt/request_repeater.h"
 
 #include "common/swaglog.h"
 #include "selfdrive/ui/qt/util.h"
-#include "selfdrive/ui/sunnypilot/qt/offroad/settings/sp_priv_sunnylink_settings.h"
+#include "selfdrive/ui/sunnypilot/qt/offroad/settings/sunnylink_settings.h"
 
 BaseDeviceService::BaseDeviceService(QObject* parent) : QObject(parent), initial_request(nullptr), repeater(nullptr) {
   param_watcher = new ParamWatcher(this);

selfdrive/ui/sunnypilot/qt/network/sunnylink/services/base_device_service.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "selfdrive/ui/sunnypilot/qt/sp_priv_request_repeater.h"
+#include "selfdrive/ui/sunnypilot/qt/request_repeater.h"
 #include "selfdrive/ui/qt/util.h"
 
 class BaseDeviceService : public QObject {

selfdrive/ui/sunnypilot/qt/network/sunnylink/services/role_service.cc

@@ -1,4 +1,4 @@
-#include "selfdrive/ui/sunnypilot/qt/network/sunnylink/services/sp_priv_role_service.h"
+#include "selfdrive/ui/sunnypilot/qt/network/sunnylink/services/role_service.h"
 
 #include <QJsonArray>
 #include <QJsonDocument>

selfdrive/ui/sunnypilot/qt/network/sunnylink/services/role_service.h

@@ -2,8 +2,8 @@
 
 #include <vector>
 
-#include "selfdrive/ui/sunnypilot/qt/network/sunnylink/services/sp_priv_base_device_service.h"
-#include "selfdrive/ui/sunnypilot/qt/network/sunnylink/models/sp_priv_role_model.h"
+#include "selfdrive/ui/sunnypilot/qt/network/sunnylink/services/base_device_service.h"
+#include "selfdrive/ui/sunnypilot/qt/network/sunnylink/models/role_model.h"
 
 class RoleService : public BaseDeviceService {
   Q_OBJECT

selfdrive/ui/sunnypilot/qt/network/sunnylink/services/user_service.cc

@@ -1,4 +1,4 @@
-#include "selfdrive/ui/sunnypilot/qt/network/sunnylink/services/sp_priv_user_service.h"
+#include "selfdrive/ui/sunnypilot/qt/network/sunnylink/services/user_service.h"
 
 #include <QJsonArray>
 #include <QJsonDocument>

selfdrive/ui/sunnypilot/qt/network/sunnylink/services/user_service.h

@@ -2,8 +2,8 @@
 
 #include <vector>
 
-#include "selfdrive/ui/sunnypilot/qt/network/sunnylink/services/sp_priv_base_device_service.h"
-#include "selfdrive/ui/sunnypilot/qt/network/sunnylink/models/sp_priv_user_model.h"
+#include "selfdrive/ui/sunnypilot/qt/network/sunnylink/services/base_device_service.h"
+#include "selfdrive/ui/sunnypilot/qt/network/sunnylink/models/user_model.h"
 
 class UserService : public BaseDeviceService {
   Q_OBJECT

selfdrive/ui/sunnypilot/qt/network/sunnylink/sunnylink_client.cc

@@ -1,5 +1,5 @@
-#include "selfdrive/ui/sunnypilot/qt/network/sunnylink/sp_priv_sunnylink_client.h"
-#include "selfdrive/ui/sunnypilot/qt/network/sunnylink/services/sp_priv_user_service.h"
+#include "selfdrive/ui/sunnypilot/qt/network/sunnylink/sunnylink_client.h"
+#include "selfdrive/ui/sunnypilot/qt/network/sunnylink/services/user_service.h"
 
 SunnylinkClient::SunnylinkClient(QObject* parent) : QObject(parent) {
   role_service = new RoleService(parent);

selfdrive/ui/sunnypilot/qt/network/sunnylink/sunnylink_client.h

@@ -2,8 +2,8 @@
 
 #include <QObject>
 
-#include "selfdrive/ui/sunnypilot/qt/network/sunnylink/services/sp_priv_role_service.h"
-#include "selfdrive/ui/sunnypilot/qt/network/sunnylink/services/sp_priv_user_service.h"
+#include "selfdrive/ui/sunnypilot/qt/network/sunnylink/services/role_service.h"
+#include "selfdrive/ui/sunnypilot/qt/network/sunnylink/services/user_service.h"
 
 class SunnylinkClient : public QObject {
   Q_OBJECT

selfdrive/ui/sunnypilot/qt/offroad/settings/device_panel.cc

@@ -1,4 +1,4 @@
-#include "selfdrive/ui/sunnypilot/qt/offroad/settings/sp_priv_device_panel.h"
+#include "selfdrive/ui/sunnypilot/qt/offroad/settings/device_panel.h"
 
 #include <string>
 #include <vector>

selfdrive/ui/sunnypilot/qt/offroad/settings/device_panel.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "selfdrive/ui/sunnypilot/qt/offroad/settings/sp_priv_settings.h"
+#include "selfdrive/ui/sunnypilot/qt/offroad/settings/settings.h"
 
 class DevicePanelSP : public DevicePanel {
   Q_OBJECT

selfdrive/ui/sunnypilot/qt/offroad/settings/display_settings.cc

@@ -1,4 +1,4 @@
-#include "selfdrive/ui/sunnypilot/qt/offroad/settings/sp_priv_display_settings.h"
+#include "selfdrive/ui/sunnypilot/qt/offroad/settings/display_settings.h"
 
 #include <tuple>
 #include <vector>

selfdrive/ui/sunnypilot/qt/offroad/settings/display_settings.h

@@ -3,7 +3,7 @@
 #include <map>
 #include <string>
 
-#include "selfdrive/ui/sunnypilot/qt/widgets/sp_priv_controls.h"
+#include "selfdrive/ui/sunnypilot/qt/widgets/controls.h"
 
 class OnroadScreenOff : public OptionControlSP {
   Q_OBJECT

selfdrive/ui/sunnypilot/qt/offroad/settings/monitoring_settings.cc

@@ -1,4 +1,4 @@
-#include "selfdrive/ui/sunnypilot/qt/offroad/settings/sp_priv_monitoring_settings.h"
+#include "selfdrive/ui/sunnypilot/qt/offroad/settings/monitoring_settings.h"
 
 MonitoringPanel::MonitoringPanel(QWidget *parent) : QFrame(parent) {
   main_layout = new QStackedLayout(this);

selfdrive/ui/sunnypilot/qt/offroad/settings/monitoring_settings.h

@@ -5,8 +5,8 @@
 #include <tuple>
 #include <vector>
 
-#include "selfdrive/ui/sunnypilot/qt/widgets/sp_priv_controls.h"
-#include "selfdrive/ui/sunnypilot/qt/widgets/sp_priv_scrollview.h"
+#include "selfdrive/ui/sunnypilot/qt/widgets/controls.h"
+#include "selfdrive/ui/sunnypilot/qt/widgets/scrollview.h"
 
 class MonitoringPanel : public QFrame {
   Q_OBJECT

selfdrive/ui/sunnypilot/qt/offroad/settings/onboarding.cc

@@ -1,4 +1,4 @@
-#include "selfdrive/ui/sunnypilot/qt/offroad/settings/sp_priv_onboarding.h"
+#include "selfdrive/ui/sunnypilot/qt/offroad/settings/onboarding.h"
 
 #include <string>
 

selfdrive/ui/sunnypilot/qt/offroad/settings/osm/locations_fetcher.h

@@ -8,7 +8,7 @@
 #include <QDir>
 #include <QJsonObject>
 
-#include "selfdrive/ui/sunnypilot/qt/common/sp_priv_json_fetcher.h"
+#include "selfdrive/ui/sunnypilot/qt/common/json_fetcher.h"
 
 static const std::tuple<QString, QString> defaultLocation = std::make_tuple("== None ==", "");
 // New class LocationsFetcher that handles web requests and JSON parsing

selfdrive/ui/sunnypilot/qt/offroad/settings/osm/models_fetcher.cc

@@ -1,4 +1,4 @@
-#include "selfdrive/ui/sunnypilot/qt/offroad/settings/osm/sp_priv_models_fetcher.h"
+#include "selfdrive/ui/sunnypilot/qt/offroad/settings/osm/models_fetcher.h"
 
 #include <QThread>
 

selfdrive/ui/sunnypilot/qt/offroad/settings/osm/models_fetcher.h

@@ -11,11 +11,11 @@
 
 #include "common/swaglog.h"
 #include "common/util.h"
-#include "selfdrive/ui/sunnypilot/sp_priv_ui.h"
+#include "selfdrive/ui/sunnypilot/ui.h"
 #include "selfdrive/ui/qt/util.h"
-#include "selfdrive/ui/sunnypilot/qt/common/sp_priv_json_fetcher.h"
+#include "selfdrive/ui/sunnypilot/qt/common/json_fetcher.h"
 #ifdef SUNNYPILOT
-#include "selfdrive/ui/sunnypilot/qt/widgets/sp_priv_controls.h"
+#include "selfdrive/ui/sunnypilot/qt/widgets/controls.h"
 #else
 #include "selfdrive/ui/qt/widgets/controls.h"
 #endif

selfdrive/ui/sunnypilot/qt/offroad/settings/osm_settings.cc

@@ -1,4 +1,4 @@
-#include "selfdrive/ui/sunnypilot/qt/offroad/settings/sp_priv_osm_settings.h"
+#include "selfdrive/ui/sunnypilot/qt/offroad/settings/osm_settings.h"
 
 #include <tuple>
 #include <vector>

selfdrive/ui/sunnypilot/qt/offroad/settings/osm_settings.h

@@ -13,11 +13,11 @@
 
 #include "common/swaglog.h"
 #include "selfdrive/ui/qt/network/wifi_manager.h"
-#include "selfdrive/ui/sunnypilot/qt/widgets/sp_priv_controls.h"
-#include "selfdrive/ui/sunnypilot/qt/offroad/settings/osm/sp_priv_locations_fetcher.h"
-#include "selfdrive/ui/sunnypilot/qt/widgets/sp_priv_scrollview.h"
+#include "selfdrive/ui/sunnypilot/qt/widgets/controls.h"
+#include "selfdrive/ui/sunnypilot/qt/offroad/settings/osm/locations_fetcher.h"
+#include "selfdrive/ui/sunnypilot/qt/widgets/scrollview.h"
 #include "selfdrive/ui/qt/util.h"
-#include "selfdrive/ui/sunnypilot/sp_priv_ui.h"
+#include "selfdrive/ui/sunnypilot/ui.h"
 #include "system/hardware/hw.h"
 
 constexpr int FAST_REFRESH_INTERVAL = 1000;  // ms

selfdrive/ui/sunnypilot/qt/offroad/settings/settings.cc

@@ -1,11 +1,11 @@
-#include "selfdrive/ui/sunnypilot/qt/offroad/settings/sp_priv_settings.h"
+#include "selfdrive/ui/sunnypilot/qt/offroad/settings/settings.h"
 
 #include <tuple>
 #include <vector>
 
-#include "selfdrive/ui/sunnypilot/qt/offroad/settings/sp_priv_device_panel.h"
-#include "selfdrive/ui/sunnypilot/qt/network/sp_priv_networking.h"
-#include "selfdrive/ui/sunnypilot/sp_priv_sunnypilot_main.h"
+#include "selfdrive/ui/sunnypilot/qt/offroad/settings/device_panel.h"
+#include "selfdrive/ui/sunnypilot/qt/network/networking.h"
+#include "selfdrive/ui/sunnypilot/sunnypilot_main.h"
 
 TogglesPanelSP::TogglesPanelSP(SettingsWindow *parent) : TogglesPanel(parent) {
   // param, title, desc, icon

selfdrive/ui/sunnypilot/qt/offroad/settings/software_settings.cc

@@ -1,4 +1,4 @@
-#include "selfdrive/ui/sunnypilot/qt/offroad/settings/sp_priv_software_settings.h"
+#include "selfdrive/ui/sunnypilot/qt/offroad/settings/software_settings.h"
 
 #include <algorithm>
 

selfdrive/ui/sunnypilot/qt/offroad/settings/software_settings.h

@@ -1,9 +1,9 @@
 #pragma once
 
 #include "common/model.h"
-#include "selfdrive/ui/sunnypilot/sp_priv_ui.h"
+#include "selfdrive/ui/sunnypilot/ui.h"
 #include "selfdrive/ui/qt/offroad/settings.h"
-#include "selfdrive/ui/sunnypilot/qt/offroad/settings/osm/sp_priv_models_fetcher.h"
+#include "selfdrive/ui/sunnypilot/qt/offroad/settings/osm/models_fetcher.h"
 
 class SoftwarePanelSP final : public SoftwarePanel {
   Q_OBJECT

selfdrive/ui/sunnypilot/qt/offroad/settings/sunnylink_settings.cc

@@ -1,5 +1,5 @@
-#include "selfdrive/ui/sunnypilot/qt/offroad/settings/sp_priv_sunnylink_settings.h"
-#include "selfdrive/ui/sunnypilot/qt/sp_priv_api.h"
+#include "selfdrive/ui/sunnypilot/qt/offroad/settings/sunnylink_settings.h"
+#include "selfdrive/ui/sunnypilot/qt/api.h"
 
 #include <map>
 #include <string>

selfdrive/ui/sunnypilot/qt/offroad/settings/sunnylink_settings.h

@@ -3,11 +3,11 @@
 #include <QtCore/qjsonobject.h>
 
 #include <QrCode.hpp>
-#include "selfdrive/ui/sunnypilot/qt/network/sunnylink/sp_priv_sunnylink_client.h"
+#include "selfdrive/ui/sunnypilot/qt/network/sunnylink/sunnylink_client.h"
 
-#include "selfdrive/ui/sunnypilot/sp_priv_ui.h"
-#include "selfdrive/ui/sunnypilot/qt/widgets/sp_priv_controls.h"
-#include "selfdrive/ui/sunnypilot/qt/widgets/sp_priv_scrollview.h"
+#include "selfdrive/ui/sunnypilot/ui.h"
+#include "selfdrive/ui/sunnypilot/qt/widgets/controls.h"
+#include "selfdrive/ui/sunnypilot/qt/widgets/scrollview.h"
 
 const QString SUNNYLINK_BASE_URL = util::getenv("SUNNYLINK_API_HOST", "https://stg.api.sunnypilot.ai").c_str();
 // sponsor QR code

selfdrive/ui/sunnypilot/qt/offroad/settings/sunnypilot/custom_offsets_settings.cc

@@ -1,4 +1,4 @@
-#include "selfdrive/ui/sunnypilot/qt/offroad/settings/sunnypilot/sp_priv_custom_offsets_settings.h"
+#include "selfdrive/ui/sunnypilot/qt/offroad/settings/sunnypilot/custom_offsets_settings.h"
 
 CustomOffsetsSettings::CustomOffsetsSettings(QWidget* parent) : QWidget(parent) {
   QVBoxLayout* main_layout = new QVBoxLayout(this);

selfdrive/ui/sunnypilot/qt/offroad/settings/sunnypilot/custom_offsets_settings.h

@@ -3,8 +3,8 @@
 #include <map>
 #include <string>
 
-#include "selfdrive/ui/sunnypilot/qt/widgets/sp_priv_controls.h"
-#include "selfdrive/ui/sunnypilot/qt/widgets/sp_priv_scrollview.h"
+#include "selfdrive/ui/sunnypilot/qt/widgets/controls.h"
+#include "selfdrive/ui/sunnypilot/qt/widgets/scrollview.h"
 
 class CameraOffset : public OptionControlSP {
   Q_OBJECT

selfdrive/ui/sunnypilot/qt/offroad/settings/sunnypilot/lane_change_settings.cc

@@ -1,4 +1,4 @@
-#include "selfdrive/ui/sunnypilot/qt/offroad/settings/sunnypilot/sp_priv_lane_change_settings.h"
+#include "selfdrive/ui/sunnypilot/qt/offroad/settings/sunnypilot/lane_change_settings.h"
 
 #include <map>
 #include <string>

selfdrive/ui/sunnypilot/qt/offroad/settings/sunnypilot/lane_change_settings.h

@@ -3,9 +3,9 @@
 #include <map>
 #include <string>
 
-#include "selfdrive/ui/sunnypilot/sp_priv_ui.h"
-#include "selfdrive/ui/sunnypilot/qt/widgets/sp_priv_controls.h"
-#include "selfdrive/ui/sunnypilot/qt/widgets/sp_priv_scrollview.h"
+#include "selfdrive/ui/sunnypilot/ui.h"
+#include "selfdrive/ui/sunnypilot/qt/widgets/controls.h"
+#include "selfdrive/ui/sunnypilot/qt/widgets/scrollview.h"
 
 class AutoLaneChangeTimer : public OptionControlSP {
   Q_OBJECT

selfdrive/ui/sunnypilot/qt/offroad/settings/sunnypilot/mads_settings.cc

@@ -1,4 +1,4 @@
-#include "selfdrive/ui/sunnypilot/qt/offroad/settings/sunnypilot/sp_priv_mads_settings.h"
+#include "selfdrive/ui/sunnypilot/qt/offroad/settings/sunnypilot/mads_settings.h"
 
 #include <tuple>
 #include <vector>

selfdrive/ui/sunnypilot/qt/offroad/settings/sunnypilot/mads_settings.h

@@ -3,9 +3,9 @@
 #include <map>
 #include <string>
 
-#include "selfdrive/ui/sunnypilot/sp_priv_ui.h"
-#include "selfdrive/ui/sunnypilot/qt/widgets/sp_priv_controls.h"
-#include "selfdrive/ui/sunnypilot/qt/widgets/sp_priv_scrollview.h"
+#include "selfdrive/ui/sunnypilot/ui.h"
+#include "selfdrive/ui/sunnypilot/qt/widgets/controls.h"
+#include "selfdrive/ui/sunnypilot/qt/widgets/scrollview.h"
 
 class MadsSettings : public QWidget {
   Q_OBJECT

selfdrive/ui/sunnypilot/qt/offroad/settings/sunnypilot/speed_limit_control_settings.cc

@@ -1,4 +1,4 @@
-#include "selfdrive/ui/sunnypilot/qt/offroad/settings/sunnypilot/sp_priv_speed_limit_control_settings.h"
+#include "selfdrive/ui/sunnypilot/qt/offroad/settings/sunnypilot/speed_limit_control_settings.h"
 
 #include <vector>
 

selfdrive/ui/sunnypilot/qt/offroad/settings/sunnypilot/speed_limit_control_settings.h

@@ -4,9 +4,9 @@
 #include <string>
 #include <vector>
 
-#include "selfdrive/ui/sunnypilot/sp_priv_ui.h"
-#include "selfdrive/ui/sunnypilot/qt/widgets/sp_priv_controls.h"
-#include "selfdrive/ui/sunnypilot/qt/widgets/sp_priv_scrollview.h"
+#include "selfdrive/ui/sunnypilot/ui.h"
+#include "selfdrive/ui/sunnypilot/qt/widgets/controls.h"
+#include "selfdrive/ui/sunnypilot/qt/widgets/scrollview.h"
 #include "selfdrive/ui/qt/util.h"
 
 class SpeedLimitValueOffset : public OptionControlSP {

selfdrive/ui/sunnypilot/qt/offroad/settings/sunnypilot/speed_limit_policy_settings.cc

@@ -1,4 +1,4 @@
-#include "selfdrive/ui/sunnypilot/qt/offroad/settings/sunnypilot/sp_priv_speed_limit_policy_settings.h"
+#include "selfdrive/ui/sunnypilot/qt/offroad/settings/sunnypilot/speed_limit_policy_settings.h"
 
 SpeedLimitPolicySettings::SpeedLimitPolicySettings(QWidget* parent) : QWidget(parent) {
   QVBoxLayout* main_layout = new QVBoxLayout(this);

selfdrive/ui/sunnypilot/qt/offroad/settings/sunnypilot/speed_limit_policy_settings.h

@@ -3,9 +3,9 @@
 #include <string>
 #include <vector>
 
-#include "selfdrive/ui/sunnypilot/sp_priv_ui.h"
-#include "selfdrive/ui/sunnypilot/qt/widgets/sp_priv_controls.h"
-#include "selfdrive/ui/sunnypilot/qt/widgets/sp_priv_scrollview.h"
+#include "selfdrive/ui/sunnypilot/ui.h"
+#include "selfdrive/ui/sunnypilot/qt/widgets/controls.h"
+#include "selfdrive/ui/sunnypilot/qt/widgets/scrollview.h"
 #include "selfdrive/ui/qt/util.h"
 
 class SpeedLimitPolicySettings : public QWidget {

selfdrive/ui/sunnypilot/qt/offroad/settings/sunnypilot/speed_limit_warning_settings.cc

@@ -1,4 +1,4 @@
-#include "../../settings/sunnypilot/sp_priv_speed_limit_warning_settings.h"
+#include "../../settings/sunnypilot/speed_limit_warning_settings.h"
 
 SpeedLimitWarningSettings::SpeedLimitWarningSettings(QWidget* parent) : QWidget(parent) {
   QVBoxLayout* main_layout = new QVBoxLayout(this);

selfdrive/ui/sunnypilot/qt/offroad/settings/sunnypilot/speed_limit_warning_settings.h

@@ -4,9 +4,9 @@
 #include <string>
 #include <vector>
 
-#include "selfdrive/ui/sunnypilot/sp_priv_ui.h"
-#include "selfdrive/ui/sunnypilot/qt/widgets/sp_priv_controls.h"
-#include "selfdrive/ui/sunnypilot/qt/widgets/sp_priv_scrollview.h"
+#include "selfdrive/ui/sunnypilot/ui.h"
+#include "selfdrive/ui/sunnypilot/qt/widgets/controls.h"
+#include "selfdrive/ui/sunnypilot/qt/widgets/scrollview.h"
 #include "selfdrive/ui/qt/util.h"
 
 class SpeedLimitWarningValueOffset : public OptionControlSP {

selfdrive/ui/sunnypilot/qt/offroad/settings/sunnypilot_settings.cc

@@ -1,4 +1,4 @@
-#include "selfdrive/ui/sunnypilot/qt/offroad/settings/sp_priv_sunnypilot_settings.h"
+#include "selfdrive/ui/sunnypilot/qt/offroad/settings/sunnypilot_settings.h"
 
 #include <tuple>
 #include <vector>

selfdrive/ui/sunnypilot/qt/offroad/settings/sunnypilot_settings.h

@@ -4,16 +4,16 @@
 #include <string>
 
 #include "common/model.h"
-#include "selfdrive/ui/sunnypilot/sp_priv_ui.h"
-#include "selfdrive/ui/sunnypilot/qt/offroad/settings/sunnypilot/sp_priv_custom_offsets_settings.h"
-#include "selfdrive/ui/sunnypilot/qt/offroad/settings/sunnypilot/sp_priv_lane_change_settings.h"
-#include "selfdrive/ui/sunnypilot/qt/offroad/settings/sunnypilot/sp_priv_mads_settings.h"
-#include "selfdrive/ui/sunnypilot/qt/offroad/settings/sunnypilot/sp_priv_speed_limit_control_settings.h"
-#include "selfdrive/ui/sunnypilot/qt/offroad/settings/sunnypilot/sp_priv_speed_limit_warning_settings.h"
-#include "selfdrive/ui/sunnypilot/qt/offroad/settings/sunnypilot/sp_priv_speed_limit_policy_settings.h"
+#include "selfdrive/ui/sunnypilot/ui.h"
+#include "selfdrive/ui/sunnypilot/qt/offroad/settings/sunnypilot/custom_offsets_settings.h"
+#include "selfdrive/ui/sunnypilot/qt/offroad/settings/sunnypilot/lane_change_settings.h"
+#include "selfdrive/ui/sunnypilot/qt/offroad/settings/sunnypilot/mads_settings.h"
+#include "selfdrive/ui/sunnypilot/qt/offroad/settings/sunnypilot/speed_limit_control_settings.h"
+#include "selfdrive/ui/sunnypilot/qt/offroad/settings/sunnypilot/speed_limit_warning_settings.h"
+#include "selfdrive/ui/sunnypilot/qt/offroad/settings/sunnypilot/speed_limit_policy_settings.h"
 #include "selfdrive/ui/qt/util.h"
-#include "selfdrive/ui/sunnypilot/qt/widgets/sp_priv_controls.h"
-#include "selfdrive/ui/sunnypilot/qt/widgets/sp_priv_scrollview.h"
+#include "selfdrive/ui/sunnypilot/qt/widgets/controls.h"
+#include "selfdrive/ui/sunnypilot/qt/widgets/scrollview.h"
 
 class TorqueFriction : public OptionControlSP {
   Q_OBJECT

selfdrive/ui/sunnypilot/qt/offroad/settings/trips_settings.cc

@@ -1,4 +1,4 @@
-#include "selfdrive/ui/sunnypilot/qt/offroad/settings/sp_priv_trips_settings.h"
+#include "selfdrive/ui/sunnypilot/qt/offroad/settings/trips_settings.h"
 
 TripsPanel::TripsPanel(QWidget* parent) : QFrame(parent) {
   QVBoxLayout* main_layout = new QVBoxLayout(this);

selfdrive/ui/sunnypilot/qt/offroad/settings/trips_settings.h

@@ -1,11 +1,11 @@
 #pragma once
 
 #ifdef SUNNYPILOT
-#include "selfdrive/ui/sunnypilot/qt/widgets/sp_priv_controls.h"
+#include "selfdrive/ui/sunnypilot/qt/widgets/controls.h"
 #else
 #include "selfdrive/ui/qt/widgets/controls.h"
 #endif
-#include "selfdrive/ui/sunnypilot/qt/widgets/sp_priv_drive_stats.h"
+#include "selfdrive/ui/sunnypilot/qt/widgets/drive_stats.h"
 
 class TripsPanel : public QFrame {
   Q_OBJECT

selfdrive/ui/sunnypilot/qt/offroad/settings/vehicle_settings.cc

@@ -1,5 +1,5 @@
-#include "selfdrive/ui/sunnypilot/qt/offroad/settings/sp_priv_vehicle_settings.h"
-#include "selfdrive/ui/sunnypilot/qt/sp_priv_util.h"
+#include "selfdrive/ui/sunnypilot/qt/offroad/settings/vehicle_settings.h"
+#include "selfdrive/ui/sunnypilot/qt/util.h"
 
 VehiclePanel::VehiclePanel(QWidget *parent) : QWidget(parent) {
   main_layout = new QStackedLayout(this);

selfdrive/ui/sunnypilot/qt/offroad/settings/vehicle_settings.h

@@ -3,9 +3,9 @@
 #include <QApplication>
 
 #include "common/watchdog.h"
-#include "selfdrive/ui/sunnypilot/sp_priv_ui.h"
-#include "selfdrive/ui/sunnypilot/qt/widgets/sp_priv_controls.h"
-#include "selfdrive/ui/sunnypilot/qt/widgets/sp_priv_scrollview.h"
+#include "selfdrive/ui/sunnypilot/ui.h"
+#include "selfdrive/ui/sunnypilot/qt/widgets/controls.h"
+#include "selfdrive/ui/sunnypilot/qt/widgets/scrollview.h"
 
 class VehiclePanel : public QWidget {
   Q_OBJECT

selfdrive/ui/sunnypilot/qt/offroad/settings/visuals_settings.cc

@@ -1,4 +1,4 @@
-#include "selfdrive/ui/sunnypilot/qt/offroad/settings/sp_priv_visuals_settings.h"
+#include "selfdrive/ui/sunnypilot/qt/offroad/settings/visuals_settings.h"
 
 #include <tuple>
 #include <vector>

selfdrive/ui/sunnypilot/qt/offroad/settings/visuals_settings.h

@@ -3,8 +3,8 @@
 #include <map>
 #include <string>
 
-#include "selfdrive/ui/sunnypilot/sp_priv_ui.h"
-#include "selfdrive/ui/sunnypilot/qt/widgets/sp_priv_controls.h"
+#include "selfdrive/ui/sunnypilot/ui.h"
+#include "selfdrive/ui/sunnypilot/qt/widgets/controls.h"
 
 class VisualsPanel : public ListWidgetSP {
   Q_OBJECT

selfdrive/ui/sunnypilot/qt/offroad_home.cc

@@ -1,8 +1,8 @@
-#include "selfdrive/ui/sunnypilot/qt/sp_priv_offroad_home.h"
+#include "selfdrive/ui/sunnypilot/qt/offroad_home.h"
 #include "selfdrive/ui/qt/offroad/experimental_mode.h"
 #include "selfdrive/ui/qt/widgets/prime.h"
 #include <QStackedWidget>
-#include "selfdrive/ui/sunnypilot/sp_priv_sunnypilot_main.h"
+#include "selfdrive/ui/sunnypilot/sunnypilot_main.h"
 
 #ifdef ENABLE_MAPS
 #define LEFT_WIDGET MapSettings

selfdrive/ui/sunnypilot/qt/onroad/annotated_camera.cc

@@ -1,4 +1,4 @@
-#include "selfdrive/ui/sunnypilot/qt/onroad/sp_priv_annotated_camera.h"
+#include "selfdrive/ui/sunnypilot/qt/onroad/annotated_camera.h"
 
 #include <algorithm>
 #include <cmath>
@@ -8,7 +8,7 @@
 #include "common/swaglog.h"
 #include "selfdrive/ui/qt/onroad/buttons.h"
 #include "selfdrive/ui/qt/util.h"
-#include "selfdrive/ui/sunnypilot/qt/sp_priv_util.h"
+#include "selfdrive/ui/sunnypilot/qt/util.h"
 
 static std::pair<QString, QColor> getFeatureStatus(int value, QStringList text_list, QStringList color_list,
                                                    bool condition, QString off_text) {

selfdrive/ui/sunnypilot/qt/onroad/annotated_camera.h

@@ -6,8 +6,8 @@
 
 #include "selfdrive/ui/qt/onroad/buttons.h"
 #include "selfdrive/ui/qt/widgets/cameraview.h"
-#include "selfdrive/ui/sunnypilot/qt/onroad/sp_priv_buttons.h"
-#include "selfdrive/ui/sunnypilot/qt/onroad/developer_ui/sp_priv_developer_ui.h"
+#include "selfdrive/ui/sunnypilot/qt/onroad/buttons.h"
+#include "selfdrive/ui/sunnypilot/qt/onroad/developer_ui/developer_ui.h"
 
 const int subsign_img_size = 35;
 const int blinker_size = 120;

selfdrive/ui/sunnypilot/qt/onroad/buttons.cc

@@ -1,4 +1,4 @@
-#include "selfdrive/ui/sunnypilot/qt/onroad/sp_priv_buttons.h"
+#include "selfdrive/ui/sunnypilot/qt/onroad/buttons.h"
 #include "selfdrive/ui/qt/util.h"
 
 

selfdrive/ui/sunnypilot/qt/onroad/buttons.h

@@ -3,7 +3,7 @@
 #include <QPushButton>
 #include "selfdrive/ui/qt/onroad/buttons.h"
 
-#include "selfdrive/ui/sunnypilot/sp_priv_ui.h"
+#include "selfdrive/ui/sunnypilot/ui.h"
 
 #include "selfdrive/ui/ui.h"
 

selfdrive/ui/sunnypilot/qt/onroad/developer_ui/developer_ui.cc

@@ -1,4 +1,4 @@
-#include "selfdrive/ui/sunnypilot/qt/onroad/developer_ui/sp_priv_developer_ui.h"
+#include "selfdrive/ui/sunnypilot/qt/onroad/developer_ui/developer_ui.h"
 
 #include <cmath>
 

selfdrive/ui/sunnypilot/qt/onroad/developer_ui/developer_ui.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "selfdrive/ui/sunnypilot/qt/onroad/developer_ui/sp_priv_ui_elements.h"
+#include "selfdrive/ui/sunnypilot/qt/onroad/developer_ui/ui_elements.h"
 
 class DeveloperUi {
 public:

selfdrive/ui/sunnypilot/qt/onroad/onroad_home.cc

@@ -1,14 +1,14 @@
-#include "selfdrive/ui/sunnypilot/qt/onroad/sp_priv_onroad_home.h"
+#include "selfdrive/ui/sunnypilot/qt/onroad/onroad_home.h"
 
 #include <QPainter>
 #include <QStackedLayout>
 
 #ifdef ENABLE_MAPS
-#include "selfdrive/ui/sunnypilot/qt/maps/sp_priv_map_helpers.h"
+#include "selfdrive/ui/sunnypilot/qt/maps/map_helpers.h"
 #include "selfdrive/ui/qt/maps/map_panel.h"
 #endif
 #ifdef SUNNYPILOT
-#include "selfdrive/ui/sunnypilot/qt/onroad/sp_priv_onroad_settings_panel.h"
+#include "selfdrive/ui/sunnypilot/qt/onroad/onroad_settings_panel.h"
 #endif
 
 #include <common/swaglog.h>

selfdrive/ui/sunnypilot/qt/onroad/onroad_home.h

@@ -4,7 +4,7 @@
 
 #include "common/params.h"
 #include "selfdrive/ui/qt/onroad/alerts.h"
-// #include "selfdrive/ui/sunnypilot/qt/onroad/sp_priv_annotated_camera.h"
+// #include "selfdrive/ui/sunnypilot/qt/onroad/annotated_camera.h"
 
 
 class OnroadWindowSP : public OnroadWindow {

selfdrive/ui/sunnypilot/qt/onroad/onroad_settings.cc

@@ -1,4 +1,4 @@
-#include "selfdrive/ui/sunnypilot/qt/onroad/sp_priv_onroad_settings.h"
+#include "selfdrive/ui/sunnypilot/qt/onroad/onroad_settings.h"
 
 #include <map>
 #include <string>
@@ -8,8 +8,8 @@
 #include <QDebug>
 
 #include "common/util.h"
-#include "selfdrive/ui/sunnypilot/qt/widgets/sp_priv_scrollview.h"
-#include "selfdrive/ui/sunnypilot/qt/offroad/settings/sunnypilot/sp_priv_speed_limit_policy_settings.h"
+#include "selfdrive/ui/sunnypilot/qt/widgets/scrollview.h"
+#include "selfdrive/ui/sunnypilot/qt/offroad/settings/sunnypilot/speed_limit_policy_settings.h"
 
 OnroadSettings::OnroadSettings(bool closeable, QWidget *parent) : QFrame(parent) {
   setContentsMargins(0, 0, 0, 0);