diff --git a/src/Menus.cpp b/src/Menus.cpp
index 2b9059201..768c9ab91 100644
--- a/src/Menus.cpp
+++ b/src/Menus.cpp
@@ -582,7 +582,7 @@ void AudacityProject::CreateMenusAndCommands()
 
    c->BeginSubMenu(_("&Toolbars"));
 
-   c->AddCheck(wxT("ShowControlTB"), _("&Control Toolbar"), FN(OnShowControlToolBar), 0, AlwaysEnabledFlag, AlwaysEnabledFlag);
+   c->AddCheck(wxT("ShowTransportTB"), _("&Transport Toolbar"), FN(OnShowTransportToolBar), 0, AlwaysEnabledFlag, AlwaysEnabledFlag);
    c->AddCheck(wxT("ShowDeviceTB"), _("&Device Toolbar"), FN(OnShowDeviceToolBar), 0, AlwaysEnabledFlag, AlwaysEnabledFlag);
    c->AddCheck(wxT("ShowEditTB"), _("&Edit Toolbar"), FN(OnShowEditToolBar), 0, AlwaysEnabledFlag, AlwaysEnabledFlag);
    c->AddCheck(wxT("ShowMeterTB"), _("&Meter Toolbar"), FN(OnShowMeterToolBar), 0, AlwaysEnabledFlag, AlwaysEnabledFlag);
@@ -1507,8 +1507,8 @@ void AudacityProject::ModifyToolbarMenus()
       return;
    }
 
-   mCommandManager.Check(wxT("ShowControlTB"),
-                        mToolManager->IsVisible(ControlBarID));
+   mCommandManager.Check(wxT("ShowTransportTB"),
+                         mToolManager->IsVisible(TransportBarID));
    mCommandManager.Check(wxT("ShowDeviceTB"),
                          mToolManager->IsVisible(DeviceBarID));
    mCommandManager.Check(wxT("ShowEditTB"),
@@ -4488,9 +4488,9 @@ void AudacityProject::OnContrast()
 }
 
 
-void AudacityProject::OnShowControlToolBar()
+void AudacityProject::OnShowTransportToolBar()
 {
-   mToolManager->ShowHide( ControlBarID );
+   mToolManager->ShowHide(TransportBarID);
    ModifyToolbarMenus();
 }
 
diff --git a/src/Menus.h b/src/Menus.h
index 04aa8b3a8..a280c505c 100644
--- a/src/Menus.h
+++ b/src/Menus.h
@@ -269,7 +269,7 @@ void OnMixerBoard();
 void OnPlotSpectrum();
 void OnContrast();
 
-void OnShowControlToolBar();
+void OnShowTransportToolBar();
 void OnShowDeviceToolBar();
 void OnShowEditToolBar();
 void OnShowMeterToolBar();
diff --git a/src/Project.cpp b/src/Project.cpp
index f6b9a1d8e..59427f053 100644
--- a/src/Project.cpp
+++ b/src/Project.cpp
@@ -3766,14 +3766,14 @@ void AudacityProject::SkipEnd(bool shift)
 
 
 ////////////////////////////////////////////////////////////
-//  This fetches a pointer to the control toolbar.  It may
+//  This fetches a pointer to the Transport Toolbar.  It may
 //  either be docked or floating out in the open.
 ////////////////////////////////////////////////////////////
 ControlToolBar *AudacityProject::GetControlToolBar()
 {
    return (ControlToolBar *)
           (mToolManager ?
-           mToolManager->GetToolBar(ControlBarID) :
+           mToolManager->GetToolBar(TransportBarID) :
            NULL);
 }
 
diff --git a/src/Project.h b/src/Project.h
index 4f5d1f8f9..a16650a51 100644
--- a/src/Project.h
+++ b/src/Project.h
@@ -333,7 +333,9 @@ class AUDACITY_DLL_API AudacityProject:  public wxFrame,
 
    // ToolBar
 
-   ControlToolBar *GetControlToolBar();
+   // In the GUI, ControlToolBar appears as the "Transport Toolbar". "Control Toolbar" is historic.
+   ControlToolBar *GetControlToolBar(); 
+
    DeviceToolBar *GetDeviceToolBar();
    EditToolBar *GetEditToolBar();
    MeterToolBar *GetMeterToolBar();
diff --git a/src/Screenshot.cpp b/src/Screenshot.cpp
index f20e3f4f7..174f609eb 100644
--- a/src/Screenshot.cpp
+++ b/src/Screenshot.cpp
@@ -69,7 +69,7 @@ class ScreenFrame:public wxFrame
    void OnCaptureToolbars(wxCommandEvent & e);
    void OnCaptureSelectionBar(wxCommandEvent & e);
    void OnCaptureTools(wxCommandEvent & e);
-   void OnCaptureControl(wxCommandEvent & e);
+   void OnCaptureTransport(wxCommandEvent & e);
    void OnCaptureMixer(wxCommandEvent & e);
    void OnCaptureMeter(wxCommandEvent & e);
    void OnCaptureEdit(wxCommandEvent & e);
