diff --git a/gtk2_ardour/midi_cue_automation_line.cc b/gtk2_ardour/pianoroll_automation_line.cc
similarity index 82%
rename from gtk2_ardour/midi_cue_automation_line.cc
rename to gtk2_ardour/pianoroll_automation_line.cc
index 9e6336c468..ce50b8ce7b 100644
--- a/gtk2_ardour/midi_cue_automation_line.cc
+++ b/gtk2_ardour/pianoroll_automation_line.cc
@@ -21,9 +21,9 @@
 #include "editing_context.h"
 #include "editor_drag.h"
 #include "keyboard.h"
-#include "midi_cue_automation_line.h"
+#include "pianoroll_automation_line.h"
 
-MidiCueAutomationLine::MidiCueAutomationLine (const std::string&                      name,
+PianorollAutomationLine::PianorollAutomationLine (const std::string&                      name,
                                               EditingContext&                         ec,
                                               ArdourCanvas::Item&                     parent,
                                               ArdourCanvas::Rectangle*                drag_base,
@@ -32,17 +32,17 @@ MidiCueAutomationLine::MidiCueAutomationLine (const std::string&
 	: AutomationLine (name, ec, parent, drag_base, al, desc)
 {
 	_drag_base->set_data ("line", this);
-	_drag_base->Event.connect (sigc::mem_fun (*this, &MidiCueAutomationLine::base_event_handler));
+	_drag_base->Event.connect (sigc::mem_fun (*this, &PianorollAutomationLine::base_event_handler));
 }
 
 bool
-MidiCueAutomationLine::base_event_handler (GdkEvent* ev)
+PianorollAutomationLine::base_event_handler (GdkEvent* ev)
 {
 	return _editing_context.typed_event  (_drag_base, ev, AutomationTrackItem);
 }
 
 bool
-MidiCueAutomationLine::event_handler (GdkEvent* ev)
+PianorollAutomationLine::event_handler (GdkEvent* ev)
 {
 	return _editing_context.typed_event (line, ev, EditorAutomationLineItem);
 }
diff --git a/gtk2_ardour/midi_cue_automation_line.h b/gtk2_ardour/pianoroll_automation_line.h
similarity index 85%
rename from gtk2_ardour/midi_cue_automation_line.h
rename to gtk2_ardour/pianoroll_automation_line.h
index c079ff66f1..7dee3fb4c6 100644
--- a/gtk2_ardour/midi_cue_automation_line.h
+++ b/gtk2_ardour/pianoroll_automation_line.h
@@ -16,15 +16,15 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#ifndef __gtk2_ardour_midi_cue_automation_line_h__
-#define __gtk2_ardour_midi_cue_automation_line_h__
+#ifndef __gtk2_ardour_pianoroll_automation_line.h__
+#define __gtk2_ardour_pianoroll_automation_line.h__
 
 #include "automation_line.h"
 
-class MidiCueAutomationLine : public AutomationLine
+class PianorollAutomationLine : public AutomationLine
 {
   public:
-	MidiCueAutomationLine (const std::string&                      name,
+	PianorollAutomationLine (const std::string&                      name,
 	                       EditingContext&                         ec,
 	                       ArdourCanvas::Item&                     parent,
 	                       ArdourCanvas::Rectangle*                drag_base,
diff --git a/gtk2_ardour/pianoroll_midi_view.cc b/gtk2_ardour/pianoroll_midi_view.cc
index a55dc28fc7..91a6b33b48 100644
--- a/gtk2_ardour/pianoroll_midi_view.cc
+++ b/gtk2_ardour/pianoroll_midi_view.cc
@@ -33,7 +33,7 @@
 #include "hit.h"
 #include "keyboard.h"
 #include "mergeable_line.h"
-#include "midi_cue_automation_line.h"
+#include "pianoroll_automation_line.h"
 #include "pianoroll_midi_view.h"
 #include "pianoroll_velocity.h"
 #include "note.h"
@@ -364,7 +364,7 @@ PianorollMidiView::update_automation_display (Evoral::Parameter const & param, S
 				return;
 			}
 
-			CueAutomationLine line (new MidiCueAutomationLine (ARDOUR::EventTypeMap::instance().to_symbol (param),
+			CueAutomationLine line (new PianorollAutomationLine (ARDOUR::EventTypeMap::instance().to_symbol (param),
 			                                                   _editing_context,
 			                                                   *automation_group,
 			                                                   automation_group,
diff --git a/gtk2_ardour/pianoroll_midi_view.h b/gtk2_ardour/pianoroll_midi_view.h
index 7e90a01778..df59b4c918 100644
--- a/gtk2_ardour/pianoroll_midi_view.h
+++ b/gtk2_ardour/pianoroll_midi_view.h
@@ -31,7 +31,7 @@
 #include "midi_view.h"
 
 class VelocityDisplay;
-class MidiCueAutomationLine;
+class PianorollAutomationLine;
 
 namespace ArdourCanvas {
 	class Box;
@@ -84,7 +84,7 @@ class PianorollMidiView : public MidiView
 
 	ArdourCanvas::Rectangle* automation_group;
 
-	typedef std::shared_ptr<MidiCueAutomationLine>  CueAutomationLine;
+	typedef std::shared_ptr<PianorollAutomationLine>  CueAutomationLine;
 	typedef std::shared_ptr<ARDOUR::AutomationControl>  CueAutomationControl;
 
 	struct AutomationDisplayState {
diff --git a/gtk2_ardour/wscript b/gtk2_ardour/wscript
index c3c0920aff..04a5b66416 100644
--- a/gtk2_ardour/wscript
+++ b/gtk2_ardour/wscript
@@ -158,7 +158,6 @@ gtk2_ardour_sources = [
         'midi_automation_line.cc',
         'midi_channel_dialog.cc',
         'midi_channel_selector.cc',
-        'midi_cue_automation_line.cc',
         'midi_cut_buffer.cc',
         'midi_export_dialog.cc',
         'midi_list_editor.cc',
@@ -207,6 +206,7 @@ gtk2_ardour_sources = [
         'piano_key_bindings.cc',
         'piano_roll_header.cc',
         'pianoroll.cc',
+        'pianoroll_automation_line.cc',
         'pianoroll_background.cc',
         'pianoroll_velocity.cc',
         'pianoroll_midi_view.cc',