diff --git a/backends/ui/haiku/aboutwindow.cpp b/backends/ui/haiku/aboutwindow.cpp
index 34e5930..92f9d7d 100644
--- a/backends/ui/haiku/aboutwindow.cpp
+++ b/backends/ui/haiku/aboutwindow.cpp
@@ -42,7 +42,7 @@ HaikuAboutWindow::HaikuAboutWindow() : BWindow(BRect(100, 100, 600, 400), "About
 	license_list = new BListView();
 	license_list->SetTarget(this);
     for (auto &license : get_license_data()) {
-        license_list->AddItem(new LicenseItem(license));
+        license_list->AddItem(new HaikuLicenseItem(license));
     }
     license_list->SetSelectionMessage(new BMessage(CMD_LOAD_LICENSE));
     BScrollView *license_list_scroller = new BScrollView("about:license-list-scroller", license_list, B_FOLLOW_ALL_SIDES, B_SUPPORTS_LAYOUT|B_FRAME_EVENTS, false, true);
@@ -66,7 +66,7 @@ void HaikuAboutWindow::MessageReceived(BMessage *msg) {
     if (msg->IsSystem()) return;
 	if (msg->what == CMD_LOAD_LICENSE) {
 		auto selection = license_list->ItemAt(msg->GetInt32("index", 0));
-		std::string str = ((LicenseItem*)selection)->license_text;
+		std::string str = ((HaikuLicenseItem*)selection)->license_text;
 		
 		license_text->SetText(str.c_str());
 		
diff --git a/backends/ui/haiku/main.cpp b/backends/ui/haiku/main.cpp
index 4a3aa4d..0857a70 100644
--- a/backends/ui/haiku/main.cpp
+++ b/backends/ui/haiku/main.cpp
@@ -10,7 +10,7 @@ std::string HaikuUIBackend::get_name() {
     return "Haiku Native";
 }
 void HaikuUIBackend::QuitHandler() {
-    LooperWindow *app = (LooperWindow*)main_loop;
+    HaikuLooperWindow *app = (HaikuLooperWindow*)main_loop;
     app->Hide();
 }
 static bool about_window_shown = false;
@@ -18,7 +18,7 @@ static bool prefs_window_shown = false;
 int HaikuUIBackend::run(std::vector<std::string> realArgs, int argc, char **argv) {
     int ret = UIBackend::run(realArgs, argc, argv);
     if (ret != 0) return ret;
-    LooperWindow *app = new LooperWindow(playback);
+    HaikuLooperWindow *app = new HaikuLooperWindow(playback);
     main_loop = (void*)app;
     app->Show();
     while (!app->IsHidden()) {
diff --git a/backends/ui/haiku/main_window.cpp b/backends/ui/haiku/main_window.cpp
index 4a59c5b..63f6a26 100644
--- a/backends/ui/haiku/main_window.cpp
+++ b/backends/ui/haiku/main_window.cpp
@@ -74,7 +74,7 @@ HaikuLooperWindow::HaikuLooperWindow(Playback *playback) : BWindow(BRect(100, 10
     SetSizeLimits(minW, maxW, minH, maxH);
     ResizeTo(minW, minH);
     DisableUpdates();
-    auto about_window = new AboutWindow();
+    auto about_window = new HaikuAboutWindow();
     layout = new BGroupLayout(B_VERTICAL);
     SetLayout(layout);
     layout->SetSpacing(0.0);
@@ -140,7 +140,7 @@ HaikuLooperWindow::HaikuLooperWindow(Playback *playback) : BWindow(BRect(100, 10
 	BRect bottom_rect = bottom_item->Frame();
 	bottom_item->SetExplicitMinSize(bottom_rect.Size());
     Pulse();
-    this->update_thread = new std::thread(std::mem_fn(&LooperWindow::ThreadFunc), this);
+    this->update_thread = new std::thread(std::mem_fn(&HaikuLooperWindow::ThreadFunc), this);
     UpdateIfNeeded();
     StartWatching(prefs_window, CMD_UPDATE_LABEL_SETTING);
     auto *msg = new BMessage(CMD_UPDATE_LABEL_SETTING);
@@ -349,7 +349,7 @@ void HaikuLooperWindow::ThreadFunc() {
         std::this_thread::sleep_for(1s / 60.0);
     }
 }
-HaikuLooperRefHandler::HaikuLooperRefHandler(LooperWindow *win) {
+HaikuLooperRefHandler::HaikuLooperRefHandler(HaikuLooperWindow *win) {
 	this->win = win;
 	be_app->Lock();
 	this->next_handler = be_app->PreferredHandler();
diff --git a/backends/ui/haiku/slider.cpp b/backends/ui/haiku/slider.cpp
index c7a1495..8d059c3 100644
--- a/backends/ui/haiku/slider.cpp
+++ b/backends/ui/haiku/slider.cpp
@@ -85,7 +85,7 @@ void HaikuLooperSlider::SetLimitLabels(const char *min, const char *max) {
 	SetMinLabel(min);
 	SetMaxLabel(max);
 }
-HaikuLooperSlider::~LooperSlider() {
+HaikuLooperSlider::~HaikuLooperSlider() {
 	if (min_label != NULL) free((void*)min_label);
 	if (max_label != NULL) free((void*)max_label);
 	delete slider;
@@ -178,7 +178,7 @@ void HaikuLooperSlider::MessageReceived(BMessage *msg) {
 	} break;
 	case CMD_UPDATE_LABEL_SETTING: {
 		const char *precision_text[2] = {"Imprecise", "Precise"};
-		BBitmap *precision_bitmap[2] = {LooperSlider::slider_mode_bitmap, LooperSlider::text_mode_bitmap};
+		BBitmap *precision_bitmap[2] = {HaikuLooperSlider::slider_mode_bitmap, HaikuLooperSlider::text_mode_bitmap};
 		BBitmap *bitmap = precision_bitmap[text_edit_mode ? 0 : 1];
 		if (show_labels || bitmap == NULL) {
 			btn->SetLabel(precision_text[text_edit_mode ? 0 : 1]);