diff --git a/libs/ardour/ardour/automation_event.h b/libs/ardour/ardour/automation_event.h
index b8213efc36..fb4aa52ec2 100644
--- a/libs/ardour/ardour/automation_event.h
+++ b/libs/ardour/ardour/automation_event.h
@@ -72,8 +72,8 @@ class AutomationList : public PBD::StatefulDestructible
 	AutomationList& operator= (const AutomationList&);
 	bool operator== (const AutomationList&);
 
-	Parameter parameter() const         { return _param_id; }
-	void    set_param_id(Parameter id) { _param_id = id; }
+	Parameter parameter() const          { return _parameter; }
+	void      set_parameter(Parameter p) { _parameter = p; }
 
 	void freeze();
 	void thaw ();
@@ -232,7 +232,7 @@ class AutomationList : public PBD::StatefulDestructible
 
 	mutable LookupCache _lookup_cache;
 	
-	Parameter             _param_id;
+	Parameter           _parameter;
 	EventList           _events;
 	mutable Glib::Mutex _lock;
 	int8_t              _frozen;
diff --git a/libs/ardour/automatable.cc b/libs/ardour/automatable.cc
index 14bccba056..5b30877edc 100644
--- a/libs/ardour/automatable.cc
+++ b/libs/ardour/automatable.cc
@@ -294,7 +294,7 @@ Automatable::set_automation_state (const XMLNode& node, Parameter legacy_param)
 			if (!id_prop) {
 				warning << "AutomationList node without automation-id property, "
 					<< "using default: " << legacy_param.to_string() << endmsg;
-				al->set_param_id(legacy_param);
+				al->set_parameter(legacy_param);
 			}
 
 			boost::shared_ptr<AutomationControl> existing = control(param);
diff --git a/libs/ardour/automation_event.cc b/libs/ardour/automation_event.cc
index b7a4bc0399..09e4a926e8 100644
--- a/libs/ardour/automation_event.cc
+++ b/libs/ardour/automation_event.cc
@@ -55,10 +55,10 @@ static void dumpit (const AutomationList& al, string prefix = "")
 #endif
 
 AutomationList::AutomationList (Parameter id, double min_val, double max_val, double default_val)
-	: _param_id(id)
+	: _parameter(id)
 	, _curve(new Curve(*this))
 {	
-	_param_id = id;
+	_parameter = id;
 	_frozen = 0;
 	_changed_when_thawed = false;
 	_state = Off;
@@ -73,12 +73,12 @@ AutomationList::AutomationList (Parameter id, double min_val, double max_val, do
 	_lookup_cache.range.first = _events.end();
 	_sort_pending = false;
 
-	assert(_param_id.type() != NullAutomation);
+	assert(_parameter.type() != NullAutomation);
 	AutomationListCreated(this);
 }
 
 AutomationList::AutomationList (const AutomationList& other)
-	: _param_id(other._param_id)
+	: _parameter(other._parameter)
 	, _curve(new Curve(*this))
 {
 	_frozen = 0;
@@ -100,12 +100,12 @@ AutomationList::AutomationList (const AutomationList& other)
 	}
 
 	mark_dirty ();
-	assert(_param_id.type() != NullAutomation);
+	assert(_parameter.type() != NullAutomation);
 	AutomationListCreated(this);
 }
 
 AutomationList::AutomationList (const AutomationList& other, double start, double end)
-	: _param_id(other._param_id)
+	: _parameter(other._parameter)
 	, _curve(new Curve(*this))
 {
 	_frozen = 0;
@@ -136,7 +136,7 @@ AutomationList::AutomationList (const AutomationList& other, double start, doubl
 
 	mark_dirty ();
 
-	assert(_param_id.type() != NullAutomation);
+	assert(_parameter.type() != NullAutomation);
 	AutomationListCreated(this);
 }
 
@@ -162,9 +162,9 @@ AutomationList::AutomationList (const XMLNode& node, Parameter id)
 	set_state (node);
 
 	if (id)
-		_param_id = id;
+		_parameter = id;
 
-	assert(_param_id.type() != NullAutomation);
+	assert(_parameter.type() != NullAutomation);
 	AutomationListCreated(this);
 }
 
@@ -1010,7 +1010,7 @@ AutomationList::multipoint_eval (double x) const
 AutomationList*
 AutomationList::cut (iterator start, iterator end)
 {
-	AutomationList* nal = new AutomationList (_param_id, _min_yval, _max_yval, _default_value);
+	AutomationList* nal = new AutomationList (_parameter, _min_yval, _max_yval, _default_value);
 
 	{
 		Glib::Mutex::Lock lm (_lock);
@@ -1040,7 +1040,7 @@ AutomationList::cut (iterator start, iterator end)
 AutomationList*
 AutomationList::cut_copy_clear (double start, double end, int op)
 {
-	AutomationList* nal = new AutomationList (_param_id, _min_yval, _max_yval, _default_value);
+	AutomationList* nal = new AutomationList (_parameter, _min_yval, _max_yval, _default_value);
 	iterator s, e;
 	ControlEvent cp (start, 0.0);
 	TimeComparator cmp;
@@ -1103,7 +1103,7 @@ AutomationList::cut_copy_clear (double start, double end, int op)
 AutomationList*
 AutomationList::copy (iterator start, iterator end)
 {
-	AutomationList* nal = new AutomationList (_param_id, _min_yval, _max_yval, _default_value);
+	AutomationList* nal = new AutomationList (_parameter, _min_yval, _max_yval, _default_value);
 
 	{
 		Glib::Mutex::Lock lm (_lock);
@@ -1202,7 +1202,7 @@ AutomationList::state (bool full)
 	char buf[64];
 	LocaleGuard lg (X_("POSIX"));
 
-	root->add_property ("automation-id", _param_id.to_string());
+	root->add_property ("automation-id", _parameter.to_string());
 
 	root->add_property ("id", _id.to_s());
 
@@ -1368,7 +1368,7 @@ AutomationList::set_state (const XMLNode& node)
 	}
 	
 	if ((prop = node.property (X_("automation-id"))) != 0){ 
-		_param_id = Parameter(prop->value());
+		_parameter = Parameter(prop->value());
 	} else {
 		warning << "Legacy session: automation list has no automation-id property.";
 	}