@@ -179,7 +179,7 @@ enum
    IdCaptureToolbars,
    IdCaptureSelectionBar,
    IdCaptureTools,
-   IdCaptureControl,
+   IdCaptureTransport,
    IdCaptureMixer,
    IdCaptureMeter,
    IdCaptureEdit,
@@ -223,7 +223,7 @@ BEGIN_EVENT_TABLE(ScreenFrame, wxFrame)
    EVT_BUTTON(IdCaptureToolbars,        ScreenFrame::OnCaptureToolbars)
    EVT_BUTTON(IdCaptureSelectionBar,    ScreenFrame::OnCaptureSelectionBar)
    EVT_BUTTON(IdCaptureTools,           ScreenFrame::OnCaptureTools)
-   EVT_BUTTON(IdCaptureControl,         ScreenFrame::OnCaptureControl)
+   EVT_BUTTON(IdCaptureTransport,       ScreenFrame::OnCaptureTransport)
    EVT_BUTTON(IdCaptureMixer,           ScreenFrame::OnCaptureMixer)
    EVT_BUTTON(IdCaptureMeter,           ScreenFrame::OnCaptureMeter)
    EVT_BUTTON(IdCaptureEdit,            ScreenFrame::OnCaptureEdit)
@@ -368,7 +368,7 @@ void ScreenFrame::PopulateOrExchange(ShuttleGui & S)
             S.Id(IdCaptureToolbars).AddButton(_("All Toolbars"));
             S.Id(IdCaptureSelectionBar).AddButton(_("SelectionBar"));
             S.Id(IdCaptureTools).AddButton(_("Tools"));
-            S.Id(IdCaptureControl).AddButton(_("Control"));
+            S.Id(IdCaptureTransport).AddButton(_("Transport"));
          }
          S.EndHorizontalLay();
 
@@ -594,9 +594,9 @@ void ScreenFrame::OnCaptureTools(wxCommandEvent & e)
    DoCapture(wxT("tools"));
 }
 
-void ScreenFrame::OnCaptureControl(wxCommandEvent & e)
+void ScreenFrame::OnCaptureTransport(wxCommandEvent & e)
 {
-   DoCapture(wxT("control"));
+   DoCapture(wxT("transport"));
 }
 
 void ScreenFrame::OnCaptureMixer(wxCommandEvent & e)
diff --git a/src/commands/ScreenshotCommand.cpp b/src/commands/ScreenshotCommand.cpp
index d48c723de..2ab4aaf39 100644
--- a/src/commands/ScreenshotCommand.cpp
+++ b/src/commands/ScreenshotCommand.cpp
@@ -217,7 +217,7 @@ void ScreenshotCommandType::BuildSignature(CommandSignature &signature)
    captureModeValidator->AddOption(wxT("toolbars"));
    captureModeValidator->AddOption(wxT("selectionbar"));
    captureModeValidator->AddOption(wxT("tools"));
-   captureModeValidator->AddOption(wxT("control"));
+   captureModeValidator->AddOption(wxT("transport"));
    captureModeValidator->AddOption(wxT("mixer"));
    captureModeValidator->AddOption(wxT("meter"));
    captureModeValidator->AddOption(wxT("edit"));
@@ -367,9 +367,9 @@ bool ScreenshotCommand::Apply(CommandExecutionContext context)
    {
       CaptureToolbar(context.proj->mToolManager, ToolsBarID, fileName);
    }
