diff --git a/src/kits/tracker/ContainerWindow.cpp b/src/kits/tracker/ContainerWindow.cpp
index c0410d3f90..a3f5bb53ce 100644
--- a/src/kits/tracker/ContainerWindow.cpp
+++ b/src/kits/tracker/ContainerWindow.cpp
@@ -1953,7 +1953,7 @@ BContainerWindow::AddWindowMenu(BMenu *menu)
 
 	menu->AddSeparatorItem();
 
-	item = new BMenuItem("Settings"B_UTF8_ELLIPSIS, new BMessage(kShowSettingsWindow));
+	item = new BMenuItem("Preferences"B_UTF8_ELLIPSIS, new BMessage(kShowSettingsWindow));
 	item->SetTarget(be_app);
 	menu->AddItem(item);
 }
diff --git a/src/kits/tracker/SettingsViews.cpp b/src/kits/tracker/SettingsViews.cpp
index c383853b88..912715c63b 100644
--- a/src/kits/tracker/SettingsViews.cpp
+++ b/src/kits/tracker/SettingsViews.cpp
@@ -152,7 +152,7 @@ DesktopSettingsView::DesktopSettingsView(BRect rect)
 	rect.OffsetBy(0, itemSpacing);
 	
 	fMountVolumesOntoDesktopRadioButton = new BRadioButton(rect, "",
-		"Show Volumes On Desktop", new BMessage(kVolumesOnDesktopChanged));
+		"Show Volumes on Desktop", new BMessage(kVolumesOnDesktopChanged));
 	AddChild(fMountVolumesOntoDesktopRadioButton);
 	fMountVolumesOntoDesktopRadioButton->ResizeToPreferred();
 
