diff --git a/src/tracks/labeltrack/ui/LabelTrackControls.cpp b/src/tracks/labeltrack/ui/LabelTrackControls.cpp
index 6aa164102..689923615 100644
--- a/src/tracks/labeltrack/ui/LabelTrackControls.cpp
+++ b/src/tracks/labeltrack/ui/LabelTrackControls.cpp
@@ -37,7 +37,9 @@ std::vector<UIHandlePtr> LabelTrackControls::HitTest
 
 class LabelTrackMenuTable : public PopupMenuTable
 {
-   LabelTrackMenuTable() : mpData(NULL) {}
+   LabelTrackMenuTable()
+      : PopupMenuTable{ "LabelTrack" }
+   {}
    DECLARE_POPUP_MENU(LabelTrackMenuTable);
 
 public:
@@ -53,7 +55,7 @@ public:
       mpData = nullptr;
    }
 
-   CommonTrackControls::InitMenuData *mpData;
+   CommonTrackControls::InitMenuData *mpData{};
 
    void OnSetFont(wxCommandEvent &);
 };
diff --git a/src/tracks/playabletrack/notetrack/ui/NoteTrackControls.cpp b/src/tracks/playabletrack/notetrack/ui/NoteTrackControls.cpp
index b0c6955ae..8591bec57 100644
--- a/src/tracks/playabletrack/notetrack/ui/NoteTrackControls.cpp
+++ b/src/tracks/playabletrack/notetrack/ui/NoteTrackControls.cpp
@@ -78,7 +78,9 @@ std::vector<UIHandlePtr> NoteTrackControls::HitTest
 
 class NoteTrackMenuTable : public PopupMenuTable
 {
-   NoteTrackMenuTable() : mpData(NULL) {}
+   NoteTrackMenuTable()
+      : PopupMenuTable{ "NoteTrack" }
+   {}
    DECLARE_POPUP_MENU(NoteTrackMenuTable);
 
 public:
@@ -95,7 +97,7 @@ private:
       mpData = nullptr;
    }
 
-   NoteTrackControlsBase::InitMenuData *mpData;
+   NoteTrackControlsBase::InitMenuData *mpData{};
 
    void OnChangeOctave(wxCommandEvent &);
 };
