diff --git a/src/apps/haikudepot/ui/RatePackageWindow.cpp b/src/apps/haikudepot/ui/RatePackageWindow.cpp
index 6125917c89..d0e384cc24 100644
--- a/src/apps/haikudepot/ui/RatePackageWindow.cpp
+++ b/src/apps/haikudepot/ui/RatePackageWindow.cpp
@@ -172,7 +172,7 @@ add_languages_to_menu(const StringList& languages, BMenu* menu)
 RatePackageWindow::RatePackageWindow(BWindow* parent, BRect frame,
 	Model& model)
 	:
-	BWindow(frame, B_TRANSLATE_SYSTEM_NAME("Your rating"),
+	BWindow(frame, B_TRANSLATE("Rate package"),
 		B_FLOATING_WINDOW_LOOK, B_FLOATING_SUBSET_WINDOW_FEEL,
 		B_ASYNCHRONOUS_CONTROLS | B_AUTO_UPDATE_SIZE_LIMITS),
 	fModel(model),
@@ -327,6 +327,10 @@ RatePackageWindow::SetPackage(const PackageInfoRef& package)
 
 	fPackage = package;
 
+	BString windowTitle(B_TRANSLATE("Rate %Package%"));
+	windowTitle.ReplaceAll("%Package%", package->Title());
+	SetTitle(windowTitle);
+
 	// See if the user already made a rating for this package,
 	// pre-fill the UI with that rating. (When sending the rating, the
 	// old one will be replaced.)
@@ -457,6 +461,8 @@ RatePackageWindow::_QueryRatingThread()
 		fRatingActiveCheckBox->SetValue(fRatingActive);
 		fRatingActiveCheckBox->Show();
 
+		fSendButton->SetLabel(B_TRANSLATE("Update"));
+
 		Unlock();
 	}
 
diff --git a/src/apps/haikudepot/ui/UserLoginWindow.cpp b/src/apps/haikudepot/ui/UserLoginWindow.cpp
index e89bcffee7..a9159a2005 100644
--- a/src/apps/haikudepot/ui/UserLoginWindow.cpp
+++ b/src/apps/haikudepot/ui/UserLoginWindow.cpp
@@ -77,7 +77,7 @@ add_languages_to_menu(const StringList& languages, BMenu* menu)
 
 UserLoginWindow::UserLoginWindow(BWindow* parent, BRect frame, Model& model)
 	:
-	BWindow(frame, B_TRANSLATE_SYSTEM_NAME("Log in"),
+	BWindow(frame, B_TRANSLATE("Log in"),
 		B_FLOATING_WINDOW_LOOK, B_FLOATING_SUBSET_WINDOW_FEEL,
 		B_ASYNCHRONOUS_CONTROLS | B_AUTO_UPDATE_SIZE_LIMITS
 			| B_NOT_RESIZABLE | B_NOT_ZOOMABLE),