-   else if (captureMode.IsSameAs(wxT("control")))
+   else if (captureMode.IsSameAs(wxT("transport")))
    {
-      CaptureToolbar(context.proj->mToolManager, ControlBarID, fileName);
+      CaptureToolbar(context.proj->mToolManager, TransportBarID, fileName);
    }
    else if (captureMode.IsSameAs(wxT("mixer")))
    {
diff --git a/src/prefs/GUIPrefs.cpp b/src/prefs/GUIPrefs.cpp
index 69c640431..5722aa8ee 100644
--- a/src/prefs/GUIPrefs.cpp
+++ b/src/prefs/GUIPrefs.cpp
@@ -84,7 +84,7 @@ void GUIPrefs::PopulateOrExchange(ShuttleGui & S)
 
    S.StartStatic(_("Display"));
    {
-      S.TieCheckBox(_("&Ergonomic order of audio I/O buttons"),
+      S.TieCheckBox(_("&Ergonomic order of Transport Toolbar buttons"),
                     wxT("/GUI/ErgonomicTransportButtons"),
                     true);
       S.TieCheckBox(_("S&how 'How to Get Help' dialog box at program start up"),
diff --git a/src/prefs/ThemePrefs.cpp b/src/prefs/ThemePrefs.cpp
index a35799594..05b91e376 100644
--- a/src/prefs/ThemePrefs.cpp
+++ b/src/prefs/ThemePrefs.cpp
@@ -88,7 +88,7 @@ void ThemePrefs::PopulateOrExchange(ShuttleGui & S)
    S.StartStatic(_("Info"));
    {
       S.AddFixedText(
-         _("Themability is an experimental feature.\n\nTo try it out, click \"Save Theme Cache\" then find and modify the images and colors in\nImageCacheVxx.png using an image editor such as the Gimp.\n\nClick \"Load Theme Cache\" to load the changed images and colors back into Audacity.\n\n(Only the control toolbar and the colors on the wavetrack are currently affected, even\nthough the image file shows other icons too.)")
+         _("Themability is an experimental feature.\n\nTo try it out, click \"Save Theme Cache\" then find and modify the images and colors in\nImageCacheVxx.png using an image editor such as the Gimp.\n\nClick \"Load Theme Cache\" to load the changed images and colors back into Audacity.\n\n(Only the Transport Toolbar and the colors on the wavetrack are currently affected, even\nthough the image file shows other icons too.)")
          );
 
 #ifdef __WXDEBUG__
diff --git a/src/toolbars/ControlToolBar.cpp b/src/toolbars/ControlToolBar.cpp
index 1407721f8..40ab68e91 100644
--- a/src/toolbars/ControlToolBar.cpp
+++ b/src/toolbars/ControlToolBar.cpp
@@ -12,12 +12,14 @@
 *******************************************************************//**
 
 \class ControlToolBar
-\brief A ToolBar that has the main control buttons.
+\brief A ToolBar that has the main Transport buttons.
 
+  In the GUI, this is referred to as "Transport Toolbar", as 
+  it corresponds to commands in the Transport menu. 
+  "Control Toolbar" is historic.
   This class, which is a child of Toolbar, creates the
-  window containing the tool selection (ibeam, envelope,
-  move, zoom), the rewind/play/stop/record/ff buttons, and
-  the volume control. The window can be embedded within a
+  window containing the Transport (rewind/play/stop/record/ff)
+  buttons. The window can be embedded within a
   normal project window, or within a ToolbarFrame that is
   managed by a global ToolBarStub called
   gControlToolBarStub.
@@ -80,7 +82,7 @@ END_EVENT_TABLE()
 
 //Standard constructor
 ControlToolBar::ControlToolBar()
-: ToolBar(ControlBarID, _("Control"), wxT("Control"))
+: ToolBar(TransportBarID, _("Transport"), wxT("Transport"))
 {
    mPaused = false;
    mSizer = NULL;
@@ -240,7 +242,7 @@ void ControlToolBar::UpdatePrefs()
    }
 
    // Set label to pull in language change
-   SetLabel(_("Control"));
+   SetLabel(_("Transport"));
 
    // Give base class a chance
    ToolBar::UpdatePrefs();
diff --git a/src/toolbars/ControlToolBar.h b/src/toolbars/ControlToolBar.h
index 1240ca6e6..bfca86a25 100644
--- a/src/toolbars/ControlToolBar.h
+++ b/src/toolbars/ControlToolBar.h
@@ -28,6 +28,7 @@ class AudacityProject;
 class TrackList;
 class TimeTrack;
 
+// In the GUI, ControlToolBar appears as the "Transport Toolbar". "Control Toolbar" is historic.
 class ControlToolBar:public ToolBar {
 
  public:
diff --git a/src/toolbars/ToolBar.h b/src/toolbars/ToolBar.h
index b4a8a8221..0c8bb57d2 100644
--- a/src/toolbars/ToolBar.h
+++ b/src/toolbars/ToolBar.h
@@ -59,7 +59,7 @@ DECLARE_EXPORTED_EVENT_TYPE(AUDACITY_DLL_API, EVT_TOOLBAR_UPDATED, -1);
 enum
 {
    NoBarID = -1,
-   ControlBarID,
+   TransportBarID,
    ToolsBarID,
    MeterBarID,
    MixerBarID,
diff --git a/src/toolbars/ToolManager.cpp b/src/toolbars/ToolManager.cpp
index 83175deec..fbbe4e234 100644
--- a/src/toolbars/ToolManager.cpp
+++ b/src/toolbars/ToolManager.cpp
@@ -407,7 +407,7 @@ ToolManager::ToolManager( AudacityProject *parent )
 
    // Create all of the toolbars
    mBars[ ToolsBarID ]         = new ToolsToolBar();
-   mBars[ ControlBarID ]       = new ControlToolBar();
+   mBars[ TransportBarID ]       = new ControlToolBar();
    mBars[ MeterBarID ]         = new MeterToolBar();
    mBars[ EditBarID ]          = new EditToolBar();
    mBars[ MixerBarID ]         = new MixerToolBar();
diff --git a/src/toolbars/ToolsToolBar.cpp b/src/toolbars/ToolsToolBar.cpp
index 5b4cbcaef..eb3494431 100644
--- a/src/toolbars/ToolsToolBar.cpp
+++ b/src/toolbars/ToolsToolBar.cpp
@@ -17,8 +17,7 @@
 
   This class, which is a child of Toolbar, creates the
   window containing the tool selection (ibeam, envelope,
-  move, zoom), the rewind/play/stop/record/ff buttons, and
-  the volume control. The window can be embedded within a
+  move, zoom). The window can be embedded within a
   normal project window, or within a ToolbarFrame that is
   managed by a global ToolBarStub called
   gToolsToolBarStub.