@@ -443,7 +443,7 @@ WindowsSettingsView::WindowsSettingsView(BRect rect)
 	: SettingsView(rect, "WindowsSettingsView")
 {
 	rect.OffsetTo(B_ORIGIN);
-	fShowFullPathInTitleBarCheckBox = new BCheckBox(rect, "", "Show Full Path In Title Bar",
+	fShowFullPathInTitleBarCheckBox = new BCheckBox(rect, "", "Show Folder Location in Title Bar",
 		new BMessage(kWindowsShowFullPathChanged));
 	fShowFullPathInTitleBarCheckBox->ResizeToPreferred();
 	AddChild(fShowFullPathInTitleBarCheckBox);
@@ -451,7 +451,7 @@ WindowsSettingsView::WindowsSettingsView(BRect rect)
 	const float itemSpacing = fShowFullPathInTitleBarCheckBox->Bounds().Height() + kItemExtraSpacing;
 	rect.OffsetBy(0, itemSpacing);
 
-	fSingleWindowBrowseCheckBox = new BCheckBox(rect, "", "Single Window Browse",
+	fSingleWindowBrowseCheckBox = new BCheckBox(rect, "", "Single Window Navigation",
 		new BMessage(kSingleWindowBrowseChanged));
 	fSingleWindowBrowseCheckBox->ResizeToPreferred();
 	AddChild(fSingleWindowBrowseCheckBox);
@@ -472,7 +472,7 @@ WindowsSettingsView::WindowsSettingsView(BRect rect)
 
 	rect.OffsetBy(0, itemSpacing);
 
-	fSortFolderNamesFirstCheckBox = new BCheckBox(rect, "", "Sort Folder Names First",
+	fSortFolderNamesFirstCheckBox = new BCheckBox(rect, "", "List Folders First",
 		new BMessage(kSortFolderNamesFirstChanged));
 	fSortFolderNamesFirstCheckBox->ResizeToPreferred();
 	AddChild(fSortFolderNamesFirstCheckBox);
@@ -1029,7 +1029,7 @@ SpaceBarSettingsView::SpaceBarSettingsView(BRect rect)
 	: SettingsView(rect, "SpaceBarSettingsView")
 {
 	rect.OffsetTo(B_ORIGIN);
-	fSpaceBarShowCheckBox = new BCheckBox(rect, "", "Show Space Bars On Volumes",
+	fSpaceBarShowCheckBox = new BCheckBox(rect, "", "Show Space Bars on Volumes",
 		new BMessage(kUpdateVolumeSpaceBar));
 	fSpaceBarShowCheckBox->ResizeToPreferred();
 	AddChild(fSpaceBarShowCheckBox);
@@ -1265,7 +1265,7 @@ TrashSettingsView::TrashSettingsView(BRect rect)
 	: SettingsView(rect, "TrashSettingsView")
 {
 	rect.OffsetTo(B_ORIGIN);
-	fDontMoveFilesToTrashCheckBox = new BCheckBox(rect, "", "Don't Move Files To Trash",
+	fDontMoveFilesToTrashCheckBox = new BCheckBox(rect, "", "Don't Move Files to Trash",
 			new BMessage(kDontMoveFilesToTrashChanged));
 	fDontMoveFilesToTrashCheckBox->ResizeToPreferred();
 	AddChild(fDontMoveFilesToTrashCheckBox);
diff --git a/src/kits/tracker/TrackerSettings.cpp b/src/kits/tracker/TrackerSettings.cpp
index ef93e3c5c2..67fecae52a 100644
--- a/src/kits/tracker/TrackerSettings.cpp
+++ b/src/kits/tracker/TrackerSettings.cpp
@@ -178,10 +178,10 @@ TTrackerState::LoadSettingsIfNeeded()
 	Add(fEjectWhenUnmounting = new BooleanValueSetting("EjectWhenUnmounting", true));
 
 	Add(fDesktopFilePanelRoot = new BooleanValueSetting("DesktopFilePanelRoot", true));
-	Add(fShowFullPathInTitleBar = new BooleanValueSetting("ShowFullPathInTitleBar", false));
+	Add(fShowFullPathInTitleBar = new BooleanValueSetting("ShowFullPathInTitleBar", true));
 	Add(fShowSelectionWhenInactive = new BooleanValueSetting("ShowSelectionWhenInactive", true));
 	Add(fTransparentSelection = new BooleanValueSetting("TransparentSelection", true));
-	Add(fSortFolderNamesFirst = new BooleanValueSetting("SortFolderNamesFirst", false));
+	Add(fSortFolderNamesFirst = new BooleanValueSetting("SortFolderNamesFirst", true));
 	Add(fHideDotFiles = new BooleanValueSetting("HideDotFiles", false));
  	Add(fSingleWindowBrowse = new BooleanValueSetting("SingleWindowBrowse", false));
 	Add(fShowNavigator = new BooleanValueSetting("ShowNavigator", false));
diff --git a/src/kits/tracker/TrackerSettingsWindow.cpp b/src/kits/tracker/TrackerSettingsWindow.cpp
index 4f3fccde91..104d90175c 100644
--- a/src/kits/tracker/TrackerSettingsWindow.cpp
+++ b/src/kits/tracker/TrackerSettingsWindow.cpp
@@ -64,7 +64,7 @@ const uint32 kRevertButtonPressed = 'Rebp';
 
 
 TrackerSettingsWindow::TrackerSettingsWindow()
-	: BWindow(BRect(80, 80, 450, 350), "Tracker Settings", B_TITLED_WINDOW,
+	: BWindow(BRect(80, 80, 450, 350), "Tracker Preferences", B_TITLED_WINDOW,
 		B_NOT_MINIMIZABLE | B_NOT_RESIZABLE | B_NO_WORKSPACE_ACTIVATION
 		| B_NOT_ANCHORED_ON_ACTIVATE | B_ASYNCHRONOUS_CONTROLS | B_NOT_ZOOMABLE)
 {
@@ -112,7 +112,7 @@ TrackerSettingsWindow::TrackerSettingsWindow()
 		new DesktopSettingsView(rect)));
 	fSettingsTypeListView->AddItem(new SettingsItem("Windows",
 		new WindowsSettingsView(rect)));
-	fSettingsTypeListView->AddItem(new SettingsItem("Time Format",
+	fSettingsTypeListView->AddItem(new SettingsItem("Date and Time",
 		new TimeFormatSettingsView(rect)));
 	fSettingsTypeListView->AddItem(new SettingsItem("Trash",
 		new TrashSettingsView(rect)));