diff --git a/src/tracks/playabletrack/notetrack/ui/NoteTrackVZoomHandle.cpp b/src/tracks/playabletrack/notetrack/ui/NoteTrackVZoomHandle.cpp
index f7123328e..0161199f1 100644
--- a/src/tracks/playabletrack/notetrack/ui/NoteTrackVZoomHandle.cpp
+++ b/src/tracks/playabletrack/notetrack/ui/NoteTrackVZoomHandle.cpp
@@ -167,7 +167,9 @@ enum {
 
 class NoteTrackVRulerMenuTable : public PopupMenuTable
 {
-   NoteTrackVRulerMenuTable(){};
+   NoteTrackVRulerMenuTable()
+      : PopupMenuTable{ "NoteTrackVRuler" }
+   {};
    virtual ~NoteTrackVRulerMenuTable() {}
    DECLARE_POPUP_MENU(NoteTrackVRulerMenuTable);
 
diff --git a/src/tracks/playabletrack/wavetrack/ui/SpectrumVZoomHandle.h b/src/tracks/playabletrack/wavetrack/ui/SpectrumVZoomHandle.h
index b050746a1..8fa691b54 100644
--- a/src/tracks/playabletrack/wavetrack/ui/SpectrumVZoomHandle.h
+++ b/src/tracks/playabletrack/wavetrack/ui/SpectrumVZoomHandle.h
@@ -75,7 +75,9 @@ private:
 
 class SpectrumVRulerMenuTable : public WaveTrackVRulerMenuTable
 {
-   SpectrumVRulerMenuTable() : WaveTrackVRulerMenuTable() {}
+   SpectrumVRulerMenuTable()
+      : WaveTrackVRulerMenuTable{ "SpectrumVRuler" }
+   {}
    virtual ~SpectrumVRulerMenuTable() {}
    DECLARE_POPUP_MENU(SpectrumVRulerMenuTable);
 
diff --git a/src/tracks/playabletrack/wavetrack/ui/WaveTrackControls.cpp b/src/tracks/playabletrack/wavetrack/ui/WaveTrackControls.cpp
index 5a23de205..2a451142e 100644
--- a/src/tracks/playabletrack/wavetrack/ui/WaveTrackControls.cpp
+++ b/src/tracks/playabletrack/wavetrack/ui/WaveTrackControls.cpp
@@ -153,7 +153,7 @@ enum {
 class WaveColorMenuTable : public PopupMenuTable
 {
    WaveColorMenuTable()
-      : PopupMenuTable( XO("&Wave Color") )
+      : PopupMenuTable( "WaveColor", XO("&Wave Color") )
    {}
    DECLARE_POPUP_MENU(WaveColorMenuTable);
 
@@ -252,7 +252,7 @@ void WaveColorMenuTable::OnWaveColorChange(wxCommandEvent & event)
 class FormatMenuTable : public PopupMenuTable
 {
    FormatMenuTable()
-      : PopupMenuTable{ XO("&Format") }
+      : PopupMenuTable{ "SampleFormat", XO("&Format") }
    {}
    DECLARE_POPUP_MENU(FormatMenuTable);
 
@@ -375,7 +375,7 @@ void FormatMenuTable::OnFormatChange(wxCommandEvent & event)
 class RateMenuTable : public PopupMenuTable
 {
    RateMenuTable()
-      : PopupMenuTable{ XO("Rat&e") }
+      : PopupMenuTable{ "SampleRate", XO("Rat&e") }
    {}
    DECLARE_POPUP_MENU(RateMenuTable);
 
@@ -577,10 +577,12 @@ class WaveTrackMenuTable : public PopupMenuTable
 {
 public:
    static WaveTrackMenuTable &Instance( Track * pTrack);
-   Track * mpTrack;
+   Track * mpTrack{};
 
 protected:
-   WaveTrackMenuTable() : mpData(NULL) {mpTrack=NULL;}
+   WaveTrackMenuTable()
+      : PopupMenuTable{ "WaveTrack" }
+   {}
 
    void InitUserData(void *pUserData) override;
    void InitMenu(wxMenu *pMenu) override;
@@ -592,7 +594,7 @@ protected:
 
    DECLARE_POPUP_MENU(WaveTrackMenuTable);
 
-   PlayableTrackControls::InitMenuData *mpData;
+   PlayableTrackControls::InitMenuData *mpData{};
 
    void OnMultiView(wxCommandEvent & event);
    void OnSetDisplay(wxCommandEvent & event);
diff --git a/src/tracks/playabletrack/wavetrack/ui/WaveTrackVZoomHandle.h b/src/tracks/playabletrack/wavetrack/ui/WaveTrackVZoomHandle.h
index c6e72e6a3..28cf03f06 100644
--- a/src/tracks/playabletrack/wavetrack/ui/WaveTrackVZoomHandle.h
+++ b/src/tracks/playabletrack/wavetrack/ui/WaveTrackVZoomHandle.h
@@ -68,7 +68,9 @@ public:
    };
 
 protected:
-   WaveTrackVRulerMenuTable() {}
+   WaveTrackVRulerMenuTable( const Identifier &id )
+      : PopupMenuTable{ id }
+   {}
 
    void InitUserData(void *pUserData) override;
 
diff --git a/src/tracks/playabletrack/wavetrack/ui/WaveformVZoomHandle.h b/src/tracks/playabletrack/wavetrack/ui/WaveformVZoomHandle.h
index 18db429a7..15fb7ada2 100644
--- a/src/tracks/playabletrack/wavetrack/ui/WaveformVZoomHandle.h
+++ b/src/tracks/playabletrack/wavetrack/ui/WaveformVZoomHandle.h
@@ -75,7 +75,9 @@ private:
 
 class WaveformVRulerMenuTable : public WaveTrackVRulerMenuTable
 {
-   WaveformVRulerMenuTable() : WaveTrackVRulerMenuTable() {}
+   WaveformVRulerMenuTable()
+      : WaveTrackVRulerMenuTable{ "WaveFormVRuler" }
+   {}
    virtual ~WaveformVRulerMenuTable() {}
    DECLARE_POPUP_MENU(WaveformVRulerMenuTable);
 
diff --git a/src/tracks/timetrack/ui/TimeTrackControls.cpp b/src/tracks/timetrack/ui/TimeTrackControls.cpp
index d637f607b..608d42d51 100644
--- a/src/tracks/timetrack/ui/TimeTrackControls.cpp
+++ b/src/tracks/timetrack/ui/TimeTrackControls.cpp
@@ -40,7 +40,9 @@ enum
 
 class TimeTrackMenuTable : public PopupMenuTable
 {
-   TimeTrackMenuTable() : mpData(NULL) {}
+   TimeTrackMenuTable()
+      : PopupMenuTable{ "TimeTrack" }
+   {}
    DECLARE_POPUP_MENU(TimeTrackMenuTable);
 
 public:
@@ -68,7 +70,7 @@ private:
       mpData = nullptr;
    }
 
-   CommonTrackControls::InitMenuData *mpData;
+   CommonTrackControls::InitMenuData *mpData{};
 
    void OnSetTimeTrackRange(wxCommandEvent & /*event*/);
    void OnTimeTrackLin(wxCommandEvent & /*event*/);
diff --git a/src/tracks/ui/CommonTrackControls.cpp b/src/tracks/ui/CommonTrackControls.cpp
index e7fb9f73a..b92c5a056 100644
--- a/src/tracks/ui/CommonTrackControls.cpp
+++ b/src/tracks/ui/CommonTrackControls.cpp
@@ -80,7 +80,9 @@ enum
 
 class TrackMenuTable : public PopupMenuTable
 {
-   TrackMenuTable() : mpData(NULL) {}
+   TrackMenuTable()
+      : PopupMenuTable{ "Track" }
+   {}
    DECLARE_POPUP_MENU(TrackMenuTable);
 
 public:
@@ -98,7 +100,7 @@ private:
       mpData = nullptr;
    }
 
-   CommonTrackControls::InitMenuData *mpData;
+   CommonTrackControls::InitMenuData *mpData{};
 };
 
 TrackMenuTable &TrackMenuTable::Instance()
diff --git a/src/widgets/PopupMenuTable.h b/src/widgets/PopupMenuTable.h
index c148f85c2..35b1a1c73 100644
--- a/src/widgets/PopupMenuTable.h
+++ b/src/widgets/PopupMenuTable.h
@@ -58,7 +58,7 @@ public:
    using Entry = PopupMenuTableEntry;
 
    // Supply a nonempty caption for sub-menu tables
-   PopupMenuTable( const TranslatableString &caption = {} )
+   PopupMenuTable( const Identifier &id, const TranslatableString &caption = {} )
       : mCaption{ caption }
    {}