diff --git a/cts/scheduler/dot/colocation_constraint_stops_promoted.dot b/cts/scheduler/dot/colocation_constraint_stops_promoted.dot
index 9d30140ae4..2111435c90 100644
--- a/cts/scheduler/dot/colocation_constraint_stops_promoted.dot
+++ b/cts/scheduler/dot/colocation_constraint_stops_promoted.dot
@@ -1,46 +1,46 @@
  digraph "g" {
-"MASTER_RSC_A_confirmed-post_notify_demoted_0" -> "MASTER_RSC_A_pre_notify_stop_0" [ style = bold]
-"MASTER_RSC_A_confirmed-post_notify_demoted_0" [ style=bold color="green" fontcolor="orange"]
-"MASTER_RSC_A_confirmed-post_notify_stopped_0" [ style=bold color="green" fontcolor="orange"]
-"MASTER_RSC_A_confirmed-pre_notify_demote_0" -> "MASTER_RSC_A_demote_0" [ style = bold]
-"MASTER_RSC_A_confirmed-pre_notify_demote_0" -> "MASTER_RSC_A_post_notify_demoted_0" [ style = bold]
-"MASTER_RSC_A_confirmed-pre_notify_demote_0" [ style=bold color="green" fontcolor="orange"]
-"MASTER_RSC_A_confirmed-pre_notify_stop_0" -> "MASTER_RSC_A_post_notify_stopped_0" [ style = bold]
-"MASTER_RSC_A_confirmed-pre_notify_stop_0" -> "MASTER_RSC_A_stop_0" [ style = bold]
-"MASTER_RSC_A_confirmed-pre_notify_stop_0" [ style=bold color="green" fontcolor="orange"]
-"MASTER_RSC_A_demote_0" -> "MASTER_RSC_A_demoted_0" [ style = bold]
-"MASTER_RSC_A_demote_0" -> "NATIVE_RSC_A:0_demote_0 fc16-builder" [ style = bold]
-"MASTER_RSC_A_demote_0" [ style=bold color="green" fontcolor="orange"]
-"MASTER_RSC_A_demoted_0" -> "MASTER_RSC_A_post_notify_demoted_0" [ style = bold]
-"MASTER_RSC_A_demoted_0" -> "MASTER_RSC_A_stop_0" [ style = bold]
-"MASTER_RSC_A_demoted_0" [ style=bold color="green" fontcolor="orange"]
-"MASTER_RSC_A_post_notify_demoted_0" -> "MASTER_RSC_A_confirmed-post_notify_demoted_0" [ style = bold]
-"MASTER_RSC_A_post_notify_demoted_0" -> "NATIVE_RSC_A:0_post_notify_demote_0 fc16-builder" [ style = bold]
-"MASTER_RSC_A_post_notify_demoted_0" [ style=bold color="green" fontcolor="orange"]
-"MASTER_RSC_A_post_notify_stopped_0" -> "MASTER_RSC_A_confirmed-post_notify_stopped_0" [ style = bold]
-"MASTER_RSC_A_post_notify_stopped_0" [ style=bold color="green" fontcolor="orange"]
-"MASTER_RSC_A_pre_notify_demote_0" -> "MASTER_RSC_A_confirmed-pre_notify_demote_0" [ style = bold]
-"MASTER_RSC_A_pre_notify_demote_0" -> "NATIVE_RSC_A:0_pre_notify_demote_0 fc16-builder" [ style = bold]
-"MASTER_RSC_A_pre_notify_demote_0" [ style=bold color="green" fontcolor="orange"]
-"MASTER_RSC_A_pre_notify_stop_0" -> "MASTER_RSC_A_confirmed-pre_notify_stop_0" [ style = bold]
-"MASTER_RSC_A_pre_notify_stop_0" -> "NATIVE_RSC_A:0_pre_notify_stop_0 fc16-builder" [ style = bold]
-"MASTER_RSC_A_pre_notify_stop_0" [ style=bold color="green" fontcolor="orange"]
-"MASTER_RSC_A_stop_0" -> "MASTER_RSC_A_stopped_0" [ style = bold]
-"MASTER_RSC_A_stop_0" -> "NATIVE_RSC_A:0_stop_0 fc16-builder" [ style = bold]
-"MASTER_RSC_A_stop_0" [ style=bold color="green" fontcolor="orange"]
-"MASTER_RSC_A_stopped_0" -> "MASTER_RSC_A_post_notify_stopped_0" [ style = bold]
-"MASTER_RSC_A_stopped_0" [ style=bold color="green" fontcolor="orange"]
 "NATIVE_RSC_A:0_delete_0 fc16-builder2" [ style=bold color="green" fontcolor="black"]
-"NATIVE_RSC_A:0_demote_0 fc16-builder" -> "MASTER_RSC_A_demoted_0" [ style = bold]
 "NATIVE_RSC_A:0_demote_0 fc16-builder" -> "NATIVE_RSC_A:0_stop_0 fc16-builder" [ style = bold]
+"NATIVE_RSC_A:0_demote_0 fc16-builder" -> "PROMOTABLE_RSC_A_demoted_0" [ style = bold]
 "NATIVE_RSC_A:0_demote_0 fc16-builder" [ style=bold color="green" fontcolor="black"]
-"NATIVE_RSC_A:0_post_notify_demote_0 fc16-builder" -> "MASTER_RSC_A_confirmed-post_notify_demoted_0" [ style = bold]
+"NATIVE_RSC_A:0_post_notify_demote_0 fc16-builder" -> "PROMOTABLE_RSC_A_confirmed-post_notify_demoted_0" [ style = bold]
 "NATIVE_RSC_A:0_post_notify_demote_0 fc16-builder" [ style=bold color="green" fontcolor="black"]
-"NATIVE_RSC_A:0_pre_notify_demote_0 fc16-builder" -> "MASTER_RSC_A_confirmed-pre_notify_demote_0" [ style = bold]
+"NATIVE_RSC_A:0_pre_notify_demote_0 fc16-builder" -> "PROMOTABLE_RSC_A_confirmed-pre_notify_demote_0" [ style = bold]
 "NATIVE_RSC_A:0_pre_notify_demote_0 fc16-builder" [ style=bold color="green" fontcolor="black"]
-"NATIVE_RSC_A:0_pre_notify_stop_0 fc16-builder" -> "MASTER_RSC_A_confirmed-pre_notify_stop_0" [ style = bold]
+"NATIVE_RSC_A:0_pre_notify_stop_0 fc16-builder" -> "PROMOTABLE_RSC_A_confirmed-pre_notify_stop_0" [ style = bold]
 "NATIVE_RSC_A:0_pre_notify_stop_0 fc16-builder" [ style=bold color="green" fontcolor="black"]
-"NATIVE_RSC_A:0_stop_0 fc16-builder" -> "MASTER_RSC_A_stopped_0" [ style = bold]
 "NATIVE_RSC_A:0_stop_0 fc16-builder" -> "NATIVE_RSC_A:0_delete_0 fc16-builder2" [ style = bold]
+"NATIVE_RSC_A:0_stop_0 fc16-builder" -> "PROMOTABLE_RSC_A_stopped_0" [ style = bold]
 "NATIVE_RSC_A:0_stop_0 fc16-builder" [ style=bold color="green" fontcolor="black"]
+"PROMOTABLE_RSC_A_confirmed-post_notify_demoted_0" -> "PROMOTABLE_RSC_A_pre_notify_stop_0" [ style = bold]
+"PROMOTABLE_RSC_A_confirmed-post_notify_demoted_0" [ style=bold color="green" fontcolor="orange"]
+"PROMOTABLE_RSC_A_confirmed-post_notify_stopped_0" [ style=bold color="green" fontcolor="orange"]
+"PROMOTABLE_RSC_A_confirmed-pre_notify_demote_0" -> "PROMOTABLE_RSC_A_demote_0" [ style = bold]
+"PROMOTABLE_RSC_A_confirmed-pre_notify_demote_0" -> "PROMOTABLE_RSC_A_post_notify_demoted_0" [ style = bold]
+"PROMOTABLE_RSC_A_confirmed-pre_notify_demote_0" [ style=bold color="green" fontcolor="orange"]
+"PROMOTABLE_RSC_A_confirmed-pre_notify_stop_0" -> "PROMOTABLE_RSC_A_post_notify_stopped_0" [ style = bold]
+"PROMOTABLE_RSC_A_confirmed-pre_notify_stop_0" -> "PROMOTABLE_RSC_A_stop_0" [ style = bold]
+"PROMOTABLE_RSC_A_confirmed-pre_notify_stop_0" [ style=bold color="green" fontcolor="orange"]
+"PROMOTABLE_RSC_A_demote_0" -> "NATIVE_RSC_A:0_demote_0 fc16-builder" [ style = bold]
+"PROMOTABLE_RSC_A_demote_0" -> "PROMOTABLE_RSC_A_demoted_0" [ style = bold]
+"PROMOTABLE_RSC_A_demote_0" [ style=bold color="green" fontcolor="orange"]
+"PROMOTABLE_RSC_A_demoted_0" -> "PROMOTABLE_RSC_A_post_notify_demoted_0" [ style = bold]
+"PROMOTABLE_RSC_A_demoted_0" -> "PROMOTABLE_RSC_A_stop_0" [ style = bold]
+"PROMOTABLE_RSC_A_demoted_0" [ style=bold color="green" fontcolor="orange"]
+"PROMOTABLE_RSC_A_post_notify_demoted_0" -> "NATIVE_RSC_A:0_post_notify_demote_0 fc16-builder" [ style = bold]
+"PROMOTABLE_RSC_A_post_notify_demoted_0" -> "PROMOTABLE_RSC_A_confirmed-post_notify_demoted_0" [ style = bold]
+"PROMOTABLE_RSC_A_post_notify_demoted_0" [ style=bold color="green" fontcolor="orange"]
+"PROMOTABLE_RSC_A_post_notify_stopped_0" -> "PROMOTABLE_RSC_A_confirmed-post_notify_stopped_0" [ style = bold]
+"PROMOTABLE_RSC_A_post_notify_stopped_0" [ style=bold color="green" fontcolor="orange"]
+"PROMOTABLE_RSC_A_pre_notify_demote_0" -> "NATIVE_RSC_A:0_pre_notify_demote_0 fc16-builder" [ style = bold]
+"PROMOTABLE_RSC_A_pre_notify_demote_0" -> "PROMOTABLE_RSC_A_confirmed-pre_notify_demote_0" [ style = bold]
+"PROMOTABLE_RSC_A_pre_notify_demote_0" [ style=bold color="green" fontcolor="orange"]
+"PROMOTABLE_RSC_A_pre_notify_stop_0" -> "NATIVE_RSC_A:0_pre_notify_stop_0 fc16-builder" [ style = bold]
+"PROMOTABLE_RSC_A_pre_notify_stop_0" -> "PROMOTABLE_RSC_A_confirmed-pre_notify_stop_0" [ style = bold]
+"PROMOTABLE_RSC_A_pre_notify_stop_0" [ style=bold color="green" fontcolor="orange"]
+"PROMOTABLE_RSC_A_stop_0" -> "NATIVE_RSC_A:0_stop_0 fc16-builder" [ style = bold]
+"PROMOTABLE_RSC_A_stop_0" -> "PROMOTABLE_RSC_A_stopped_0" [ style = bold]
+"PROMOTABLE_RSC_A_stop_0" [ style=bold color="green" fontcolor="orange"]
+"PROMOTABLE_RSC_A_stopped_0" -> "PROMOTABLE_RSC_A_post_notify_stopped_0" [ style = bold]
+"PROMOTABLE_RSC_A_stopped_0" [ style=bold color="green" fontcolor="orange"]
 }
diff --git a/cts/scheduler/dot/colocation_constraint_stops_unpromoted.dot b/cts/scheduler/dot/colocation_constraint_stops_unpromoted.dot
index 046c126ea2..88a7a1652f 100644
--- a/cts/scheduler/dot/colocation_constraint_stops_unpromoted.dot
+++ b/cts/scheduler/dot/colocation_constraint_stops_unpromoted.dot
@@ -1,21 +1,21 @@
  digraph "g" {
-"MASTER_RSC_A_confirmed-post_notify_stopped_0" [ style=bold color="green" fontcolor="orange"]
-"MASTER_RSC_A_confirmed-pre_notify_stop_0" -> "MASTER_RSC_A_post_notify_stopped_0" [ style = bold]
-"MASTER_RSC_A_confirmed-pre_notify_stop_0" -> "MASTER_RSC_A_stop_0" [ style = bold]
-"MASTER_RSC_A_confirmed-pre_notify_stop_0" [ style=bold color="green" fontcolor="orange"]
-"MASTER_RSC_A_post_notify_stopped_0" -> "MASTER_RSC_A_confirmed-post_notify_stopped_0" [ style = bold]
-"MASTER_RSC_A_post_notify_stopped_0" [ style=bold color="green" fontcolor="orange"]
-"MASTER_RSC_A_pre_notify_stop_0" -> "MASTER_RSC_A_confirmed-pre_notify_stop_0" [ style = bold]
-"MASTER_RSC_A_pre_notify_stop_0" -> "NATIVE_RSC_A:0_pre_notify_stop_0 fc16-builder" [ style = bold]
-"MASTER_RSC_A_pre_notify_stop_0" [ style=bold color="green" fontcolor="orange"]
-"MASTER_RSC_A_stop_0" -> "MASTER_RSC_A_stopped_0" [ style = bold]
-"MASTER_RSC_A_stop_0" -> "NATIVE_RSC_A:0_stop_0 fc16-builder" [ style = bold]
-"MASTER_RSC_A_stop_0" [ style=bold color="green" fontcolor="orange"]
-"MASTER_RSC_A_stopped_0" -> "MASTER_RSC_A_post_notify_stopped_0" [ style = bold]
-"MASTER_RSC_A_stopped_0" [ style=bold color="green" fontcolor="orange"]
-"NATIVE_RSC_A:0_pre_notify_stop_0 fc16-builder" -> "MASTER_RSC_A_confirmed-pre_notify_stop_0" [ style = bold]
+"NATIVE_RSC_A:0_pre_notify_stop_0 fc16-builder" -> "PROMOTABLE_RSC_A_confirmed-pre_notify_stop_0" [ style = bold]
 "NATIVE_RSC_A:0_pre_notify_stop_0 fc16-builder" [ style=bold color="green" fontcolor="black"]
-"NATIVE_RSC_A:0_stop_0 fc16-builder" -> "MASTER_RSC_A_stopped_0" [ style = bold]
+"NATIVE_RSC_A:0_stop_0 fc16-builder" -> "PROMOTABLE_RSC_A_stopped_0" [ style = bold]
 "NATIVE_RSC_A:0_stop_0 fc16-builder" [ style=bold color="green" fontcolor="black"]
 "NATIVE_RSC_B_stop_0 fc16-builder" [ style=bold color="green" fontcolor="black"]
+"PROMOTABLE_RSC_A_confirmed-post_notify_stopped_0" [ style=bold color="green" fontcolor="orange"]
+"PROMOTABLE_RSC_A_confirmed-pre_notify_stop_0" -> "PROMOTABLE_RSC_A_post_notify_stopped_0" [ style = bold]
+"PROMOTABLE_RSC_A_confirmed-pre_notify_stop_0" -> "PROMOTABLE_RSC_A_stop_0" [ style = bold]
+"PROMOTABLE_RSC_A_confirmed-pre_notify_stop_0" [ style=bold color="green" fontcolor="orange"]
+"PROMOTABLE_RSC_A_post_notify_stopped_0" -> "PROMOTABLE_RSC_A_confirmed-post_notify_stopped_0" [ style = bold]
+"PROMOTABLE_RSC_A_post_notify_stopped_0" [ style=bold color="green" fontcolor="orange"]
+"PROMOTABLE_RSC_A_pre_notify_stop_0" -> "NATIVE_RSC_A:0_pre_notify_stop_0 fc16-builder" [ style = bold]
+"PROMOTABLE_RSC_A_pre_notify_stop_0" -> "PROMOTABLE_RSC_A_confirmed-pre_notify_stop_0" [ style = bold]
+"PROMOTABLE_RSC_A_pre_notify_stop_0" [ style=bold color="green" fontcolor="orange"]
+"PROMOTABLE_RSC_A_stop_0" -> "NATIVE_RSC_A:0_stop_0 fc16-builder" [ style = bold]
+"PROMOTABLE_RSC_A_stop_0" -> "PROMOTABLE_RSC_A_stopped_0" [ style = bold]
+"PROMOTABLE_RSC_A_stop_0" [ style=bold color="green" fontcolor="orange"]
+"PROMOTABLE_RSC_A_stopped_0" -> "PROMOTABLE_RSC_A_post_notify_stopped_0" [ style = bold]
+"PROMOTABLE_RSC_A_stopped_0" [ style=bold color="green" fontcolor="orange"]
 }
diff --git a/cts/scheduler/dot/order_constraint_stops_promoted.dot b/cts/scheduler/dot/order_constraint_stops_promoted.dot
index 3a2e536729..0a254e316a 100644
--- a/cts/scheduler/dot/order_constraint_stops_promoted.dot
+++ b/cts/scheduler/dot/order_constraint_stops_promoted.dot
@@ -1,75 +1,75 @@
  digraph "g" {
-"MASTER_RSC_A_confirmed-post_notify_demoted_0" -> "MASTER_RSC_A_pre_notify_start_0" [ style = dashed]
-"MASTER_RSC_A_confirmed-post_notify_demoted_0" -> "MASTER_RSC_A_pre_notify_stop_0" [ style = bold]
-"MASTER_RSC_A_confirmed-post_notify_demoted_0" -> "NATIVE_RSC_A:0_monitor_20000 fc16-builder" [ style = dashed]
-"MASTER_RSC_A_confirmed-post_notify_demoted_0" [ style=bold color="green" fontcolor="orange"]
-"MASTER_RSC_A_confirmed-post_notify_running_0" [ style=dashed color="red" fontcolor="orange"]
-"MASTER_RSC_A_confirmed-post_notify_stopped_0" -> "MASTER_RSC_A_pre_notify_start_0" [ style = dashed]
-"MASTER_RSC_A_confirmed-post_notify_stopped_0" -> "NATIVE_RSC_B_stop_0 fc16-builder2" [ style = bold]
-"MASTER_RSC_A_confirmed-post_notify_stopped_0" [ style=bold color="green" fontcolor="orange"]
-"MASTER_RSC_A_confirmed-pre_notify_demote_0" -> "MASTER_RSC_A_demote_0" [ style = bold]
-"MASTER_RSC_A_confirmed-pre_notify_demote_0" -> "MASTER_RSC_A_post_notify_demoted_0" [ style = bold]
-"MASTER_RSC_A_confirmed-pre_notify_demote_0" [ style=bold color="green" fontcolor="orange"]
-"MASTER_RSC_A_confirmed-pre_notify_start_0" -> "MASTER_RSC_A_post_notify_running_0" [ style = dashed]
-"MASTER_RSC_A_confirmed-pre_notify_start_0" -> "MASTER_RSC_A_start_0" [ style = dashed]
-"MASTER_RSC_A_confirmed-pre_notify_start_0" [ style=dashed color="red" fontcolor="orange"]
-"MASTER_RSC_A_confirmed-pre_notify_stop_0" -> "MASTER_RSC_A_post_notify_stopped_0" [ style = bold]
-"MASTER_RSC_A_confirmed-pre_notify_stop_0" -> "MASTER_RSC_A_stop_0" [ style = bold]
-"MASTER_RSC_A_confirmed-pre_notify_stop_0" [ style=bold color="green" fontcolor="orange"]
-"MASTER_RSC_A_demote_0" -> "MASTER_RSC_A_demoted_0" [ style = bold]
-"MASTER_RSC_A_demote_0" -> "NATIVE_RSC_A:0_demote_0 fc16-builder" [ style = bold]
-"MASTER_RSC_A_demote_0" [ style=bold color="green" fontcolor="orange"]
-"MASTER_RSC_A_demoted_0" -> "MASTER_RSC_A_post_notify_demoted_0" [ style = bold]
-"MASTER_RSC_A_demoted_0" -> "MASTER_RSC_A_start_0" [ style = dashed]
-"MASTER_RSC_A_demoted_0" -> "MASTER_RSC_A_stop_0" [ style = bold]
-"MASTER_RSC_A_demoted_0" [ style=bold color="green" fontcolor="orange"]
-"MASTER_RSC_A_post_notify_demoted_0" -> "MASTER_RSC_A_confirmed-post_notify_demoted_0" [ style = bold]
-"MASTER_RSC_A_post_notify_demoted_0" -> "NATIVE_RSC_A:0_post_notify_demote_0 fc16-builder" [ style = bold]
-"MASTER_RSC_A_post_notify_demoted_0" [ style=bold color="green" fontcolor="orange"]
-"MASTER_RSC_A_post_notify_running_0" -> "MASTER_RSC_A_confirmed-post_notify_running_0" [ style = dashed]
-"MASTER_RSC_A_post_notify_running_0" [ style=dashed color="red" fontcolor="orange"]
-"MASTER_RSC_A_post_notify_stopped_0" -> "MASTER_RSC_A_confirmed-post_notify_stopped_0" [ style = bold]
-"MASTER_RSC_A_post_notify_stopped_0" [ style=bold color="green" fontcolor="orange"]
-"MASTER_RSC_A_pre_notify_demote_0" -> "MASTER_RSC_A_confirmed-pre_notify_demote_0" [ style = bold]
-"MASTER_RSC_A_pre_notify_demote_0" -> "NATIVE_RSC_A:0_pre_notify_demote_0 fc16-builder" [ style = bold]
-"MASTER_RSC_A_pre_notify_demote_0" [ style=bold color="green" fontcolor="orange"]
-"MASTER_RSC_A_pre_notify_start_0" -> "MASTER_RSC_A_confirmed-pre_notify_start_0" [ style = dashed]
-"MASTER_RSC_A_pre_notify_start_0" [ style=dashed color="red" fontcolor="orange"]
-"MASTER_RSC_A_pre_notify_stop_0" -> "MASTER_RSC_A_confirmed-pre_notify_stop_0" [ style = bold]
-"MASTER_RSC_A_pre_notify_stop_0" -> "NATIVE_RSC_A:0_pre_notify_stop_0 fc16-builder" [ style = bold]
-"MASTER_RSC_A_pre_notify_stop_0" [ style=bold color="green" fontcolor="orange"]
-"MASTER_RSC_A_running_0" -> "MASTER_RSC_A_post_notify_running_0" [ style = dashed]
-"MASTER_RSC_A_running_0" [ style=dashed color="red" fontcolor="orange"]
-"MASTER_RSC_A_start_0" -> "MASTER_RSC_A_running_0" [ style = dashed]
-"MASTER_RSC_A_start_0" -> "NATIVE_RSC_A:0_start_0 fc16-builder" [ style = dashed]
-"MASTER_RSC_A_start_0" [ style=dashed color="red" fontcolor="orange"]
-"MASTER_RSC_A_stop_0" -> "MASTER_RSC_A_stopped_0" [ style = bold]
-"MASTER_RSC_A_stop_0" -> "NATIVE_RSC_A:0_stop_0 fc16-builder" [ style = bold]
-"MASTER_RSC_A_stop_0" [ style=bold color="green" fontcolor="orange"]
-"MASTER_RSC_A_stopped_0" -> "MASTER_RSC_A_post_notify_stopped_0" [ style = bold]
-"MASTER_RSC_A_stopped_0" -> "MASTER_RSC_A_start_0" [ style = dashed]
-"MASTER_RSC_A_stopped_0" [ style=bold color="green" fontcolor="orange"]
 "NATIVE_RSC_A:0_delete_0 fc16-builder2" -> "NATIVE_RSC_A:0_start_0 fc16-builder" [ style = dashed]
 "NATIVE_RSC_A:0_delete_0 fc16-builder2" [ style=bold color="green" fontcolor="black"]
-"NATIVE_RSC_A:0_demote_0 fc16-builder" -> "MASTER_RSC_A_demoted_0" [ style = bold]
 "NATIVE_RSC_A:0_demote_0 fc16-builder" -> "NATIVE_RSC_A:0_stop_0 fc16-builder" [ style = bold]
+"NATIVE_RSC_A:0_demote_0 fc16-builder" -> "PROMOTABLE_RSC_A_demoted_0" [ style = bold]
 "NATIVE_RSC_A:0_demote_0 fc16-builder" [ style=bold color="green" fontcolor="black"]
 "NATIVE_RSC_A:0_monitor_20000 fc16-builder" [ style=dashed color="red" fontcolor="black"]
-"NATIVE_RSC_A:0_post_notify_demote_0 fc16-builder" -> "MASTER_RSC_A_confirmed-post_notify_demoted_0" [ style = bold]
+"NATIVE_RSC_A:0_post_notify_demote_0 fc16-builder" -> "PROMOTABLE_RSC_A_confirmed-post_notify_demoted_0" [ style = bold]
 "NATIVE_RSC_A:0_post_notify_demote_0 fc16-builder" [ style=bold color="green" fontcolor="black"]
-"NATIVE_RSC_A:0_pre_notify_demote_0 fc16-builder" -> "MASTER_RSC_A_confirmed-pre_notify_demote_0" [ style = bold]
+"NATIVE_RSC_A:0_pre_notify_demote_0 fc16-builder" -> "PROMOTABLE_RSC_A_confirmed-pre_notify_demote_0" [ style = bold]
 "NATIVE_RSC_A:0_pre_notify_demote_0 fc16-builder" [ style=bold color="green" fontcolor="black"]
-"NATIVE_RSC_A:0_pre_notify_stop_0 fc16-builder" -> "MASTER_RSC_A_confirmed-pre_notify_stop_0" [ style = bold]
+"NATIVE_RSC_A:0_pre_notify_stop_0 fc16-builder" -> "PROMOTABLE_RSC_A_confirmed-pre_notify_stop_0" [ style = bold]
 "NATIVE_RSC_A:0_pre_notify_stop_0 fc16-builder" [ style=bold color="green" fontcolor="black"]
-"NATIVE_RSC_A:0_start_0 fc16-builder" -> "MASTER_RSC_A_running_0" [ style = dashed]
 "NATIVE_RSC_A:0_start_0 fc16-builder" -> "NATIVE_RSC_A:0_monitor_20000 fc16-builder" [ style = dashed]
+"NATIVE_RSC_A:0_start_0 fc16-builder" -> "PROMOTABLE_RSC_A_running_0" [ style = dashed]
 "NATIVE_RSC_A:0_start_0 fc16-builder" [ style=dashed color="red" fontcolor="black"]
-"NATIVE_RSC_A:0_stop_0 fc16-builder" -> "MASTER_RSC_A_stopped_0" [ style = bold]
 "NATIVE_RSC_A:0_stop_0 fc16-builder" -> "NATIVE_RSC_A:0_delete_0 fc16-builder2" [ style = bold]
 "NATIVE_RSC_A:0_stop_0 fc16-builder" -> "NATIVE_RSC_A:0_start_0 fc16-builder" [ style = dashed]
+"NATIVE_RSC_A:0_stop_0 fc16-builder" -> "PROMOTABLE_RSC_A_stopped_0" [ style = bold]
 "NATIVE_RSC_A:0_stop_0 fc16-builder" [ style=bold color="green" fontcolor="black"]
-"NATIVE_RSC_B_start_0 <none>" -> "MASTER_RSC_A_start_0" [ style = dashed]
+"NATIVE_RSC_B_start_0 <none>" -> "PROMOTABLE_RSC_A_start_0" [ style = dashed]
 "NATIVE_RSC_B_start_0 <none>" [ style=dashed color="red" fontcolor="black"]
 "NATIVE_RSC_B_stop_0 fc16-builder2" -> "NATIVE_RSC_B_start_0 <none>" [ style = dashed]
 "NATIVE_RSC_B_stop_0 fc16-builder2" [ style=bold color="green" fontcolor="black"]
+"PROMOTABLE_RSC_A_confirmed-post_notify_demoted_0" -> "NATIVE_RSC_A:0_monitor_20000 fc16-builder" [ style = dashed]
+"PROMOTABLE_RSC_A_confirmed-post_notify_demoted_0" -> "PROMOTABLE_RSC_A_pre_notify_start_0" [ style = dashed]
+"PROMOTABLE_RSC_A_confirmed-post_notify_demoted_0" -> "PROMOTABLE_RSC_A_pre_notify_stop_0" [ style = bold]
+"PROMOTABLE_RSC_A_confirmed-post_notify_demoted_0" [ style=bold color="green" fontcolor="orange"]
+"PROMOTABLE_RSC_A_confirmed-post_notify_running_0" [ style=dashed color="red" fontcolor="orange"]
+"PROMOTABLE_RSC_A_confirmed-post_notify_stopped_0" -> "NATIVE_RSC_B_stop_0 fc16-builder2" [ style = bold]
+"PROMOTABLE_RSC_A_confirmed-post_notify_stopped_0" -> "PROMOTABLE_RSC_A_pre_notify_start_0" [ style = dashed]
+"PROMOTABLE_RSC_A_confirmed-post_notify_stopped_0" [ style=bold color="green" fontcolor="orange"]
+"PROMOTABLE_RSC_A_confirmed-pre_notify_demote_0" -> "PROMOTABLE_RSC_A_demote_0" [ style = bold]
+"PROMOTABLE_RSC_A_confirmed-pre_notify_demote_0" -> "PROMOTABLE_RSC_A_post_notify_demoted_0" [ style = bold]
+"PROMOTABLE_RSC_A_confirmed-pre_notify_demote_0" [ style=bold color="green" fontcolor="orange"]
+"PROMOTABLE_RSC_A_confirmed-pre_notify_start_0" -> "PROMOTABLE_RSC_A_post_notify_running_0" [ style = dashed]
+"PROMOTABLE_RSC_A_confirmed-pre_notify_start_0" -> "PROMOTABLE_RSC_A_start_0" [ style = dashed]
+"PROMOTABLE_RSC_A_confirmed-pre_notify_start_0" [ style=dashed color="red" fontcolor="orange"]
+"PROMOTABLE_RSC_A_confirmed-pre_notify_stop_0" -> "PROMOTABLE_RSC_A_post_notify_stopped_0" [ style = bold]
+"PROMOTABLE_RSC_A_confirmed-pre_notify_stop_0" -> "PROMOTABLE_RSC_A_stop_0" [ style = bold]
+"PROMOTABLE_RSC_A_confirmed-pre_notify_stop_0" [ style=bold color="green" fontcolor="orange"]
+"PROMOTABLE_RSC_A_demote_0" -> "NATIVE_RSC_A:0_demote_0 fc16-builder" [ style = bold]
+"PROMOTABLE_RSC_A_demote_0" -> "PROMOTABLE_RSC_A_demoted_0" [ style = bold]
+"PROMOTABLE_RSC_A_demote_0" [ style=bold color="green" fontcolor="orange"]
+"PROMOTABLE_RSC_A_demoted_0" -> "PROMOTABLE_RSC_A_post_notify_demoted_0" [ style = bold]
+"PROMOTABLE_RSC_A_demoted_0" -> "PROMOTABLE_RSC_A_start_0" [ style = dashed]
+"PROMOTABLE_RSC_A_demoted_0" -> "PROMOTABLE_RSC_A_stop_0" [ style = bold]
+"PROMOTABLE_RSC_A_demoted_0" [ style=bold color="green" fontcolor="orange"]
+"PROMOTABLE_RSC_A_post_notify_demoted_0" -> "NATIVE_RSC_A:0_post_notify_demote_0 fc16-builder" [ style = bold]
+"PROMOTABLE_RSC_A_post_notify_demoted_0" -> "PROMOTABLE_RSC_A_confirmed-post_notify_demoted_0" [ style = bold]
+"PROMOTABLE_RSC_A_post_notify_demoted_0" [ style=bold color="green" fontcolor="orange"]
+"PROMOTABLE_RSC_A_post_notify_running_0" -> "PROMOTABLE_RSC_A_confirmed-post_notify_running_0" [ style = dashed]
+"PROMOTABLE_RSC_A_post_notify_running_0" [ style=dashed color="red" fontcolor="orange"]
+"PROMOTABLE_RSC_A_post_notify_stopped_0" -> "PROMOTABLE_RSC_A_confirmed-post_notify_stopped_0" [ style = bold]
+"PROMOTABLE_RSC_A_post_notify_stopped_0" [ style=bold color="green" fontcolor="orange"]
+"PROMOTABLE_RSC_A_pre_notify_demote_0" -> "NATIVE_RSC_A:0_pre_notify_demote_0 fc16-builder" [ style = bold]
+"PROMOTABLE_RSC_A_pre_notify_demote_0" -> "PROMOTABLE_RSC_A_confirmed-pre_notify_demote_0" [ style = bold]
+"PROMOTABLE_RSC_A_pre_notify_demote_0" [ style=bold color="green" fontcolor="orange"]
+"PROMOTABLE_RSC_A_pre_notify_start_0" -> "PROMOTABLE_RSC_A_confirmed-pre_notify_start_0" [ style = dashed]
+"PROMOTABLE_RSC_A_pre_notify_start_0" [ style=dashed color="red" fontcolor="orange"]
+"PROMOTABLE_RSC_A_pre_notify_stop_0" -> "NATIVE_RSC_A:0_pre_notify_stop_0 fc16-builder" [ style = bold]
+"PROMOTABLE_RSC_A_pre_notify_stop_0" -> "PROMOTABLE_RSC_A_confirmed-pre_notify_stop_0" [ style = bold]
+"PROMOTABLE_RSC_A_pre_notify_stop_0" [ style=bold color="green" fontcolor="orange"]
+"PROMOTABLE_RSC_A_running_0" -> "PROMOTABLE_RSC_A_post_notify_running_0" [ style = dashed]
+"PROMOTABLE_RSC_A_running_0" [ style=dashed color="red" fontcolor="orange"]
+"PROMOTABLE_RSC_A_start_0" -> "NATIVE_RSC_A:0_start_0 fc16-builder" [ style = dashed]
+"PROMOTABLE_RSC_A_start_0" -> "PROMOTABLE_RSC_A_running_0" [ style = dashed]
+"PROMOTABLE_RSC_A_start_0" [ style=dashed color="red" fontcolor="orange"]
+"PROMOTABLE_RSC_A_stop_0" -> "NATIVE_RSC_A:0_stop_0 fc16-builder" [ style = bold]
+"PROMOTABLE_RSC_A_stop_0" -> "PROMOTABLE_RSC_A_stopped_0" [ style = bold]
+"PROMOTABLE_RSC_A_stop_0" [ style=bold color="green" fontcolor="orange"]
+"PROMOTABLE_RSC_A_stopped_0" -> "PROMOTABLE_RSC_A_post_notify_stopped_0" [ style = bold]
+"PROMOTABLE_RSC_A_stopped_0" -> "PROMOTABLE_RSC_A_start_0" [ style = dashed]
+"PROMOTABLE_RSC_A_stopped_0" [ style=bold color="green" fontcolor="orange"]
 }
diff --git a/cts/scheduler/dot/order_constraint_stops_unpromoted.dot b/cts/scheduler/dot/order_constraint_stops_unpromoted.dot
index 812fe95bef..33b3db1289 100644
--- a/cts/scheduler/dot/order_constraint_stops_unpromoted.dot
+++ b/cts/scheduler/dot/order_constraint_stops_unpromoted.dot
@@ -1,45 +1,45 @@
  digraph "g" {
-"MASTER_RSC_A_confirmed-post_notify_running_0" [ style=dashed color="red" fontcolor="orange"]
-"MASTER_RSC_A_confirmed-post_notify_stopped_0" -> "MASTER_RSC_A_pre_notify_start_0" [ style = dashed]
-"MASTER_RSC_A_confirmed-post_notify_stopped_0" -> "NATIVE_RSC_B_stop_0 fc16-builder" [ style = bold]
-"MASTER_RSC_A_confirmed-post_notify_stopped_0" [ style=bold color="green" fontcolor="orange"]
-"MASTER_RSC_A_confirmed-pre_notify_start_0" -> "MASTER_RSC_A_post_notify_running_0" [ style = dashed]
-"MASTER_RSC_A_confirmed-pre_notify_start_0" -> "MASTER_RSC_A_start_0" [ style = dashed]
-"MASTER_RSC_A_confirmed-pre_notify_start_0" [ style=dashed color="red" fontcolor="orange"]
-"MASTER_RSC_A_confirmed-pre_notify_stop_0" -> "MASTER_RSC_A_post_notify_stopped_0" [ style = bold]
-"MASTER_RSC_A_confirmed-pre_notify_stop_0" -> "MASTER_RSC_A_stop_0" [ style = bold]
-"MASTER_RSC_A_confirmed-pre_notify_stop_0" [ style=bold color="green" fontcolor="orange"]
-"MASTER_RSC_A_post_notify_running_0" -> "MASTER_RSC_A_confirmed-post_notify_running_0" [ style = dashed]
-"MASTER_RSC_A_post_notify_running_0" [ style=dashed color="red" fontcolor="orange"]
-"MASTER_RSC_A_post_notify_stopped_0" -> "MASTER_RSC_A_confirmed-post_notify_stopped_0" [ style = bold]
-"MASTER_RSC_A_post_notify_stopped_0" [ style=bold color="green" fontcolor="orange"]
-"MASTER_RSC_A_pre_notify_start_0" -> "MASTER_RSC_A_confirmed-pre_notify_start_0" [ style = dashed]
-"MASTER_RSC_A_pre_notify_start_0" [ style=dashed color="red" fontcolor="orange"]
-"MASTER_RSC_A_pre_notify_stop_0" -> "MASTER_RSC_A_confirmed-pre_notify_stop_0" [ style = bold]
-"MASTER_RSC_A_pre_notify_stop_0" -> "NATIVE_RSC_A:0_pre_notify_stop_0 fc16-builder" [ style = bold]
-"MASTER_RSC_A_pre_notify_stop_0" [ style=bold color="green" fontcolor="orange"]
-"MASTER_RSC_A_running_0" -> "MASTER_RSC_A_post_notify_running_0" [ style = dashed]
-"MASTER_RSC_A_running_0" [ style=dashed color="red" fontcolor="orange"]
-"MASTER_RSC_A_start_0" -> "MASTER_RSC_A_running_0" [ style = dashed]
-"MASTER_RSC_A_start_0" -> "NATIVE_RSC_A:0_start_0 fc16-builder" [ style = dashed]
-"MASTER_RSC_A_start_0" [ style=dashed color="red" fontcolor="orange"]
-"MASTER_RSC_A_stop_0" -> "MASTER_RSC_A_stopped_0" [ style = bold]
-"MASTER_RSC_A_stop_0" -> "NATIVE_RSC_A:0_stop_0 fc16-builder" [ style = bold]
-"MASTER_RSC_A_stop_0" [ style=bold color="green" fontcolor="orange"]
-"MASTER_RSC_A_stopped_0" -> "MASTER_RSC_A_post_notify_stopped_0" [ style = bold]
-"MASTER_RSC_A_stopped_0" -> "MASTER_RSC_A_start_0" [ style = dashed]
-"MASTER_RSC_A_stopped_0" [ style=bold color="green" fontcolor="orange"]
 "NATIVE_RSC_A:0_monitor_30000 fc16-builder" [ style=dashed color="red" fontcolor="black"]
-"NATIVE_RSC_A:0_pre_notify_stop_0 fc16-builder" -> "MASTER_RSC_A_confirmed-pre_notify_stop_0" [ style = bold]
+"NATIVE_RSC_A:0_pre_notify_stop_0 fc16-builder" -> "PROMOTABLE_RSC_A_confirmed-pre_notify_stop_0" [ style = bold]
 "NATIVE_RSC_A:0_pre_notify_stop_0 fc16-builder" [ style=bold color="green" fontcolor="black"]
-"NATIVE_RSC_A:0_start_0 fc16-builder" -> "MASTER_RSC_A_running_0" [ style = dashed]
 "NATIVE_RSC_A:0_start_0 fc16-builder" -> "NATIVE_RSC_A:0_monitor_30000 fc16-builder" [ style = dashed]
+"NATIVE_RSC_A:0_start_0 fc16-builder" -> "PROMOTABLE_RSC_A_running_0" [ style = dashed]
 "NATIVE_RSC_A:0_start_0 fc16-builder" [ style=dashed color="red" fontcolor="black"]
-"NATIVE_RSC_A:0_stop_0 fc16-builder" -> "MASTER_RSC_A_stopped_0" [ style = bold]
 "NATIVE_RSC_A:0_stop_0 fc16-builder" -> "NATIVE_RSC_A:0_start_0 fc16-builder" [ style = dashed]
+"NATIVE_RSC_A:0_stop_0 fc16-builder" -> "PROMOTABLE_RSC_A_stopped_0" [ style = bold]
 "NATIVE_RSC_A:0_stop_0 fc16-builder" [ style=bold color="green" fontcolor="black"]
-"NATIVE_RSC_B_start_0 <none>" -> "MASTER_RSC_A_start_0" [ style = dashed]
+"NATIVE_RSC_B_start_0 <none>" -> "PROMOTABLE_RSC_A_start_0" [ style = dashed]
 "NATIVE_RSC_B_start_0 <none>" [ style=dashed color="red" fontcolor="black"]
 "NATIVE_RSC_B_stop_0 fc16-builder" -> "NATIVE_RSC_B_start_0 <none>" [ style = dashed]
 "NATIVE_RSC_B_stop_0 fc16-builder" [ style=bold color="green" fontcolor="black"]
+"PROMOTABLE_RSC_A_confirmed-post_notify_running_0" [ style=dashed color="red" fontcolor="orange"]
+"PROMOTABLE_RSC_A_confirmed-post_notify_stopped_0" -> "NATIVE_RSC_B_stop_0 fc16-builder" [ style = bold]
+"PROMOTABLE_RSC_A_confirmed-post_notify_stopped_0" -> "PROMOTABLE_RSC_A_pre_notify_start_0" [ style = dashed]
+"PROMOTABLE_RSC_A_confirmed-post_notify_stopped_0" [ style=bold color="green" fontcolor="orange"]
+"PROMOTABLE_RSC_A_confirmed-pre_notify_start_0" -> "PROMOTABLE_RSC_A_post_notify_running_0" [ style = dashed]
+"PROMOTABLE_RSC_A_confirmed-pre_notify_start_0" -> "PROMOTABLE_RSC_A_start_0" [ style = dashed]
+"PROMOTABLE_RSC_A_confirmed-pre_notify_start_0" [ style=dashed color="red" fontcolor="orange"]
+"PROMOTABLE_RSC_A_confirmed-pre_notify_stop_0" -> "PROMOTABLE_RSC_A_post_notify_stopped_0" [ style = bold]
+"PROMOTABLE_RSC_A_confirmed-pre_notify_stop_0" -> "PROMOTABLE_RSC_A_stop_0" [ style = bold]
+"PROMOTABLE_RSC_A_confirmed-pre_notify_stop_0" [ style=bold color="green" fontcolor="orange"]
+"PROMOTABLE_RSC_A_post_notify_running_0" -> "PROMOTABLE_RSC_A_confirmed-post_notify_running_0" [ style = dashed]
+"PROMOTABLE_RSC_A_post_notify_running_0" [ style=dashed color="red" fontcolor="orange"]
+"PROMOTABLE_RSC_A_post_notify_stopped_0" -> "PROMOTABLE_RSC_A_confirmed-post_notify_stopped_0" [ style = bold]
+"PROMOTABLE_RSC_A_post_notify_stopped_0" [ style=bold color="green" fontcolor="orange"]
+"PROMOTABLE_RSC_A_pre_notify_start_0" -> "PROMOTABLE_RSC_A_confirmed-pre_notify_start_0" [ style = dashed]
+"PROMOTABLE_RSC_A_pre_notify_start_0" [ style=dashed color="red" fontcolor="orange"]
+"PROMOTABLE_RSC_A_pre_notify_stop_0" -> "NATIVE_RSC_A:0_pre_notify_stop_0 fc16-builder" [ style = bold]
+"PROMOTABLE_RSC_A_pre_notify_stop_0" -> "PROMOTABLE_RSC_A_confirmed-pre_notify_stop_0" [ style = bold]
+"PROMOTABLE_RSC_A_pre_notify_stop_0" [ style=bold color="green" fontcolor="orange"]
+"PROMOTABLE_RSC_A_running_0" -> "PROMOTABLE_RSC_A_post_notify_running_0" [ style = dashed]
+"PROMOTABLE_RSC_A_running_0" [ style=dashed color="red" fontcolor="orange"]
+"PROMOTABLE_RSC_A_start_0" -> "NATIVE_RSC_A:0_start_0 fc16-builder" [ style = dashed]
+"PROMOTABLE_RSC_A_start_0" -> "PROMOTABLE_RSC_A_running_0" [ style = dashed]
+"PROMOTABLE_RSC_A_start_0" [ style=dashed color="red" fontcolor="orange"]
+"PROMOTABLE_RSC_A_stop_0" -> "NATIVE_RSC_A:0_stop_0 fc16-builder" [ style = bold]
+"PROMOTABLE_RSC_A_stop_0" -> "PROMOTABLE_RSC_A_stopped_0" [ style = bold]
+"PROMOTABLE_RSC_A_stop_0" [ style=bold color="green" fontcolor="orange"]
+"PROMOTABLE_RSC_A_stopped_0" -> "PROMOTABLE_RSC_A_post_notify_stopped_0" [ style = bold]
+"PROMOTABLE_RSC_A_stopped_0" -> "PROMOTABLE_RSC_A_start_0" [ style = dashed]
+"PROMOTABLE_RSC_A_stopped_0" [ style=bold color="green" fontcolor="orange"]
 }
diff --git a/cts/scheduler/exp/colocation_constraint_stops_promoted.exp b/cts/scheduler/exp/colocation_constraint_stops_promoted.exp
index d79fb405a9..adb8859762 100644
--- a/cts/scheduler/exp/colocation_constraint_stops_promoted.exp
+++ b/cts/scheduler/exp/colocation_constraint_stops_promoted.exp
@@ -1,247 +1,247 @@
 <transition_graph cluster-delay="60s" stonith-timeout="60s" failed-stop-offset="INFINITY" failed-start-offset="INFINITY"  transition_id="0">
   <synapse id="0" priority="1000000">
     <action_set>
       <rsc_op id="36" operation="notify" operation_key="NATIVE_RSC_A:0_post_notify_demote_0" on_node="fc16-builder" on_node_uuid="fc16-builder">
         <primitive id="NATIVE_RSC_A" long-id="NATIVE_RSC_A:0" class="ocf" provider="pacemaker" type="Stateful"/>
         <attributes CRM_meta_clone="0" CRM_meta_clone_max="1" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource="NATIVE_RSC_A:0" CRM_meta_notify_active_uname="fc16-builder" CRM_meta_notify_all_uname="fc16-builder fc16-builder2" CRM_meta_notify_available_uname="fc16-builder fc16-builder2" CRM_meta_notify_demote_resource="NATIVE_RSC_A:0" CRM_meta_notify_demote_uname="fc16-builder" CRM_meta_notify_inactive_resource="NATIVE_RSC_A:1" CRM_meta_notify_key_operation="demoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="NATIVE_RSC_A:0" CRM_meta_notify_master_uname="fc16-builder" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_promoted_resource="NATIVE_RSC_A:0" CRM_meta_notify_promoted_uname="fc16-builder" CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="NATIVE_RSC_A:0" CRM_meta_notify_stop_uname="fc16-builder" CRM_meta_notify_type="post" CRM_meta_notify_unpromoted_resource=" " CRM_meta_notify_unpromoted_uname=" " CRM_meta_on_node="fc16-builder" CRM_meta_on_node_uuid="fc16-builder" CRM_meta_promoted_max="1" CRM_meta_promoted_node_max="1" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="27" operation="notify" operation_key="MASTER_RSC_A_post_notify_demoted_0"/>
+        <pseudo_event id="27" operation="notify" operation_key="PROMOTABLE_RSC_A_post_notify_demoted_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="1">
     <action_set>
       <rsc_op id="35" operation="notify" operation_key="NATIVE_RSC_A:0_pre_notify_demote_0" on_node="fc16-builder" on_node_uuid="fc16-builder">
         <primitive id="NATIVE_RSC_A" long-id="NATIVE_RSC_A:0" class="ocf" provider="pacemaker" type="Stateful"/>
         <attributes CRM_meta_clone="0" CRM_meta_clone_max="1" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource="NATIVE_RSC_A:0" CRM_meta_notify_active_uname="fc16-builder" CRM_meta_notify_all_uname="fc16-builder fc16-builder2" CRM_meta_notify_available_uname="fc16-builder fc16-builder2" CRM_meta_notify_demote_resource="NATIVE_RSC_A:0" CRM_meta_notify_demote_uname="fc16-builder" CRM_meta_notify_inactive_resource="NATIVE_RSC_A:1" CRM_meta_notify_key_operation="demote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="NATIVE_RSC_A:0" CRM_meta_notify_master_uname="fc16-builder" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_promoted_resource="NATIVE_RSC_A:0" CRM_meta_notify_promoted_uname="fc16-builder" CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="NATIVE_RSC_A:0" CRM_meta_notify_stop_uname="fc16-builder" CRM_meta_notify_type="pre" CRM_meta_notify_unpromoted_resource=" " CRM_meta_notify_unpromoted_uname=" " CRM_meta_on_node="fc16-builder" CRM_meta_on_node_uuid="fc16-builder" CRM_meta_promoted_max="1" CRM_meta_promoted_node_max="1" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="25" operation="notify" operation_key="MASTER_RSC_A_pre_notify_demote_0"/>
+        <pseudo_event id="25" operation="notify" operation_key="PROMOTABLE_RSC_A_pre_notify_demote_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="2">
     <action_set>
       <rsc_op id="34" operation="notify" operation_key="NATIVE_RSC_A:0_pre_notify_stop_0" on_node="fc16-builder" on_node_uuid="fc16-builder">
         <primitive id="NATIVE_RSC_A" long-id="NATIVE_RSC_A:0" class="ocf" provider="pacemaker" type="Stateful"/>
         <attributes CRM_meta_clone="0" CRM_meta_clone_max="1" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource="NATIVE_RSC_A:0" CRM_meta_notify_active_uname="fc16-builder" CRM_meta_notify_all_uname="fc16-builder fc16-builder2" CRM_meta_notify_available_uname="fc16-builder fc16-builder2" CRM_meta_notify_demote_resource="NATIVE_RSC_A:0" CRM_meta_notify_demote_uname="fc16-builder" CRM_meta_notify_inactive_resource="NATIVE_RSC_A:1" CRM_meta_notify_key_operation="stop" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="NATIVE_RSC_A:0" CRM_meta_notify_master_uname="fc16-builder" CRM_meta_notify_operation="stop" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_promoted_resource="NATIVE_RSC_A:0" CRM_meta_notify_promoted_uname="fc16-builder" CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="NATIVE_RSC_A:0" CRM_meta_notify_stop_uname="fc16-builder" CRM_meta_notify_type="pre" CRM_meta_notify_unpromoted_resource=" " CRM_meta_notify_unpromoted_uname=" " CRM_meta_on_node="fc16-builder" CRM_meta_on_node_uuid="fc16-builder" CRM_meta_promoted_max="1" CRM_meta_promoted_node_max="1" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="13" operation="notify" operation_key="MASTER_RSC_A_pre_notify_stop_0"/>
+        <pseudo_event id="13" operation="notify" operation_key="PROMOTABLE_RSC_A_pre_notify_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="3">
     <action_set>
       <rsc_op id="4" operation="stop" operation_key="NATIVE_RSC_A:0_stop_0" on_node="fc16-builder" on_node_uuid="fc16-builder">
         <primitive id="NATIVE_RSC_A" long-id="NATIVE_RSC_A:0" class="ocf" provider="pacemaker" type="Stateful"/>
         <attributes CRM_meta_clone="0" CRM_meta_clone_max="1" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_name="stop" CRM_meta_notify="true" CRM_meta_notify_active_resource="NATIVE_RSC_A:0" CRM_meta_notify_active_uname="fc16-builder" CRM_meta_notify_all_uname="fc16-builder fc16-builder2" CRM_meta_notify_available_uname="fc16-builder fc16-builder2" CRM_meta_notify_demote_resource="NATIVE_RSC_A:0" CRM_meta_notify_demote_uname="fc16-builder" CRM_meta_notify_inactive_resource="NATIVE_RSC_A:1" CRM_meta_notify_master_resource="NATIVE_RSC_A:0" CRM_meta_notify_master_uname="fc16-builder" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_promoted_resource="NATIVE_RSC_A:0" CRM_meta_notify_promoted_uname="fc16-builder" CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="NATIVE_RSC_A:0" CRM_meta_notify_stop_uname="fc16-builder" CRM_meta_notify_unpromoted_resource=" " CRM_meta_notify_unpromoted_uname=" " CRM_meta_on_node="fc16-builder" CRM_meta_on_node_uuid="fc16-builder" CRM_meta_promoted_max="1" CRM_meta_promoted_node_max="1" CRM_meta_timeout="100000" />
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="3" operation="demote" operation_key="NATIVE_RSC_A:0_demote_0" on_node="fc16-builder" on_node_uuid="fc16-builder"/>
       </trigger>
       <trigger>
-        <pseudo_event id="11" operation="stop" operation_key="MASTER_RSC_A_stop_0"/>
+        <pseudo_event id="11" operation="stop" operation_key="PROMOTABLE_RSC_A_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="4">
     <action_set>
       <rsc_op id="3" operation="demote" operation_key="NATIVE_RSC_A:0_demote_0" on_node="fc16-builder" on_node_uuid="fc16-builder">
         <primitive id="NATIVE_RSC_A" long-id="NATIVE_RSC_A:0" class="ocf" provider="pacemaker" type="Stateful"/>
         <attributes CRM_meta_clone="0" CRM_meta_clone_max="1" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource="NATIVE_RSC_A:0" CRM_meta_notify_active_uname="fc16-builder" CRM_meta_notify_all_uname="fc16-builder fc16-builder2" CRM_meta_notify_available_uname="fc16-builder fc16-builder2" CRM_meta_notify_demote_resource="NATIVE_RSC_A:0" CRM_meta_notify_demote_uname="fc16-builder" CRM_meta_notify_inactive_resource="NATIVE_RSC_A:1" CRM_meta_notify_master_resource="NATIVE_RSC_A:0" CRM_meta_notify_master_uname="fc16-builder" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_promoted_resource="NATIVE_RSC_A:0" CRM_meta_notify_promoted_uname="fc16-builder" CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="NATIVE_RSC_A:0" CRM_meta_notify_stop_uname="fc16-builder" CRM_meta_notify_unpromoted_resource=" " CRM_meta_notify_unpromoted_uname=" " CRM_meta_on_node="fc16-builder" CRM_meta_on_node_uuid="fc16-builder" CRM_meta_promoted_max="1" CRM_meta_promoted_node_max="1" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="23" operation="demote" operation_key="MASTER_RSC_A_demote_0"/>
+        <pseudo_event id="23" operation="demote" operation_key="PROMOTABLE_RSC_A_demote_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="5">
     <action_set>
       <rsc_op id="2" operation="delete" operation_key="NATIVE_RSC_A:0_delete_0" on_node="fc16-builder2" on_node_uuid="fc16-builder2">
         <primitive id="NATIVE_RSC_A" long-id="NATIVE_RSC_A:0" class="ocf" provider="pacemaker" type="Stateful"/>
         <attributes CRM_meta_clone="0" CRM_meta_clone_max="1" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_on_node="fc16-builder2" CRM_meta_on_node_uuid="fc16-builder2" CRM_meta_promoted_max="1" CRM_meta_promoted_node_max="1" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="4" operation="stop" operation_key="NATIVE_RSC_A:0_stop_0" on_node="fc16-builder" on_node_uuid="fc16-builder"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="6" priority="1000000">
     <action_set>
-      <pseudo_event id="28" operation="notified" operation_key="MASTER_RSC_A_confirmed-post_notify_demoted_0">
+      <pseudo_event id="28" operation="notified" operation_key="PROMOTABLE_RSC_A_confirmed-post_notify_demoted_0">
         <attributes CRM_meta_clone_max="1" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_key_operation="demoted" CRM_meta_notify_key_type="confirmed-post" CRM_meta_notify_operation="demote" CRM_meta_notify_type="post" CRM_meta_promoted_max="1" CRM_meta_promoted_node_max="1" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="27" operation="notify" operation_key="MASTER_RSC_A_post_notify_demoted_0"/>
+        <pseudo_event id="27" operation="notify" operation_key="PROMOTABLE_RSC_A_post_notify_demoted_0"/>
       </trigger>
       <trigger>
         <rsc_op id="36" operation="notify" operation_key="NATIVE_RSC_A:0_post_notify_demote_0" on_node="fc16-builder" on_node_uuid="fc16-builder"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="7" priority="1000000">
     <action_set>
-      <pseudo_event id="27" operation="notify" operation_key="MASTER_RSC_A_post_notify_demoted_0">
+      <pseudo_event id="27" operation="notify" operation_key="PROMOTABLE_RSC_A_post_notify_demoted_0">
         <attributes CRM_meta_clone_max="1" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_key_operation="demoted" CRM_meta_notify_key_type="post" CRM_meta_notify_operation="demote" CRM_meta_notify_type="post" CRM_meta_promoted_max="1" CRM_meta_promoted_node_max="1" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="24" operation="demoted" operation_key="MASTER_RSC_A_demoted_0"/>
+        <pseudo_event id="24" operation="demoted" operation_key="PROMOTABLE_RSC_A_demoted_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="26" operation="notified" operation_key="MASTER_RSC_A_confirmed-pre_notify_demote_0"/>
+        <pseudo_event id="26" operation="notified" operation_key="PROMOTABLE_RSC_A_confirmed-pre_notify_demote_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="8">
     <action_set>
-      <pseudo_event id="26" operation="notified" operation_key="MASTER_RSC_A_confirmed-pre_notify_demote_0">
+      <pseudo_event id="26" operation="notified" operation_key="PROMOTABLE_RSC_A_confirmed-pre_notify_demote_0">
         <attributes CRM_meta_clone_max="1" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_key_operation="demote" CRM_meta_notify_key_type="confirmed-pre" CRM_meta_notify_operation="demote" CRM_meta_notify_type="pre" CRM_meta_promoted_max="1" CRM_meta_promoted_node_max="1" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="25" operation="notify" operation_key="MASTER_RSC_A_pre_notify_demote_0"/>
+        <pseudo_event id="25" operation="notify" operation_key="PROMOTABLE_RSC_A_pre_notify_demote_0"/>
       </trigger>
       <trigger>
         <rsc_op id="35" operation="notify" operation_key="NATIVE_RSC_A:0_pre_notify_demote_0" on_node="fc16-builder" on_node_uuid="fc16-builder"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="9">
     <action_set>
-      <pseudo_event id="25" operation="notify" operation_key="MASTER_RSC_A_pre_notify_demote_0">
+      <pseudo_event id="25" operation="notify" operation_key="PROMOTABLE_RSC_A_pre_notify_demote_0">
         <attributes CRM_meta_clone_max="1" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_key_operation="demote" CRM_meta_notify_key_type="pre" CRM_meta_notify_operation="demote" CRM_meta_notify_type="pre" CRM_meta_promoted_max="1" CRM_meta_promoted_node_max="1" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs/>
   </synapse>
   <synapse id="10" priority="1000000">
     <action_set>
-      <pseudo_event id="24" operation="demoted" operation_key="MASTER_RSC_A_demoted_0">
+      <pseudo_event id="24" operation="demoted" operation_key="PROMOTABLE_RSC_A_demoted_0">
         <attributes CRM_meta_clone_max="1" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_promoted_max="1" CRM_meta_promoted_node_max="1" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="3" operation="demote" operation_key="NATIVE_RSC_A:0_demote_0" on_node="fc16-builder" on_node_uuid="fc16-builder"/>
       </trigger>
       <trigger>
-        <pseudo_event id="23" operation="demote" operation_key="MASTER_RSC_A_demote_0"/>
+        <pseudo_event id="23" operation="demote" operation_key="PROMOTABLE_RSC_A_demote_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="11">
     <action_set>
-      <pseudo_event id="23" operation="demote" operation_key="MASTER_RSC_A_demote_0">
+      <pseudo_event id="23" operation="demote" operation_key="PROMOTABLE_RSC_A_demote_0">
         <attributes CRM_meta_clone_max="1" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_promoted_max="1" CRM_meta_promoted_node_max="1" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="26" operation="notified" operation_key="MASTER_RSC_A_confirmed-pre_notify_demote_0"/>
+        <pseudo_event id="26" operation="notified" operation_key="PROMOTABLE_RSC_A_confirmed-pre_notify_demote_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="12" priority="1000000">
     <action_set>
-      <pseudo_event id="16" operation="notified" operation_key="MASTER_RSC_A_confirmed-post_notify_stopped_0">
+      <pseudo_event id="16" operation="notified" operation_key="PROMOTABLE_RSC_A_confirmed-post_notify_stopped_0">
         <attributes CRM_meta_clone_max="1" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_key_operation="stopped" CRM_meta_notify_key_type="confirmed-post" CRM_meta_notify_operation="stop" CRM_meta_notify_type="post" CRM_meta_promoted_max="1" CRM_meta_promoted_node_max="1" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="15" operation="notify" operation_key="MASTER_RSC_A_post_notify_stopped_0"/>
+        <pseudo_event id="15" operation="notify" operation_key="PROMOTABLE_RSC_A_post_notify_stopped_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="13" priority="1000000">
     <action_set>
-      <pseudo_event id="15" operation="notify" operation_key="MASTER_RSC_A_post_notify_stopped_0">
+      <pseudo_event id="15" operation="notify" operation_key="PROMOTABLE_RSC_A_post_notify_stopped_0">
         <attributes CRM_meta_clone_max="1" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_key_operation="stopped" CRM_meta_notify_key_type="post" CRM_meta_notify_operation="stop" CRM_meta_notify_type="post" CRM_meta_promoted_max="1" CRM_meta_promoted_node_max="1" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="12" operation="stopped" operation_key="MASTER_RSC_A_stopped_0"/>
+        <pseudo_event id="12" operation="stopped" operation_key="PROMOTABLE_RSC_A_stopped_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="14" operation="notified" operation_key="MASTER_RSC_A_confirmed-pre_notify_stop_0"/>
+        <pseudo_event id="14" operation="notified" operation_key="PROMOTABLE_RSC_A_confirmed-pre_notify_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="14">
     <action_set>
-      <pseudo_event id="14" operation="notified" operation_key="MASTER_RSC_A_confirmed-pre_notify_stop_0">
+      <pseudo_event id="14" operation="notified" operation_key="PROMOTABLE_RSC_A_confirmed-pre_notify_stop_0">
         <attributes CRM_meta_clone_max="1" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_key_operation="stop" CRM_meta_notify_key_type="confirmed-pre" CRM_meta_notify_operation="stop" CRM_meta_notify_type="pre" CRM_meta_promoted_max="1" CRM_meta_promoted_node_max="1" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="13" operation="notify" operation_key="MASTER_RSC_A_pre_notify_stop_0"/>
+        <pseudo_event id="13" operation="notify" operation_key="PROMOTABLE_RSC_A_pre_notify_stop_0"/>
       </trigger>
       <trigger>
         <rsc_op id="34" operation="notify" operation_key="NATIVE_RSC_A:0_pre_notify_stop_0" on_node="fc16-builder" on_node_uuid="fc16-builder"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="15">
     <action_set>
-      <pseudo_event id="13" operation="notify" operation_key="MASTER_RSC_A_pre_notify_stop_0">
+      <pseudo_event id="13" operation="notify" operation_key="PROMOTABLE_RSC_A_pre_notify_stop_0">
         <attributes CRM_meta_clone_max="1" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_key_operation="stop" CRM_meta_notify_key_type="pre" CRM_meta_notify_operation="stop" CRM_meta_notify_type="pre" CRM_meta_promoted_max="1" CRM_meta_promoted_node_max="1" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="28" operation="notified" operation_key="MASTER_RSC_A_confirmed-post_notify_demoted_0"/>
+        <pseudo_event id="28" operation="notified" operation_key="PROMOTABLE_RSC_A_confirmed-post_notify_demoted_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="16" priority="1000000">
     <action_set>
-      <pseudo_event id="12" operation="stopped" operation_key="MASTER_RSC_A_stopped_0">
+      <pseudo_event id="12" operation="stopped" operation_key="PROMOTABLE_RSC_A_stopped_0">
         <attributes CRM_meta_clone_max="1" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_promoted_max="1" CRM_meta_promoted_node_max="1" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="4" operation="stop" operation_key="NATIVE_RSC_A:0_stop_0" on_node="fc16-builder" on_node_uuid="fc16-builder"/>
       </trigger>
       <trigger>
-        <pseudo_event id="11" operation="stop" operation_key="MASTER_RSC_A_stop_0"/>
+        <pseudo_event id="11" operation="stop" operation_key="PROMOTABLE_RSC_A_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="17">
     <action_set>
-      <pseudo_event id="11" operation="stop" operation_key="MASTER_RSC_A_stop_0">
+      <pseudo_event id="11" operation="stop" operation_key="PROMOTABLE_RSC_A_stop_0">
         <attributes CRM_meta_clone_max="1" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_promoted_max="1" CRM_meta_promoted_node_max="1" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="14" operation="notified" operation_key="MASTER_RSC_A_confirmed-pre_notify_stop_0"/>
+        <pseudo_event id="14" operation="notified" operation_key="PROMOTABLE_RSC_A_confirmed-pre_notify_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="24" operation="demoted" operation_key="MASTER_RSC_A_demoted_0"/>
+        <pseudo_event id="24" operation="demoted" operation_key="PROMOTABLE_RSC_A_demoted_0"/>
       </trigger>
     </inputs>
   </synapse>
 </transition_graph>
diff --git a/cts/scheduler/exp/colocation_constraint_stops_unpromoted.exp b/cts/scheduler/exp/colocation_constraint_stops_unpromoted.exp
index 8b238be6f4..c724395b37 100644
--- a/cts/scheduler/exp/colocation_constraint_stops_unpromoted.exp
+++ b/cts/scheduler/exp/colocation_constraint_stops_unpromoted.exp
@@ -1,114 +1,114 @@
 <transition_graph cluster-delay="60s" stonith-timeout="60s" failed-stop-offset="INFINITY" failed-start-offset="INFINITY"  transition_id="0">
   <synapse id="0">
     <action_set>
       <rsc_op id="30" operation="notify" operation_key="NATIVE_RSC_A:0_pre_notify_stop_0" on_node="fc16-builder" on_node_uuid="fc16-builder">
         <primitive id="NATIVE_RSC_A" long-id="NATIVE_RSC_A:0" class="ocf" provider="pacemaker" type="Stateful"/>
         <attributes CRM_meta_clone="0" CRM_meta_clone_max="1" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="0" CRM_meta_master_node_max="0" CRM_meta_notify="true" CRM_meta_notify_active_resource="NATIVE_RSC_A:0" CRM_meta_notify_active_uname="fc16-builder" CRM_meta_notify_all_uname="fc16-builder fc16-builder2" CRM_meta_notify_available_uname="fc16-builder fc16-builder2" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="stop" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="stop" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_promoted_resource=" " CRM_meta_notify_promoted_uname=" " CRM_meta_notify_slave_resource="NATIVE_RSC_A:0" CRM_meta_notify_slave_uname="fc16-builder" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="NATIVE_RSC_A:0" CRM_meta_notify_stop_uname="fc16-builder" CRM_meta_notify_type="pre" CRM_meta_notify_unpromoted_resource="NATIVE_RSC_A:0" CRM_meta_notify_unpromoted_uname="fc16-builder" CRM_meta_on_node="fc16-builder" CRM_meta_on_node_uuid="fc16-builder" CRM_meta_promoted_max="0" CRM_meta_promoted_node_max="0" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="11" operation="notify" operation_key="MASTER_RSC_A_pre_notify_stop_0"/>
+        <pseudo_event id="11" operation="notify" operation_key="PROMOTABLE_RSC_A_pre_notify_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="1">
     <action_set>
       <rsc_op id="2" operation="stop" operation_key="NATIVE_RSC_A:0_stop_0" on_node="fc16-builder" on_node_uuid="fc16-builder">
         <primitive id="NATIVE_RSC_A" long-id="NATIVE_RSC_A:0" class="ocf" provider="pacemaker" type="Stateful"/>
         <attributes CRM_meta_clone="0" CRM_meta_clone_max="1" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="0" CRM_meta_master_node_max="0" CRM_meta_name="stop" CRM_meta_notify="true" CRM_meta_notify_active_resource="NATIVE_RSC_A:0" CRM_meta_notify_active_uname="fc16-builder" CRM_meta_notify_all_uname="fc16-builder fc16-builder2" CRM_meta_notify_available_uname="fc16-builder fc16-builder2" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource=" " CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_promoted_resource=" " CRM_meta_notify_promoted_uname=" " CRM_meta_notify_slave_resource="NATIVE_RSC_A:0" CRM_meta_notify_slave_uname="fc16-builder" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="NATIVE_RSC_A:0" CRM_meta_notify_stop_uname="fc16-builder" CRM_meta_notify_unpromoted_resource="NATIVE_RSC_A:0" CRM_meta_notify_unpromoted_uname="fc16-builder" CRM_meta_on_node="fc16-builder" CRM_meta_on_node_uuid="fc16-builder" CRM_meta_promoted_max="0" CRM_meta_promoted_node_max="0" CRM_meta_timeout="100000" />
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="9" operation="stop" operation_key="MASTER_RSC_A_stop_0"/>
+        <pseudo_event id="9" operation="stop" operation_key="PROMOTABLE_RSC_A_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="2" priority="1000000">
     <action_set>
-      <pseudo_event id="14" operation="notified" operation_key="MASTER_RSC_A_confirmed-post_notify_stopped_0">
+      <pseudo_event id="14" operation="notified" operation_key="PROMOTABLE_RSC_A_confirmed-post_notify_stopped_0">
         <attributes CRM_meta_clone_max="1" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="0" CRM_meta_master_node_max="0" CRM_meta_notify="true" CRM_meta_notify_key_operation="stopped" CRM_meta_notify_key_type="confirmed-post" CRM_meta_notify_operation="stop" CRM_meta_notify_type="post" CRM_meta_promoted_max="0" CRM_meta_promoted_node_max="0" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="13" operation="notify" operation_key="MASTER_RSC_A_post_notify_stopped_0"/>
+        <pseudo_event id="13" operation="notify" operation_key="PROMOTABLE_RSC_A_post_notify_stopped_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="3" priority="1000000">
     <action_set>
-      <pseudo_event id="13" operation="notify" operation_key="MASTER_RSC_A_post_notify_stopped_0">
+      <pseudo_event id="13" operation="notify" operation_key="PROMOTABLE_RSC_A_post_notify_stopped_0">
         <attributes CRM_meta_clone_max="1" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="0" CRM_meta_master_node_max="0" CRM_meta_notify="true" CRM_meta_notify_key_operation="stopped" CRM_meta_notify_key_type="post" CRM_meta_notify_operation="stop" CRM_meta_notify_type="post" CRM_meta_promoted_max="0" CRM_meta_promoted_node_max="0" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="10" operation="stopped" operation_key="MASTER_RSC_A_stopped_0"/>
+        <pseudo_event id="10" operation="stopped" operation_key="PROMOTABLE_RSC_A_stopped_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="12" operation="notified" operation_key="MASTER_RSC_A_confirmed-pre_notify_stop_0"/>
+        <pseudo_event id="12" operation="notified" operation_key="PROMOTABLE_RSC_A_confirmed-pre_notify_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="4">
     <action_set>
-      <pseudo_event id="12" operation="notified" operation_key="MASTER_RSC_A_confirmed-pre_notify_stop_0">
+      <pseudo_event id="12" operation="notified" operation_key="PROMOTABLE_RSC_A_confirmed-pre_notify_stop_0">
         <attributes CRM_meta_clone_max="1" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="0" CRM_meta_master_node_max="0" CRM_meta_notify="true" CRM_meta_notify_key_operation="stop" CRM_meta_notify_key_type="confirmed-pre" CRM_meta_notify_operation="stop" CRM_meta_notify_type="pre" CRM_meta_promoted_max="0" CRM_meta_promoted_node_max="0" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="11" operation="notify" operation_key="MASTER_RSC_A_pre_notify_stop_0"/>
+        <pseudo_event id="11" operation="notify" operation_key="PROMOTABLE_RSC_A_pre_notify_stop_0"/>
       </trigger>
       <trigger>
         <rsc_op id="30" operation="notify" operation_key="NATIVE_RSC_A:0_pre_notify_stop_0" on_node="fc16-builder" on_node_uuid="fc16-builder"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="5">
     <action_set>
-      <pseudo_event id="11" operation="notify" operation_key="MASTER_RSC_A_pre_notify_stop_0">
+      <pseudo_event id="11" operation="notify" operation_key="PROMOTABLE_RSC_A_pre_notify_stop_0">
         <attributes CRM_meta_clone_max="1" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="0" CRM_meta_master_node_max="0" CRM_meta_notify="true" CRM_meta_notify_key_operation="stop" CRM_meta_notify_key_type="pre" CRM_meta_notify_operation="stop" CRM_meta_notify_type="pre" CRM_meta_promoted_max="0" CRM_meta_promoted_node_max="0" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs/>
   </synapse>
   <synapse id="6" priority="1000000">
     <action_set>
-      <pseudo_event id="10" operation="stopped" operation_key="MASTER_RSC_A_stopped_0">
+      <pseudo_event id="10" operation="stopped" operation_key="PROMOTABLE_RSC_A_stopped_0">
         <attributes CRM_meta_clone_max="1" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="0" CRM_meta_master_node_max="0" CRM_meta_notify="true" CRM_meta_promoted_max="0" CRM_meta_promoted_node_max="0" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="2" operation="stop" operation_key="NATIVE_RSC_A:0_stop_0" on_node="fc16-builder" on_node_uuid="fc16-builder"/>
       </trigger>
       <trigger>
-        <pseudo_event id="9" operation="stop" operation_key="MASTER_RSC_A_stop_0"/>
+        <pseudo_event id="9" operation="stop" operation_key="PROMOTABLE_RSC_A_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="7">
     <action_set>
-      <pseudo_event id="9" operation="stop" operation_key="MASTER_RSC_A_stop_0">
+      <pseudo_event id="9" operation="stop" operation_key="PROMOTABLE_RSC_A_stop_0">
         <attributes CRM_meta_clone_max="1" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="0" CRM_meta_master_node_max="0" CRM_meta_notify="true" CRM_meta_promoted_max="0" CRM_meta_promoted_node_max="0" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="12" operation="notified" operation_key="MASTER_RSC_A_confirmed-pre_notify_stop_0"/>
+        <pseudo_event id="12" operation="notified" operation_key="PROMOTABLE_RSC_A_confirmed-pre_notify_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="8">
     <action_set>
       <rsc_op id="27" operation="stop" operation_key="NATIVE_RSC_B_stop_0" on_node="fc16-builder" on_node_uuid="fc16-builder">
         <primitive id="NATIVE_RSC_B" class="ocf" provider="pacemaker" type="Dummy"/>
         <attributes CRM_meta_name="stop" CRM_meta_on_node="fc16-builder" CRM_meta_on_node_uuid="fc16-builder" CRM_meta_timeout="100000" />
       </rsc_op>
     </action_set>
     <inputs/>
   </synapse>
 </transition_graph>
diff --git a/cts/scheduler/exp/order_constraint_stops_promoted.exp b/cts/scheduler/exp/order_constraint_stops_promoted.exp
index 0826781cf9..87580a1335 100644
--- a/cts/scheduler/exp/order_constraint_stops_promoted.exp
+++ b/cts/scheduler/exp/order_constraint_stops_promoted.exp
@@ -1,260 +1,260 @@
 <transition_graph cluster-delay="60s" stonith-timeout="60s" failed-stop-offset="INFINITY" failed-start-offset="INFINITY"  transition_id="0">
   <synapse id="0" priority="1000000">
     <action_set>
       <rsc_op id="38" operation="notify" operation_key="NATIVE_RSC_A:0_post_notify_demote_0" on_node="fc16-builder" on_node_uuid="fc16-builder">
         <primitive id="NATIVE_RSC_A" long-id="NATIVE_RSC_A:0" class="ocf" provider="pacemaker" type="Stateful"/>
         <attributes CRM_meta_clone="0" CRM_meta_clone_max="1" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource="NATIVE_RSC_A:0" CRM_meta_notify_active_uname="fc16-builder" CRM_meta_notify_all_uname="fc16-builder fc16-builder2" CRM_meta_notify_available_uname="fc16-builder fc16-builder2" CRM_meta_notify_demote_resource="NATIVE_RSC_A:0" CRM_meta_notify_demote_uname="fc16-builder" CRM_meta_notify_inactive_resource="NATIVE_RSC_A:1" CRM_meta_notify_key_operation="demoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="NATIVE_RSC_A:0" CRM_meta_notify_master_uname="fc16-builder" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_promoted_resource="NATIVE_RSC_A:0" CRM_meta_notify_promoted_uname="fc16-builder" CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="NATIVE_RSC_A:0" CRM_meta_notify_stop_uname="fc16-builder" CRM_meta_notify_type="post" CRM_meta_notify_unpromoted_resource=" " CRM_meta_notify_unpromoted_uname=" " CRM_meta_on_node="fc16-builder" CRM_meta_on_node_uuid="fc16-builder" CRM_meta_promoted_max="1" CRM_meta_promoted_node_max="1" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="29" operation="notify" operation_key="MASTER_RSC_A_post_notify_demoted_0"/>
+        <pseudo_event id="29" operation="notify" operation_key="PROMOTABLE_RSC_A_post_notify_demoted_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="1">
     <action_set>
       <rsc_op id="37" operation="notify" operation_key="NATIVE_RSC_A:0_pre_notify_demote_0" on_node="fc16-builder" on_node_uuid="fc16-builder">
         <primitive id="NATIVE_RSC_A" long-id="NATIVE_RSC_A:0" class="ocf" provider="pacemaker" type="Stateful"/>
         <attributes CRM_meta_clone="0" CRM_meta_clone_max="1" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource="NATIVE_RSC_A:0" CRM_meta_notify_active_uname="fc16-builder" CRM_meta_notify_all_uname="fc16-builder fc16-builder2" CRM_meta_notify_available_uname="fc16-builder fc16-builder2" CRM_meta_notify_demote_resource="NATIVE_RSC_A:0" CRM_meta_notify_demote_uname="fc16-builder" CRM_meta_notify_inactive_resource="NATIVE_RSC_A:1" CRM_meta_notify_key_operation="demote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="NATIVE_RSC_A:0" CRM_meta_notify_master_uname="fc16-builder" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_promoted_resource="NATIVE_RSC_A:0" CRM_meta_notify_promoted_uname="fc16-builder" CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="NATIVE_RSC_A:0" CRM_meta_notify_stop_uname="fc16-builder" CRM_meta_notify_type="pre" CRM_meta_notify_unpromoted_resource=" " CRM_meta_notify_unpromoted_uname=" " CRM_meta_on_node="fc16-builder" CRM_meta_on_node_uuid="fc16-builder" CRM_meta_promoted_max="1" CRM_meta_promoted_node_max="1" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="27" operation="notify" operation_key="MASTER_RSC_A_pre_notify_demote_0"/>
+        <pseudo_event id="27" operation="notify" operation_key="PROMOTABLE_RSC_A_pre_notify_demote_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="2">
     <action_set>
       <rsc_op id="36" operation="notify" operation_key="NATIVE_RSC_A:0_pre_notify_stop_0" on_node="fc16-builder" on_node_uuid="fc16-builder">
         <primitive id="NATIVE_RSC_A" long-id="NATIVE_RSC_A:0" class="ocf" provider="pacemaker" type="Stateful"/>
         <attributes CRM_meta_clone="0" CRM_meta_clone_max="1" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource="NATIVE_RSC_A:0" CRM_meta_notify_active_uname="fc16-builder" CRM_meta_notify_all_uname="fc16-builder fc16-builder2" CRM_meta_notify_available_uname="fc16-builder fc16-builder2" CRM_meta_notify_demote_resource="NATIVE_RSC_A:0" CRM_meta_notify_demote_uname="fc16-builder" CRM_meta_notify_inactive_resource="NATIVE_RSC_A:1" CRM_meta_notify_key_operation="stop" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="NATIVE_RSC_A:0" CRM_meta_notify_master_uname="fc16-builder" CRM_meta_notify_operation="stop" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_promoted_resource="NATIVE_RSC_A:0" CRM_meta_notify_promoted_uname="fc16-builder" CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="NATIVE_RSC_A:0" CRM_meta_notify_stop_uname="fc16-builder" CRM_meta_notify_type="pre" CRM_meta_notify_unpromoted_resource=" " CRM_meta_notify_unpromoted_uname=" " CRM_meta_on_node="fc16-builder" CRM_meta_on_node_uuid="fc16-builder" CRM_meta_promoted_max="1" CRM_meta_promoted_node_max="1" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="15" operation="notify" operation_key="MASTER_RSC_A_pre_notify_stop_0"/>
+        <pseudo_event id="15" operation="notify" operation_key="PROMOTABLE_RSC_A_pre_notify_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="3">
     <action_set>
       <rsc_op id="5" operation="stop" operation_key="NATIVE_RSC_A:0_stop_0" on_node="fc16-builder" on_node_uuid="fc16-builder">
         <primitive id="NATIVE_RSC_A" long-id="NATIVE_RSC_A:0" class="ocf" provider="pacemaker" type="Stateful"/>
         <attributes CRM_meta_clone="0" CRM_meta_clone_max="1" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_name="stop" CRM_meta_notify="true" CRM_meta_notify_active_resource="NATIVE_RSC_A:0" CRM_meta_notify_active_uname="fc16-builder" CRM_meta_notify_all_uname="fc16-builder fc16-builder2" CRM_meta_notify_available_uname="fc16-builder fc16-builder2" CRM_meta_notify_demote_resource="NATIVE_RSC_A:0" CRM_meta_notify_demote_uname="fc16-builder" CRM_meta_notify_inactive_resource="NATIVE_RSC_A:1" CRM_meta_notify_master_resource="NATIVE_RSC_A:0" CRM_meta_notify_master_uname="fc16-builder" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_promoted_resource="NATIVE_RSC_A:0" CRM_meta_notify_promoted_uname="fc16-builder" CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="NATIVE_RSC_A:0" CRM_meta_notify_stop_uname="fc16-builder" CRM_meta_notify_unpromoted_resource=" " CRM_meta_notify_unpromoted_uname=" " CRM_meta_on_node="fc16-builder" CRM_meta_on_node_uuid="fc16-builder" CRM_meta_promoted_max="1" CRM_meta_promoted_node_max="1" CRM_meta_timeout="100000" />
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="4" operation="demote" operation_key="NATIVE_RSC_A:0_demote_0" on_node="fc16-builder" on_node_uuid="fc16-builder"/>
       </trigger>
       <trigger>
-        <pseudo_event id="13" operation="stop" operation_key="MASTER_RSC_A_stop_0"/>
+        <pseudo_event id="13" operation="stop" operation_key="PROMOTABLE_RSC_A_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="4">
     <action_set>
       <rsc_op id="4" operation="demote" operation_key="NATIVE_RSC_A:0_demote_0" on_node="fc16-builder" on_node_uuid="fc16-builder">
         <primitive id="NATIVE_RSC_A" long-id="NATIVE_RSC_A:0" class="ocf" provider="pacemaker" type="Stateful"/>
         <attributes CRM_meta_clone="0" CRM_meta_clone_max="1" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource="NATIVE_RSC_A:0" CRM_meta_notify_active_uname="fc16-builder" CRM_meta_notify_all_uname="fc16-builder fc16-builder2" CRM_meta_notify_available_uname="fc16-builder fc16-builder2" CRM_meta_notify_demote_resource="NATIVE_RSC_A:0" CRM_meta_notify_demote_uname="fc16-builder" CRM_meta_notify_inactive_resource="NATIVE_RSC_A:1" CRM_meta_notify_master_resource="NATIVE_RSC_A:0" CRM_meta_notify_master_uname="fc16-builder" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_promoted_resource="NATIVE_RSC_A:0" CRM_meta_notify_promoted_uname="fc16-builder" CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="NATIVE_RSC_A:0" CRM_meta_notify_stop_uname="fc16-builder" CRM_meta_notify_unpromoted_resource=" " CRM_meta_notify_unpromoted_uname=" " CRM_meta_on_node="fc16-builder" CRM_meta_on_node_uuid="fc16-builder" CRM_meta_promoted_max="1" CRM_meta_promoted_node_max="1" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="25" operation="demote" operation_key="MASTER_RSC_A_demote_0"/>
+        <pseudo_event id="25" operation="demote" operation_key="PROMOTABLE_RSC_A_demote_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="5">
     <action_set>
       <rsc_op id="2" operation="delete" operation_key="NATIVE_RSC_A:0_delete_0" on_node="fc16-builder2" on_node_uuid="fc16-builder2">
         <primitive id="NATIVE_RSC_A" long-id="NATIVE_RSC_A:0" class="ocf" provider="pacemaker" type="Stateful"/>
         <attributes CRM_meta_clone="0" CRM_meta_clone_max="1" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_on_node="fc16-builder2" CRM_meta_on_node_uuid="fc16-builder2" CRM_meta_promoted_max="1" CRM_meta_promoted_node_max="1" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="5" operation="stop" operation_key="NATIVE_RSC_A:0_stop_0" on_node="fc16-builder" on_node_uuid="fc16-builder"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="6" priority="1000000">
     <action_set>
-      <pseudo_event id="30" operation="notified" operation_key="MASTER_RSC_A_confirmed-post_notify_demoted_0">
+      <pseudo_event id="30" operation="notified" operation_key="PROMOTABLE_RSC_A_confirmed-post_notify_demoted_0">
         <attributes CRM_meta_clone_max="1" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_key_operation="demoted" CRM_meta_notify_key_type="confirmed-post" CRM_meta_notify_operation="demote" CRM_meta_notify_type="post" CRM_meta_promoted_max="1" CRM_meta_promoted_node_max="1" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="29" operation="notify" operation_key="MASTER_RSC_A_post_notify_demoted_0"/>
+        <pseudo_event id="29" operation="notify" operation_key="PROMOTABLE_RSC_A_post_notify_demoted_0"/>
       </trigger>
       <trigger>
         <rsc_op id="38" operation="notify" operation_key="NATIVE_RSC_A:0_post_notify_demote_0" on_node="fc16-builder" on_node_uuid="fc16-builder"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="7" priority="1000000">
     <action_set>
-      <pseudo_event id="29" operation="notify" operation_key="MASTER_RSC_A_post_notify_demoted_0">
+      <pseudo_event id="29" operation="notify" operation_key="PROMOTABLE_RSC_A_post_notify_demoted_0">
         <attributes CRM_meta_clone_max="1" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_key_operation="demoted" CRM_meta_notify_key_type="post" CRM_meta_notify_operation="demote" CRM_meta_notify_type="post" CRM_meta_promoted_max="1" CRM_meta_promoted_node_max="1" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="26" operation="demoted" operation_key="MASTER_RSC_A_demoted_0"/>
+        <pseudo_event id="26" operation="demoted" operation_key="PROMOTABLE_RSC_A_demoted_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="28" operation="notified" operation_key="MASTER_RSC_A_confirmed-pre_notify_demote_0"/>
+        <pseudo_event id="28" operation="notified" operation_key="PROMOTABLE_RSC_A_confirmed-pre_notify_demote_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="8">
     <action_set>
-      <pseudo_event id="28" operation="notified" operation_key="MASTER_RSC_A_confirmed-pre_notify_demote_0">
+      <pseudo_event id="28" operation="notified" operation_key="PROMOTABLE_RSC_A_confirmed-pre_notify_demote_0">
         <attributes CRM_meta_clone_max="1" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_key_operation="demote" CRM_meta_notify_key_type="confirmed-pre" CRM_meta_notify_operation="demote" CRM_meta_notify_type="pre" CRM_meta_promoted_max="1" CRM_meta_promoted_node_max="1" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="27" operation="notify" operation_key="MASTER_RSC_A_pre_notify_demote_0"/>
+        <pseudo_event id="27" operation="notify" operation_key="PROMOTABLE_RSC_A_pre_notify_demote_0"/>
       </trigger>
       <trigger>
         <rsc_op id="37" operation="notify" operation_key="NATIVE_RSC_A:0_pre_notify_demote_0" on_node="fc16-builder" on_node_uuid="fc16-builder"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="9">
     <action_set>
-      <pseudo_event id="27" operation="notify" operation_key="MASTER_RSC_A_pre_notify_demote_0">
+      <pseudo_event id="27" operation="notify" operation_key="PROMOTABLE_RSC_A_pre_notify_demote_0">
         <attributes CRM_meta_clone_max="1" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_key_operation="demote" CRM_meta_notify_key_type="pre" CRM_meta_notify_operation="demote" CRM_meta_notify_type="pre" CRM_meta_promoted_max="1" CRM_meta_promoted_node_max="1" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs/>
   </synapse>
   <synapse id="10" priority="1000000">
     <action_set>
-      <pseudo_event id="26" operation="demoted" operation_key="MASTER_RSC_A_demoted_0">
+      <pseudo_event id="26" operation="demoted" operation_key="PROMOTABLE_RSC_A_demoted_0">
         <attributes CRM_meta_clone_max="1" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_promoted_max="1" CRM_meta_promoted_node_max="1" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="4" operation="demote" operation_key="NATIVE_RSC_A:0_demote_0" on_node="fc16-builder" on_node_uuid="fc16-builder"/>
       </trigger>
       <trigger>
-        <pseudo_event id="25" operation="demote" operation_key="MASTER_RSC_A_demote_0"/>
+        <pseudo_event id="25" operation="demote" operation_key="PROMOTABLE_RSC_A_demote_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="11">
     <action_set>
-      <pseudo_event id="25" operation="demote" operation_key="MASTER_RSC_A_demote_0">
+      <pseudo_event id="25" operation="demote" operation_key="PROMOTABLE_RSC_A_demote_0">
         <attributes CRM_meta_clone_max="1" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_promoted_max="1" CRM_meta_promoted_node_max="1" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="28" operation="notified" operation_key="MASTER_RSC_A_confirmed-pre_notify_demote_0"/>
+        <pseudo_event id="28" operation="notified" operation_key="PROMOTABLE_RSC_A_confirmed-pre_notify_demote_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="12" priority="1000000">
     <action_set>
-      <pseudo_event id="18" operation="notified" operation_key="MASTER_RSC_A_confirmed-post_notify_stopped_0">
+      <pseudo_event id="18" operation="notified" operation_key="PROMOTABLE_RSC_A_confirmed-post_notify_stopped_0">
         <attributes CRM_meta_clone_max="1" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_key_operation="stopped" CRM_meta_notify_key_type="confirmed-post" CRM_meta_notify_operation="stop" CRM_meta_notify_type="post" CRM_meta_promoted_max="1" CRM_meta_promoted_node_max="1" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="17" operation="notify" operation_key="MASTER_RSC_A_post_notify_stopped_0"/>
+        <pseudo_event id="17" operation="notify" operation_key="PROMOTABLE_RSC_A_post_notify_stopped_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="13" priority="1000000">
     <action_set>
-      <pseudo_event id="17" operation="notify" operation_key="MASTER_RSC_A_post_notify_stopped_0">
+      <pseudo_event id="17" operation="notify" operation_key="PROMOTABLE_RSC_A_post_notify_stopped_0">
         <attributes CRM_meta_clone_max="1" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_key_operation="stopped" CRM_meta_notify_key_type="post" CRM_meta_notify_operation="stop" CRM_meta_notify_type="post" CRM_meta_promoted_max="1" CRM_meta_promoted_node_max="1" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="14" operation="stopped" operation_key="MASTER_RSC_A_stopped_0"/>
+        <pseudo_event id="14" operation="stopped" operation_key="PROMOTABLE_RSC_A_stopped_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="16" operation="notified" operation_key="MASTER_RSC_A_confirmed-pre_notify_stop_0"/>
+        <pseudo_event id="16" operation="notified" operation_key="PROMOTABLE_RSC_A_confirmed-pre_notify_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="14">
     <action_set>
-      <pseudo_event id="16" operation="notified" operation_key="MASTER_RSC_A_confirmed-pre_notify_stop_0">
+      <pseudo_event id="16" operation="notified" operation_key="PROMOTABLE_RSC_A_confirmed-pre_notify_stop_0">
         <attributes CRM_meta_clone_max="1" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_key_operation="stop" CRM_meta_notify_key_type="confirmed-pre" CRM_meta_notify_operation="stop" CRM_meta_notify_type="pre" CRM_meta_promoted_max="1" CRM_meta_promoted_node_max="1" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="15" operation="notify" operation_key="MASTER_RSC_A_pre_notify_stop_0"/>
+        <pseudo_event id="15" operation="notify" operation_key="PROMOTABLE_RSC_A_pre_notify_stop_0"/>
       </trigger>
       <trigger>
         <rsc_op id="36" operation="notify" operation_key="NATIVE_RSC_A:0_pre_notify_stop_0" on_node="fc16-builder" on_node_uuid="fc16-builder"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="15">
     <action_set>
-      <pseudo_event id="15" operation="notify" operation_key="MASTER_RSC_A_pre_notify_stop_0">
+      <pseudo_event id="15" operation="notify" operation_key="PROMOTABLE_RSC_A_pre_notify_stop_0">
         <attributes CRM_meta_clone_max="1" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_key_operation="stop" CRM_meta_notify_key_type="pre" CRM_meta_notify_operation="stop" CRM_meta_notify_type="pre" CRM_meta_promoted_max="1" CRM_meta_promoted_node_max="1" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="30" operation="notified" operation_key="MASTER_RSC_A_confirmed-post_notify_demoted_0"/>
+        <pseudo_event id="30" operation="notified" operation_key="PROMOTABLE_RSC_A_confirmed-post_notify_demoted_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="16" priority="1000000">
     <action_set>
-      <pseudo_event id="14" operation="stopped" operation_key="MASTER_RSC_A_stopped_0">
+      <pseudo_event id="14" operation="stopped" operation_key="PROMOTABLE_RSC_A_stopped_0">
         <attributes CRM_meta_clone_max="1" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_promoted_max="1" CRM_meta_promoted_node_max="1" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="5" operation="stop" operation_key="NATIVE_RSC_A:0_stop_0" on_node="fc16-builder" on_node_uuid="fc16-builder"/>
       </trigger>
       <trigger>
-        <pseudo_event id="13" operation="stop" operation_key="MASTER_RSC_A_stop_0"/>
+        <pseudo_event id="13" operation="stop" operation_key="PROMOTABLE_RSC_A_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="17">
     <action_set>
-      <pseudo_event id="13" operation="stop" operation_key="MASTER_RSC_A_stop_0">
+      <pseudo_event id="13" operation="stop" operation_key="PROMOTABLE_RSC_A_stop_0">
         <attributes CRM_meta_clone_max="1" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_promoted_max="1" CRM_meta_promoted_node_max="1" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="16" operation="notified" operation_key="MASTER_RSC_A_confirmed-pre_notify_stop_0"/>
+        <pseudo_event id="16" operation="notified" operation_key="PROMOTABLE_RSC_A_confirmed-pre_notify_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="26" operation="demoted" operation_key="MASTER_RSC_A_demoted_0"/>
+        <pseudo_event id="26" operation="demoted" operation_key="PROMOTABLE_RSC_A_demoted_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="18">
     <action_set>
       <rsc_op id="31" operation="stop" operation_key="NATIVE_RSC_B_stop_0" on_node="fc16-builder2" on_node_uuid="fc16-builder2">
         <primitive id="NATIVE_RSC_B" class="ocf" provider="pacemaker" type="Dummy"/>
         <attributes CRM_meta_name="stop" CRM_meta_on_node="fc16-builder2" CRM_meta_on_node_uuid="fc16-builder2" CRM_meta_timeout="100000" />
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="18" operation="notified" operation_key="MASTER_RSC_A_confirmed-post_notify_stopped_0"/>
+        <pseudo_event id="18" operation="notified" operation_key="PROMOTABLE_RSC_A_confirmed-post_notify_stopped_0"/>
       </trigger>
     </inputs>
   </synapse>
 </transition_graph>
diff --git a/cts/scheduler/exp/order_constraint_stops_unpromoted.exp b/cts/scheduler/exp/order_constraint_stops_unpromoted.exp
index 2d3715fdf1..9116b8a62d 100644
--- a/cts/scheduler/exp/order_constraint_stops_unpromoted.exp
+++ b/cts/scheduler/exp/order_constraint_stops_unpromoted.exp
@@ -1,118 +1,118 @@
 <transition_graph cluster-delay="60s" stonith-timeout="60s" failed-stop-offset="INFINITY" failed-start-offset="INFINITY"  transition_id="0">
   <synapse id="0">
     <action_set>
       <rsc_op id="31" operation="notify" operation_key="NATIVE_RSC_A:0_pre_notify_stop_0" on_node="fc16-builder" on_node_uuid="fc16-builder">
         <primitive id="NATIVE_RSC_A" long-id="NATIVE_RSC_A:0" class="ocf" provider="pacemaker" type="Stateful"/>
         <attributes CRM_meta_clone="0" CRM_meta_clone_max="1" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="0" CRM_meta_master_node_max="0" CRM_meta_notify="true" CRM_meta_notify_active_resource="NATIVE_RSC_A:0" CRM_meta_notify_active_uname="fc16-builder" CRM_meta_notify_all_uname="fc16-builder fc16-builder2" CRM_meta_notify_available_uname="fc16-builder fc16-builder2" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="stop" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="stop" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_promoted_resource=" " CRM_meta_notify_promoted_uname=" " CRM_meta_notify_slave_resource="NATIVE_RSC_A:0" CRM_meta_notify_slave_uname="fc16-builder" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="NATIVE_RSC_A:0" CRM_meta_notify_stop_uname="fc16-builder" CRM_meta_notify_type="pre" CRM_meta_notify_unpromoted_resource="NATIVE_RSC_A:0" CRM_meta_notify_unpromoted_uname="fc16-builder" CRM_meta_on_node="fc16-builder" CRM_meta_on_node_uuid="fc16-builder" CRM_meta_promoted_max="0" CRM_meta_promoted_node_max="0" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="12" operation="notify" operation_key="MASTER_RSC_A_pre_notify_stop_0"/>
+        <pseudo_event id="12" operation="notify" operation_key="PROMOTABLE_RSC_A_pre_notify_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="1">
     <action_set>
       <rsc_op id="3" operation="stop" operation_key="NATIVE_RSC_A:0_stop_0" on_node="fc16-builder" on_node_uuid="fc16-builder">
         <primitive id="NATIVE_RSC_A" long-id="NATIVE_RSC_A:0" class="ocf" provider="pacemaker" type="Stateful"/>
         <attributes CRM_meta_clone="0" CRM_meta_clone_max="1" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="0" CRM_meta_master_node_max="0" CRM_meta_name="stop" CRM_meta_notify="true" CRM_meta_notify_active_resource="NATIVE_RSC_A:0" CRM_meta_notify_active_uname="fc16-builder" CRM_meta_notify_all_uname="fc16-builder fc16-builder2" CRM_meta_notify_available_uname="fc16-builder fc16-builder2" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource=" " CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_promoted_resource=" " CRM_meta_notify_promoted_uname=" " CRM_meta_notify_slave_resource="NATIVE_RSC_A:0" CRM_meta_notify_slave_uname="fc16-builder" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="NATIVE_RSC_A:0" CRM_meta_notify_stop_uname="fc16-builder" CRM_meta_notify_unpromoted_resource="NATIVE_RSC_A:0" CRM_meta_notify_unpromoted_uname="fc16-builder" CRM_meta_on_node="fc16-builder" CRM_meta_on_node_uuid="fc16-builder" CRM_meta_promoted_max="0" CRM_meta_promoted_node_max="0" CRM_meta_timeout="100000" />
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="10" operation="stop" operation_key="MASTER_RSC_A_stop_0"/>
+        <pseudo_event id="10" operation="stop" operation_key="PROMOTABLE_RSC_A_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="2" priority="1000000">
     <action_set>
-      <pseudo_event id="15" operation="notified" operation_key="MASTER_RSC_A_confirmed-post_notify_stopped_0">
+      <pseudo_event id="15" operation="notified" operation_key="PROMOTABLE_RSC_A_confirmed-post_notify_stopped_0">
         <attributes CRM_meta_clone_max="1" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="0" CRM_meta_master_node_max="0" CRM_meta_notify="true" CRM_meta_notify_key_operation="stopped" CRM_meta_notify_key_type="confirmed-post" CRM_meta_notify_operation="stop" CRM_meta_notify_type="post" CRM_meta_promoted_max="0" CRM_meta_promoted_node_max="0" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="14" operation="notify" operation_key="MASTER_RSC_A_post_notify_stopped_0"/>
+        <pseudo_event id="14" operation="notify" operation_key="PROMOTABLE_RSC_A_post_notify_stopped_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="3" priority="1000000">
     <action_set>
-      <pseudo_event id="14" operation="notify" operation_key="MASTER_RSC_A_post_notify_stopped_0">
+      <pseudo_event id="14" operation="notify" operation_key="PROMOTABLE_RSC_A_post_notify_stopped_0">
         <attributes CRM_meta_clone_max="1" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="0" CRM_meta_master_node_max="0" CRM_meta_notify="true" CRM_meta_notify_key_operation="stopped" CRM_meta_notify_key_type="post" CRM_meta_notify_operation="stop" CRM_meta_notify_type="post" CRM_meta_promoted_max="0" CRM_meta_promoted_node_max="0" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="11" operation="stopped" operation_key="MASTER_RSC_A_stopped_0"/>
+        <pseudo_event id="11" operation="stopped" operation_key="PROMOTABLE_RSC_A_stopped_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="13" operation="notified" operation_key="MASTER_RSC_A_confirmed-pre_notify_stop_0"/>
+        <pseudo_event id="13" operation="notified" operation_key="PROMOTABLE_RSC_A_confirmed-pre_notify_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="4">
     <action_set>
-      <pseudo_event id="13" operation="notified" operation_key="MASTER_RSC_A_confirmed-pre_notify_stop_0">
+      <pseudo_event id="13" operation="notified" operation_key="PROMOTABLE_RSC_A_confirmed-pre_notify_stop_0">
         <attributes CRM_meta_clone_max="1" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="0" CRM_meta_master_node_max="0" CRM_meta_notify="true" CRM_meta_notify_key_operation="stop" CRM_meta_notify_key_type="confirmed-pre" CRM_meta_notify_operation="stop" CRM_meta_notify_type="pre" CRM_meta_promoted_max="0" CRM_meta_promoted_node_max="0" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="12" operation="notify" operation_key="MASTER_RSC_A_pre_notify_stop_0"/>
+        <pseudo_event id="12" operation="notify" operation_key="PROMOTABLE_RSC_A_pre_notify_stop_0"/>
       </trigger>
       <trigger>
         <rsc_op id="31" operation="notify" operation_key="NATIVE_RSC_A:0_pre_notify_stop_0" on_node="fc16-builder" on_node_uuid="fc16-builder"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="5">
     <action_set>
-      <pseudo_event id="12" operation="notify" operation_key="MASTER_RSC_A_pre_notify_stop_0">
+      <pseudo_event id="12" operation="notify" operation_key="PROMOTABLE_RSC_A_pre_notify_stop_0">
         <attributes CRM_meta_clone_max="1" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="0" CRM_meta_master_node_max="0" CRM_meta_notify="true" CRM_meta_notify_key_operation="stop" CRM_meta_notify_key_type="pre" CRM_meta_notify_operation="stop" CRM_meta_notify_type="pre" CRM_meta_promoted_max="0" CRM_meta_promoted_node_max="0" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs/>
   </synapse>
   <synapse id="6" priority="1000000">
     <action_set>
-      <pseudo_event id="11" operation="stopped" operation_key="MASTER_RSC_A_stopped_0">
+      <pseudo_event id="11" operation="stopped" operation_key="PROMOTABLE_RSC_A_stopped_0">
         <attributes CRM_meta_clone_max="1" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="0" CRM_meta_master_node_max="0" CRM_meta_notify="true" CRM_meta_promoted_max="0" CRM_meta_promoted_node_max="0" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="3" operation="stop" operation_key="NATIVE_RSC_A:0_stop_0" on_node="fc16-builder" on_node_uuid="fc16-builder"/>
       </trigger>
       <trigger>
-        <pseudo_event id="10" operation="stop" operation_key="MASTER_RSC_A_stop_0"/>
+        <pseudo_event id="10" operation="stop" operation_key="PROMOTABLE_RSC_A_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="7">
     <action_set>
-      <pseudo_event id="10" operation="stop" operation_key="MASTER_RSC_A_stop_0">
+      <pseudo_event id="10" operation="stop" operation_key="PROMOTABLE_RSC_A_stop_0">
         <attributes CRM_meta_clone_max="1" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="0" CRM_meta_master_node_max="0" CRM_meta_notify="true" CRM_meta_promoted_max="0" CRM_meta_promoted_node_max="0" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="13" operation="notified" operation_key="MASTER_RSC_A_confirmed-pre_notify_stop_0"/>
+        <pseudo_event id="13" operation="notified" operation_key="PROMOTABLE_RSC_A_confirmed-pre_notify_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="8">
     <action_set>
       <rsc_op id="28" operation="stop" operation_key="NATIVE_RSC_B_stop_0" on_node="fc16-builder" on_node_uuid="fc16-builder">
         <primitive id="NATIVE_RSC_B" class="ocf" provider="pacemaker" type="Dummy"/>
         <attributes CRM_meta_name="stop" CRM_meta_on_node="fc16-builder" CRM_meta_on_node_uuid="fc16-builder" CRM_meta_timeout="100000" />
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="15" operation="notified" operation_key="MASTER_RSC_A_confirmed-post_notify_stopped_0"/>
+        <pseudo_event id="15" operation="notified" operation_key="PROMOTABLE_RSC_A_confirmed-post_notify_stopped_0"/>
       </trigger>
     </inputs>
   </synapse>
 </transition_graph>
diff --git a/cts/scheduler/scores/colocation_constraint_stops_promoted.scores b/cts/scheduler/scores/colocation_constraint_stops_promoted.scores
index 849a49c94b..a618e7b847 100644
--- a/cts/scheduler/scores/colocation_constraint_stops_promoted.scores
+++ b/cts/scheduler/scores/colocation_constraint_stops_promoted.scores
@@ -1,9 +1,9 @@
 
 NATIVE_RSC_A:0 promotion score on none: 0
 NATIVE_RSC_A:1 promotion score on none: 0
-pcmk__clone_allocate: MASTER_RSC_A allocation score on fc16-builder2: -INFINITY
-pcmk__clone_allocate: MASTER_RSC_A allocation score on fc16-builder: -INFINITY
 pcmk__clone_allocate: NATIVE_RSC_A:0 allocation score on fc16-builder2: -INFINITY
 pcmk__clone_allocate: NATIVE_RSC_A:0 allocation score on fc16-builder: -INFINITY
+pcmk__clone_allocate: PROMOTABLE_RSC_A allocation score on fc16-builder2: -INFINITY
+pcmk__clone_allocate: PROMOTABLE_RSC_A allocation score on fc16-builder: -INFINITY
 pcmk__primitive_assign: NATIVE_RSC_A:0 allocation score on fc16-builder2: -INFINITY
 pcmk__primitive_assign: NATIVE_RSC_A:0 allocation score on fc16-builder: -INFINITY
diff --git a/cts/scheduler/scores/colocation_constraint_stops_unpromoted.scores b/cts/scheduler/scores/colocation_constraint_stops_unpromoted.scores
index cce6606ab9..ad61d6565c 100644
--- a/cts/scheduler/scores/colocation_constraint_stops_unpromoted.scores
+++ b/cts/scheduler/scores/colocation_constraint_stops_unpromoted.scores
@@ -1,10 +1,10 @@
 
 NATIVE_RSC_A:0 promotion score on none: 0
-pcmk__clone_allocate: MASTER_RSC_A allocation score on fc16-builder2: -INFINITY
-pcmk__clone_allocate: MASTER_RSC_A allocation score on fc16-builder: -INFINITY
 pcmk__clone_allocate: NATIVE_RSC_A:0 allocation score on fc16-builder2: -INFINITY
 pcmk__clone_allocate: NATIVE_RSC_A:0 allocation score on fc16-builder: -INFINITY
+pcmk__clone_allocate: PROMOTABLE_RSC_A allocation score on fc16-builder2: -INFINITY
+pcmk__clone_allocate: PROMOTABLE_RSC_A allocation score on fc16-builder: -INFINITY
 pcmk__primitive_assign: NATIVE_RSC_A:0 allocation score on fc16-builder2: -INFINITY
 pcmk__primitive_assign: NATIVE_RSC_A:0 allocation score on fc16-builder: -INFINITY
 pcmk__primitive_assign: NATIVE_RSC_B allocation score on fc16-builder2: -INFINITY
 pcmk__primitive_assign: NATIVE_RSC_B allocation score on fc16-builder: -INFINITY
diff --git a/cts/scheduler/scores/order_constraint_stops_promoted.scores b/cts/scheduler/scores/order_constraint_stops_promoted.scores
index db8fb2cf95..a1df0378f4 100644
--- a/cts/scheduler/scores/order_constraint_stops_promoted.scores
+++ b/cts/scheduler/scores/order_constraint_stops_promoted.scores
@@ -1,11 +1,11 @@
 
 NATIVE_RSC_A:0 promotion score on fc16-builder: 10
 NATIVE_RSC_A:1 promotion score on none: 0
-pcmk__clone_allocate: MASTER_RSC_A allocation score on fc16-builder2: -INFINITY
-pcmk__clone_allocate: MASTER_RSC_A allocation score on fc16-builder: 0
 pcmk__clone_allocate: NATIVE_RSC_A:0 allocation score on fc16-builder2: -INFINITY
 pcmk__clone_allocate: NATIVE_RSC_A:0 allocation score on fc16-builder: 11
+pcmk__clone_allocate: PROMOTABLE_RSC_A allocation score on fc16-builder2: -INFINITY
+pcmk__clone_allocate: PROMOTABLE_RSC_A allocation score on fc16-builder: 0
 pcmk__primitive_assign: NATIVE_RSC_A:0 allocation score on fc16-builder2: -INFINITY
 pcmk__primitive_assign: NATIVE_RSC_A:0 allocation score on fc16-builder: 11
 pcmk__primitive_assign: NATIVE_RSC_B allocation score on fc16-builder2: -INFINITY
 pcmk__primitive_assign: NATIVE_RSC_B allocation score on fc16-builder: -INFINITY
diff --git a/cts/scheduler/scores/order_constraint_stops_unpromoted.scores b/cts/scheduler/scores/order_constraint_stops_unpromoted.scores
index 05400d2d95..5cfc2a7fc9 100644
--- a/cts/scheduler/scores/order_constraint_stops_unpromoted.scores
+++ b/cts/scheduler/scores/order_constraint_stops_unpromoted.scores
@@ -1,10 +1,10 @@
 
 NATIVE_RSC_A:0 promotion score on fc16-builder: 5
-pcmk__clone_allocate: MASTER_RSC_A allocation score on fc16-builder2: 0
-pcmk__clone_allocate: MASTER_RSC_A allocation score on fc16-builder: 0
 pcmk__clone_allocate: NATIVE_RSC_A:0 allocation score on fc16-builder2: 0
 pcmk__clone_allocate: NATIVE_RSC_A:0 allocation score on fc16-builder: 6
+pcmk__clone_allocate: PROMOTABLE_RSC_A allocation score on fc16-builder2: 0
+pcmk__clone_allocate: PROMOTABLE_RSC_A allocation score on fc16-builder: 0
 pcmk__primitive_assign: NATIVE_RSC_A:0 allocation score on fc16-builder2: -INFINITY
 pcmk__primitive_assign: NATIVE_RSC_A:0 allocation score on fc16-builder: 6
 pcmk__primitive_assign: NATIVE_RSC_B allocation score on fc16-builder2: -INFINITY
 pcmk__primitive_assign: NATIVE_RSC_B allocation score on fc16-builder: -INFINITY
diff --git a/cts/scheduler/summary/colocation_constraint_stops_promoted.summary b/cts/scheduler/summary/colocation_constraint_stops_promoted.summary
index f33575ba12..5d330ebfff 100644
--- a/cts/scheduler/summary/colocation_constraint_stops_promoted.summary
+++ b/cts/scheduler/summary/colocation_constraint_stops_promoted.summary
@@ -1,38 +1,38 @@
 Current cluster status:
   * Node List:
     * Online: [ fc16-builder fc16-builder2 ]
 
   * Full List of Resources:
-    * Clone Set: MASTER_RSC_A [NATIVE_RSC_A] (promotable):
+    * Clone Set: PROMOTABLE_RSC_A [NATIVE_RSC_A] (promotable):
       * Promoted: [ fc16-builder ]
 
 Transition Summary:
   * Stop       NATIVE_RSC_A:0     ( Promoted fc16-builder )  due to node availability
 
 Executing Cluster Transition:
-  * Pseudo action:   MASTER_RSC_A_pre_notify_demote_0
+  * Pseudo action:   PROMOTABLE_RSC_A_pre_notify_demote_0
   * Resource action: NATIVE_RSC_A:0  notify on fc16-builder
-  * Pseudo action:   MASTER_RSC_A_confirmed-pre_notify_demote_0
-  * Pseudo action:   MASTER_RSC_A_demote_0
+  * Pseudo action:   PROMOTABLE_RSC_A_confirmed-pre_notify_demote_0
+  * Pseudo action:   PROMOTABLE_RSC_A_demote_0
   * Resource action: NATIVE_RSC_A:0  demote on fc16-builder
-  * Pseudo action:   MASTER_RSC_A_demoted_0
-  * Pseudo action:   MASTER_RSC_A_post_notify_demoted_0
+  * Pseudo action:   PROMOTABLE_RSC_A_demoted_0
+  * Pseudo action:   PROMOTABLE_RSC_A_post_notify_demoted_0
   * Resource action: NATIVE_RSC_A:0  notify on fc16-builder
-  * Pseudo action:   MASTER_RSC_A_confirmed-post_notify_demoted_0
-  * Pseudo action:   MASTER_RSC_A_pre_notify_stop_0
+  * Pseudo action:   PROMOTABLE_RSC_A_confirmed-post_notify_demoted_0
+  * Pseudo action:   PROMOTABLE_RSC_A_pre_notify_stop_0
   * Resource action: NATIVE_RSC_A:0  notify on fc16-builder
-  * Pseudo action:   MASTER_RSC_A_confirmed-pre_notify_stop_0
-  * Pseudo action:   MASTER_RSC_A_stop_0
+  * Pseudo action:   PROMOTABLE_RSC_A_confirmed-pre_notify_stop_0
+  * Pseudo action:   PROMOTABLE_RSC_A_stop_0
   * Resource action: NATIVE_RSC_A:0  stop on fc16-builder
   * Resource action: NATIVE_RSC_A:0  delete on fc16-builder2
-  * Pseudo action:   MASTER_RSC_A_stopped_0
-  * Pseudo action:   MASTER_RSC_A_post_notify_stopped_0
-  * Pseudo action:   MASTER_RSC_A_confirmed-post_notify_stopped_0
+  * Pseudo action:   PROMOTABLE_RSC_A_stopped_0
+  * Pseudo action:   PROMOTABLE_RSC_A_post_notify_stopped_0
+  * Pseudo action:   PROMOTABLE_RSC_A_confirmed-post_notify_stopped_0
 
 Revised Cluster Status:
   * Node List:
     * Online: [ fc16-builder fc16-builder2 ]
 
   * Full List of Resources:
-    * Clone Set: MASTER_RSC_A [NATIVE_RSC_A] (promotable):
+    * Clone Set: PROMOTABLE_RSC_A [NATIVE_RSC_A] (promotable):
       * Stopped: [ fc16-builder fc16-builder2 ]
diff --git a/cts/scheduler/summary/colocation_constraint_stops_unpromoted.summary b/cts/scheduler/summary/colocation_constraint_stops_unpromoted.summary
index 00d33a0307..32047e9b49 100644
--- a/cts/scheduler/summary/colocation_constraint_stops_unpromoted.summary
+++ b/cts/scheduler/summary/colocation_constraint_stops_unpromoted.summary
@@ -1,36 +1,36 @@
 1 of 2 resource instances DISABLED and 0 BLOCKED from further action due to failure
 
 Current cluster status:
   * Node List:
     * Online: [ fc16-builder ]
     * OFFLINE: [ fc16-builder2 ]
 
   * Full List of Resources:
-    * Clone Set: MASTER_RSC_A [NATIVE_RSC_A] (promotable):
+    * Clone Set: PROMOTABLE_RSC_A [NATIVE_RSC_A] (promotable):
       * Unpromoted: [ fc16-builder ]
     * NATIVE_RSC_B	(ocf:pacemaker:Dummy):	 Started fc16-builder (disabled)
 
 Transition Summary:
   * Stop       NATIVE_RSC_A:0     ( Unpromoted fc16-builder )  due to node availability
   * Stop       NATIVE_RSC_B       (            fc16-builder )  due to node availability
 
 Executing Cluster Transition:
-  * Pseudo action:   MASTER_RSC_A_pre_notify_stop_0
+  * Pseudo action:   PROMOTABLE_RSC_A_pre_notify_stop_0
   * Resource action: NATIVE_RSC_B    stop on fc16-builder
   * Resource action: NATIVE_RSC_A:0  notify on fc16-builder
-  * Pseudo action:   MASTER_RSC_A_confirmed-pre_notify_stop_0
-  * Pseudo action:   MASTER_RSC_A_stop_0
+  * Pseudo action:   PROMOTABLE_RSC_A_confirmed-pre_notify_stop_0
+  * Pseudo action:   PROMOTABLE_RSC_A_stop_0
   * Resource action: NATIVE_RSC_A:0  stop on fc16-builder
-  * Pseudo action:   MASTER_RSC_A_stopped_0
-  * Pseudo action:   MASTER_RSC_A_post_notify_stopped_0
-  * Pseudo action:   MASTER_RSC_A_confirmed-post_notify_stopped_0
+  * Pseudo action:   PROMOTABLE_RSC_A_stopped_0
+  * Pseudo action:   PROMOTABLE_RSC_A_post_notify_stopped_0
+  * Pseudo action:   PROMOTABLE_RSC_A_confirmed-post_notify_stopped_0
 
 Revised Cluster Status:
   * Node List:
     * Online: [ fc16-builder ]
     * OFFLINE: [ fc16-builder2 ]
 
   * Full List of Resources:
-    * Clone Set: MASTER_RSC_A [NATIVE_RSC_A] (promotable):
+    * Clone Set: PROMOTABLE_RSC_A [NATIVE_RSC_A] (promotable):
       * Stopped: [ fc16-builder fc16-builder2 ]
     * NATIVE_RSC_B	(ocf:pacemaker:Dummy):	 Stopped (disabled)
diff --git a/cts/scheduler/summary/order_constraint_stops_promoted.summary b/cts/scheduler/summary/order_constraint_stops_promoted.summary
index 8535e36c7e..e888be5e0a 100644
--- a/cts/scheduler/summary/order_constraint_stops_promoted.summary
+++ b/cts/scheduler/summary/order_constraint_stops_promoted.summary
@@ -1,44 +1,44 @@
 1 of 2 resource instances DISABLED and 0 BLOCKED from further action due to failure
 
 Current cluster status:
   * Node List:
     * Online: [ fc16-builder fc16-builder2 ]
 
   * Full List of Resources:
-    * Clone Set: MASTER_RSC_A [NATIVE_RSC_A] (promotable):
+    * Clone Set: PROMOTABLE_RSC_A [NATIVE_RSC_A] (promotable):
       * Promoted: [ fc16-builder ]
     * NATIVE_RSC_B	(ocf:pacemaker:Dummy):	 Started fc16-builder2 (disabled)
 
 Transition Summary:
   * Stop       NATIVE_RSC_A:0     ( Promoted fc16-builder )  due to required NATIVE_RSC_B start
   * Stop       NATIVE_RSC_B       (         fc16-builder2 )  due to node availability
 
 Executing Cluster Transition:
-  * Pseudo action:   MASTER_RSC_A_pre_notify_demote_0
+  * Pseudo action:   PROMOTABLE_RSC_A_pre_notify_demote_0
   * Resource action: NATIVE_RSC_A:0  notify on fc16-builder
-  * Pseudo action:   MASTER_RSC_A_confirmed-pre_notify_demote_0
-  * Pseudo action:   MASTER_RSC_A_demote_0
+  * Pseudo action:   PROMOTABLE_RSC_A_confirmed-pre_notify_demote_0
+  * Pseudo action:   PROMOTABLE_RSC_A_demote_0
   * Resource action: NATIVE_RSC_A:0  demote on fc16-builder
-  * Pseudo action:   MASTER_RSC_A_demoted_0
-  * Pseudo action:   MASTER_RSC_A_post_notify_demoted_0
+  * Pseudo action:   PROMOTABLE_RSC_A_demoted_0
+  * Pseudo action:   PROMOTABLE_RSC_A_post_notify_demoted_0
   * Resource action: NATIVE_RSC_A:0  notify on fc16-builder
-  * Pseudo action:   MASTER_RSC_A_confirmed-post_notify_demoted_0
-  * Pseudo action:   MASTER_RSC_A_pre_notify_stop_0
+  * Pseudo action:   PROMOTABLE_RSC_A_confirmed-post_notify_demoted_0
+  * Pseudo action:   PROMOTABLE_RSC_A_pre_notify_stop_0
   * Resource action: NATIVE_RSC_A:0  notify on fc16-builder
-  * Pseudo action:   MASTER_RSC_A_confirmed-pre_notify_stop_0
-  * Pseudo action:   MASTER_RSC_A_stop_0
+  * Pseudo action:   PROMOTABLE_RSC_A_confirmed-pre_notify_stop_0
+  * Pseudo action:   PROMOTABLE_RSC_A_stop_0
   * Resource action: NATIVE_RSC_A:0  stop on fc16-builder
   * Resource action: NATIVE_RSC_A:0  delete on fc16-builder2
-  * Pseudo action:   MASTER_RSC_A_stopped_0
-  * Pseudo action:   MASTER_RSC_A_post_notify_stopped_0
-  * Pseudo action:   MASTER_RSC_A_confirmed-post_notify_stopped_0
+  * Pseudo action:   PROMOTABLE_RSC_A_stopped_0
+  * Pseudo action:   PROMOTABLE_RSC_A_post_notify_stopped_0
+  * Pseudo action:   PROMOTABLE_RSC_A_confirmed-post_notify_stopped_0
   * Resource action: NATIVE_RSC_B    stop on fc16-builder2
 
 Revised Cluster Status:
   * Node List:
     * Online: [ fc16-builder fc16-builder2 ]
 
   * Full List of Resources:
-    * Clone Set: MASTER_RSC_A [NATIVE_RSC_A] (promotable):
+    * Clone Set: PROMOTABLE_RSC_A [NATIVE_RSC_A] (promotable):
       * Stopped: [ fc16-builder fc16-builder2 ]
     * NATIVE_RSC_B	(ocf:pacemaker:Dummy):	 Stopped (disabled)
diff --git a/cts/scheduler/summary/order_constraint_stops_unpromoted.summary b/cts/scheduler/summary/order_constraint_stops_unpromoted.summary
index 23efd1fe67..2898d2ec98 100644
--- a/cts/scheduler/summary/order_constraint_stops_unpromoted.summary
+++ b/cts/scheduler/summary/order_constraint_stops_unpromoted.summary
@@ -1,36 +1,36 @@
 1 of 2 resource instances DISABLED and 0 BLOCKED from further action due to failure
 
 Current cluster status:
   * Node List:
     * Online: [ fc16-builder ]
     * OFFLINE: [ fc16-builder2 ]
 
   * Full List of Resources:
-    * Clone Set: MASTER_RSC_A [NATIVE_RSC_A] (promotable):
+    * Clone Set: PROMOTABLE_RSC_A [NATIVE_RSC_A] (promotable):
       * Unpromoted: [ fc16-builder ]
     * NATIVE_RSC_B	(ocf:pacemaker:Dummy):	 Started fc16-builder (disabled)
 
 Transition Summary:
   * Stop       NATIVE_RSC_A:0     ( Unpromoted fc16-builder )  due to required NATIVE_RSC_B start
   * Stop       NATIVE_RSC_B       (            fc16-builder )  due to node availability
 
 Executing Cluster Transition:
-  * Pseudo action:   MASTER_RSC_A_pre_notify_stop_0
+  * Pseudo action:   PROMOTABLE_RSC_A_pre_notify_stop_0
   * Resource action: NATIVE_RSC_A:0  notify on fc16-builder
-  * Pseudo action:   MASTER_RSC_A_confirmed-pre_notify_stop_0
-  * Pseudo action:   MASTER_RSC_A_stop_0
+  * Pseudo action:   PROMOTABLE_RSC_A_confirmed-pre_notify_stop_0
+  * Pseudo action:   PROMOTABLE_RSC_A_stop_0
   * Resource action: NATIVE_RSC_A:0  stop on fc16-builder
-  * Pseudo action:   MASTER_RSC_A_stopped_0
-  * Pseudo action:   MASTER_RSC_A_post_notify_stopped_0
-  * Pseudo action:   MASTER_RSC_A_confirmed-post_notify_stopped_0
+  * Pseudo action:   PROMOTABLE_RSC_A_stopped_0
+  * Pseudo action:   PROMOTABLE_RSC_A_post_notify_stopped_0
+  * Pseudo action:   PROMOTABLE_RSC_A_confirmed-post_notify_stopped_0
   * Resource action: NATIVE_RSC_B    stop on fc16-builder
 
 Revised Cluster Status:
   * Node List:
     * Online: [ fc16-builder ]
     * OFFLINE: [ fc16-builder2 ]
 
   * Full List of Resources:
-    * Clone Set: MASTER_RSC_A [NATIVE_RSC_A] (promotable):
+    * Clone Set: PROMOTABLE_RSC_A [NATIVE_RSC_A] (promotable):
       * Stopped: [ fc16-builder fc16-builder2 ]
     * NATIVE_RSC_B	(ocf:pacemaker:Dummy):	 Stopped (disabled)
diff --git a/cts/scheduler/xml/colocation_constraint_stops_promoted.xml b/cts/scheduler/xml/colocation_constraint_stops_promoted.xml
index bd2abf383e..98ff442bd9 100644
--- a/cts/scheduler/xml/colocation_constraint_stops_promoted.xml
+++ b/cts/scheduler/xml/colocation_constraint_stops_promoted.xml
@@ -1,85 +1,85 @@
 <cib epoch="16" num_updates="25" admin_epoch="0" validate-with="pacemaker-3.7" crm_feature_set="3.0.6" update-origin="fc16-builder" update-client="cibadmin" cib-last-written="Fri Jul 13 13:51:04 2012" have-quorum="1" dc-uuid="fc16-builder2">
   <configuration>
     <crm_config>
       <cluster_property_set id="cib-bootstrap-options">
         <nvpair id="cib-bootstrap-options-dc-version" name="dc-version" value="1.1.7-fe859a7"/>
         <nvpair id="cib-bootstrap-options-cluster-infrastructure" name="cluster-infrastructure" value="corosync"/>
         <nvpair id="cib-bootstrap-options-stonith-enabled" name="stonith-enabled" value="false"/>
         <nvpair id="cib-bootstrap-options-no-quorum-policy" name="no-quorum-policy" value="ignore"/>
       </cluster_property_set>
     </crm_config>
     <nodes>
       <node id="fc16-builder" type="member" uname="fc16-builder">
         <instance_attributes id="fc16-builder-instance_attributes">
           <nvpair id="fc16-builder-stuffs" name="give-me-A" value="false"/>
         </instance_attributes>
       </node>
       <node id="fc16-builder2" uname="fc16-builder2" type="member">
         <instance_attributes id="fc16-builder2-instance_attributes">
           <nvpair id="fc16-builder2-stuffs" name="give-me-A" value="false"/>
         </instance_attributes>
       </node>
     </nodes>
     <resources>
-      <clone id="MASTER_RSC_A">
-        <meta_attributes id="MASTER_RSC_A-meta_attributes">
-          <nvpair id="MASTER_RSC_A-meta_attributes-promotable" name="promotable" value="true"/>
-          <nvpair id="MASTER_RSC_A-meta_attributes-promoted-max" name="promoted-max" value="1"/>
-          <nvpair id="MASTER_RSC_A-meta_attributes-promoted-node-max" name="promoted-node-max" value="1"/>
-          <nvpair id="MASTER_RSC_A-meta_attributes-clone-max" name="clone-max" value="1"/>
-          <nvpair id="MASTER_RSC_A-meta_attributes-clone-node-max" name="clone-node-max" value="1"/>
-          <nvpair id="MASTER_RSC_A-meta_attributes-notify" name="notify" value="true"/>
-          <nvpair id="MASTER_RSC_A-meta_attributes-target-role" name="target-role" value="Started"/>
+      <clone id="PROMOTABLE_RSC_A">
+        <meta_attributes id="PROMOTABLE_RSC_A-meta_attributes">
+          <nvpair id="PROMOTABLE_RSC_A-meta_attributes-promotable" name="promotable" value="true"/>
+          <nvpair id="PROMOTABLE_RSC_A-meta_attributes-promoted-max" name="promoted-max" value="1"/>
+          <nvpair id="PROMOTABLE_RSC_A-meta_attributes-promoted-node-max" name="promoted-node-max" value="1"/>
+          <nvpair id="PROMOTABLE_RSC_A-meta_attributes-clone-max" name="clone-max" value="1"/>
+          <nvpair id="PROMOTABLE_RSC_A-meta_attributes-clone-node-max" name="clone-node-max" value="1"/>
+          <nvpair id="PROMOTABLE_RSC_A-meta_attributes-notify" name="notify" value="true"/>
+          <nvpair id="PROMOTABLE_RSC_A-meta_attributes-target-role" name="target-role" value="Started"/>
         </meta_attributes>
         <primitive class="ocf" id="NATIVE_RSC_A" provider="pacemaker" type="Stateful">
           <operations>
             <op id="NATIVE_RSC_A-start-0" interval="0" name="start" timeout="240"/>
             <op id="NATIVE_RSC_A-stop-0" interval="0" name="stop" timeout="100"/>
             <op id="NATIVE_RSC_A-monitor-20" interval="20" name="monitor" role="Promoted" timeout="20"/>
             <op id="NATIVE_RSC_A-monitor-30" interval="30" name="monitor" role="Unpromoted" timeout="20"/>
           </operations>
         </primitive>
       </clone>
     </resources>
     <constraints>
-      <rsc_location id="A-placement" rsc="MASTER_RSC_A">
+      <rsc_location id="A-placement" rsc="PROMOTABLE_RSC_A">
         <rule boolean-op="or" id="rule-A-placement" score="-INFINITY">
           <expression attribute="give-me-A" id="whatever1" operation="not_defined"/>
           <expression attribute="give-me-A" id="whatever2" operation="ne" value="true"/>
         </rule>
       </rsc_location>
     </constraints>
   </configuration>
   <status>
     <node_state id="fc16-builder" uname="fc16-builder" ha="active" in_ccm="true" crmd="online" join="member" expected="member" crm-debug-origin="do_state_transition" shutdown="0">
       <transient_attributes id="fc16-builder">
         <instance_attributes id="status-fc16-builder">
           <nvpair id="status-fc16-builder-probe_complete" name="probe_complete" value="true"/>
           <nvpair id="status-fc16-builder-promoted-NATIVE_RSC_A.0" name="master-NATIVE_RSC_A:0" value="10"/>
         </instance_attributes>
       </transient_attributes>
       <lrm id="fc16-builder">
         <lrm_resources>
           <lrm_resource id="NATIVE_RSC_A:0" type="Stateful" class="ocf" provider="pacemaker">
             <lrm_rsc_op id="NATIVE_RSC_A:0_last_0" operation_key="NATIVE_RSC_A:0_promote_0" operation="promote" crm-debug-origin="build_active_RAs" crm_feature_set="3.0.6" transition-key="7:5:0:b27a137e-f18a-40ab-ae90-fc916930f1d1" transition-magic="0:0;7:5:0:b27a137e-f18a-40ab-ae90-fc916930f1d1" call-id="12" rc-code="0" op-status="0" interval="0" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
             <lrm_rsc_op id="NATIVE_RSC_A:0_monitor_20000" operation_key="NATIVE_RSC_A:0_monitor_20000" operation="monitor" crm-debug-origin="build_active_RAs" crm_feature_set="3.0.6" transition-key="9:6:8:b27a137e-f18a-40ab-ae90-fc916930f1d1" transition-magic="0:8;9:6:8:b27a137e-f18a-40ab-ae90-fc916930f1d1" call-id="14" rc-code="8" op-status="0" interval="20000" op-digest="4811cef7f7f94e3a35a70be7916cb2fd"/>
           </lrm_resource>
         </lrm_resources>
       </lrm>
     </node_state>
     <node_state id="fc16-builder2" uname="fc16-builder2" ha="active" in_ccm="true" crmd="online" crm-debug-origin="do_state_transition" join="member" expected="member" shutdown="0">
       <transient_attributes id="fc16-builder2">
         <instance_attributes id="status-fc16-builder2">
           <nvpair id="status-fc16-builder2-probe_complete" name="probe_complete" value="true"/>
         </instance_attributes>
       </transient_attributes>
       <lrm id="fc16-builder2">
         <lrm_resources>
           <lrm_resource id="NATIVE_RSC_A:0" type="Dummy" class="ocf" provider="pacemaker">
             <lrm_rsc_op id="NATIVE_RSC_A:0_last_0" operation_key="NATIVE_RSC_A:0_monitor_0" operation="monitor" crm-debug-origin="build_active_RAs" crm_feature_set="3.0.6" transition-key="6:0:7:b27a137e-f18a-40ab-ae90-fc916930f1d1" transition-magic="0:7;6:0:7:b27a137e-f18a-40ab-ae90-fc916930f1d1" call-id="2" rc-code="7" op-status="0" interval="0" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8" op-force-restart=" state " op-restart-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
           </lrm_resource>
         </lrm_resources>
       </lrm>
     </node_state>
   </status>
 </cib>
diff --git a/cts/scheduler/xml/colocation_constraint_stops_unpromoted.xml b/cts/scheduler/xml/colocation_constraint_stops_unpromoted.xml
index f0865fc074..c091d3d9da 100644
--- a/cts/scheduler/xml/colocation_constraint_stops_unpromoted.xml
+++ b/cts/scheduler/xml/colocation_constraint_stops_unpromoted.xml
@@ -1,84 +1,84 @@
 <cib epoch="24" num_updates="21" admin_epoch="0" validate-with="pacemaker-3.7" crm_feature_set="3.0.6" update-origin="fc16-builder" update-client="cibadmin" cib-last-written="Fri Jul 13 13:51:04 2012" have-quorum="0" dc-uuid="fc16-builder">
   <configuration>
     <crm_config>
       <cluster_property_set id="cib-bootstrap-options">
         <nvpair id="cib-bootstrap-options-dc-version" name="dc-version" value="1.1.7-ec9a806"/>
         <nvpair id="cib-bootstrap-options-cluster-infrastructure" name="cluster-infrastructure" value="corosync"/>
         <nvpair id="cib-bootstrap-options-stonith-enabled" name="stonith-enabled" value="false"/>
         <nvpair id="cib-bootstrap-options-no-quorum-policy" name="no-quorum-policy" value="ignore"/>
       </cluster_property_set>
     </crm_config>
     <nodes>
       <node id="fc16-builder" type="member" uname="fc16-builder">
         <instance_attributes id="fc16-builder-instance_attributes">
           <nvpair id="fc16-builder-stuffs" name="give-me-A" value="false"/>
         </instance_attributes>
       </node>
       <node id="fc16-builder2" uname="fc16-builder2" type="member">
         <instance_attributes id="fc16-builder2-instance_attributes">
           <nvpair id="fc16-builder2-stuffs" name="give-me-A" value="false"/>
         </instance_attributes>
       </node>
     </nodes>
     <resources>
-      <clone id="MASTER_RSC_A">
-        <meta_attributes id="MASTER_RSC_A-meta_attributes">
-          <nvpair id="MASTER_RSC_A-meta_attributes-promotable" name="promotable" value="true"/>
-          <nvpair id="MASTER_RSC_A-meta_attributes-promoted-max" name="promoted-max" value="0"/>
-          <nvpair id="MASTER_RSC_A-meta_attributes-promoted-node-max" name="promoted-node-max" value="0"/>
-          <nvpair id="MASTER_RSC_A-meta_attributes-clone-max" name="clone-max" value="1"/>
-          <nvpair id="MASTER_RSC_A-meta_attributes-clone-node-max" name="clone-node-max" value="1"/>
-          <nvpair id="MASTER_RSC_A-meta_attributes-notify" name="notify" value="true"/>
-          <nvpair id="MASTER_RSC_A-meta_attributes-target-role" name="target-role" value="Started"/>
+      <clone id="PROMOTABLE_RSC_A">
+        <meta_attributes id="PROMOTABLE_RSC_A-meta_attributes">
+          <nvpair id="PROMOTABLE_RSC_A-meta_attributes-promotable" name="promotable" value="true"/>
+          <nvpair id="PROMOTABLE_RSC_A-meta_attributes-promoted-max" name="promoted-max" value="0"/>
+          <nvpair id="PROMOTABLE_RSC_A-meta_attributes-promoted-node-max" name="promoted-node-max" value="0"/>
+          <nvpair id="PROMOTABLE_RSC_A-meta_attributes-clone-max" name="clone-max" value="1"/>
+          <nvpair id="PROMOTABLE_RSC_A-meta_attributes-clone-node-max" name="clone-node-max" value="1"/>
+          <nvpair id="PROMOTABLE_RSC_A-meta_attributes-notify" name="notify" value="true"/>
+          <nvpair id="PROMOTABLE_RSC_A-meta_attributes-target-role" name="target-role" value="Started"/>
         </meta_attributes>
         <primitive class="ocf" id="NATIVE_RSC_A" provider="pacemaker" type="Stateful">
           <operations>
             <op id="NATIVE_RSC_A-start-0" interval="0" name="start" timeout="240"/>
             <op id="NATIVE_RSC_A-stop-0" interval="0" name="stop" timeout="100"/>
             <op id="NATIVE_RSC_A-monitor-20" interval="20" name="monitor" role="Promoted" timeout="20"/>
             <op id="NATIVE_RSC_A-monitor-30" interval="30" name="monitor" role="Unpromoted" timeout="20"/>
           </operations>
         </primitive>
       </clone>
       <primitive class="ocf" id="NATIVE_RSC_B" provider="pacemaker" type="Dummy">
         <meta_attributes id="NATIVE_RSC_B-meta_attributes">
           <nvpair id="NATIVE_RSC_B-meta_attributes-target-role" name="target-role" value="Stopped"/>
         </meta_attributes>
         <operations>
           <op id="NATIVE_RSC_B-start-0" interval="0" name="start" timeout="240"/>
           <op id="NATIVE_RSC_B-stop-0" interval="0" name="stop" timeout="100"/>
         </operations>
       </primitive>
     </resources>
     <constraints>
-      <rsc_location id="A-placement" rsc="MASTER_RSC_A">
+      <rsc_location id="A-placement" rsc="PROMOTABLE_RSC_A">
         <rule boolean-op="or" id="rule-A-placement" score="-INFINITY">
           <expression attribute="give-me-A" id="whatever1" operation="not_defined"/>
           <expression attribute="give-me-A" id="whatever2" operation="ne" value="true"/>
         </rule>
       </rsc_location>
     </constraints>
   </configuration>
   <status>
     <node_state id="fc16-builder" uname="fc16-builder" ha="active" in_ccm="true" crmd="online" join="member" crm-debug-origin="do_update_resource" expected="member" shutdown="0">
       <transient_attributes id="fc16-builder">
         <instance_attributes id="status-fc16-builder">
           <nvpair id="status-fc16-builder-probe_complete" name="probe_complete" value="true"/>
           <nvpair id="status-fc16-builder-promoted-NATIVE_RSC_A.0" name="master-NATIVE_RSC_A:0" value="5"/>
         </instance_attributes>
       </transient_attributes>
       <lrm id="fc16-builder">
         <lrm_resources>
           <lrm_resource id="NATIVE_RSC_A:0" type="Stateful" class="ocf" provider="pacemaker">
             <lrm_rsc_op id="NATIVE_RSC_A:0_last_0" operation_key="NATIVE_RSC_A:0_start_0" operation="start" crm-debug-origin="do_update_resource" crm_feature_set="3.0.6" transition-key="4:4:0:e42da061-f8c3-4ee9-b939-4365931f173f" transition-magic="0:0;4:4:0:e42da061-f8c3-4ee9-b939-4365931f173f" call-id="7" rc-code="0" op-status="0" interval="0" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8" last-run="1334873355" last-rc-change="1334873355" exec-time="20" queue-time="0"/>
             <lrm_rsc_op id="NATIVE_RSC_A:0_last_failure_0" operation_key="NATIVE_RSC_A:0_monitor_0" operation="monitor" crm-debug-origin="build_active_RAs" crm_feature_set="3.0.6" transition-key="4:1:7:e42da061-f8c3-4ee9-b939-4365931f173f" transition-magic="0:0;4:1:7:e42da061-f8c3-4ee9-b939-4365931f173f" call-id="2" rc-code="0" op-status="0" interval="0" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
             <lrm_rsc_op id="NATIVE_RSC_A:0_monitor_30000" operation_key="NATIVE_RSC_A:0_monitor_30000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.6" transition-key="6:5:0:e42da061-f8c3-4ee9-b939-4365931f173f" transition-magic="0:0;6:5:0:e42da061-f8c3-4ee9-b939-4365931f173f" call-id="9" rc-code="0" op-status="0" interval="30000" last-rc-change="1334873355" exec-time="10" queue-time="0" op-digest="4811cef7f7f94e3a35a70be7916cb2fd"/>
           </lrm_resource>
           <lrm_resource id="NATIVE_RSC_B" type="Dummy" class="ocf" provider="pacemaker">
             <lrm_rsc_op id="NATIVE_RSC_B_last_0" operation_key="NATIVE_RSC_B_start_0" operation="start" crm-debug-origin="do_update_resource" crm_feature_set="3.0.6" transition-key="30:4:0:e42da061-f8c3-4ee9-b939-4365931f173f" transition-magic="0:0;30:4:0:e42da061-f8c3-4ee9-b939-4365931f173f" call-id="6" rc-code="0" op-status="0" interval="0" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8" op-force-restart=" state " op-restart-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8" last-run="1334873355" last-rc-change="1334873355" exec-time="30" queue-time="0"/>
           </lrm_resource>
         </lrm_resources>
       </lrm>
     </node_state>
   </status>
 </cib>
diff --git a/cts/scheduler/xml/order_constraint_stops_promoted.xml b/cts/scheduler/xml/order_constraint_stops_promoted.xml
index 136ff3f4db..5cc42d647b 100644
--- a/cts/scheduler/xml/order_constraint_stops_promoted.xml
+++ b/cts/scheduler/xml/order_constraint_stops_promoted.xml
@@ -1,101 +1,101 @@
 <cib epoch="21" num_updates="25" admin_epoch="0" validate-with="pacemaker-3.7" crm_feature_set="3.0.6" update-origin="fc16-builder" update-client="cibadmin" cib-last-written="Fri Jul 13 13:51:11 2012" have-quorum="1" dc-uuid="fc16-builder2">
   <configuration>
     <crm_config>
       <cluster_property_set id="cib-bootstrap-options">
         <nvpair id="cib-bootstrap-options-dc-version" name="dc-version" value="1.1.7-fe859a7"/>
         <nvpair id="cib-bootstrap-options-cluster-infrastructure" name="cluster-infrastructure" value="corosync"/>
         <nvpair id="cib-bootstrap-options-stonith-enabled" name="stonith-enabled" value="false"/>
         <nvpair id="cib-bootstrap-options-no-quorum-policy" name="no-quorum-policy" value="ignore"/>
       </cluster_property_set>
     </crm_config>
     <nodes>
       <node id="fc16-builder" type="member" uname="fc16-builder">
         <instance_attributes id="fc16-builder-instance_attributes">
           <nvpair id="fc16-builder-stuffs" name="give-me-A" value="true"/>
         </instance_attributes>
       </node>
       <node id="fc16-builder2" uname="fc16-builder2" type="member">
         <instance_attributes id="fc16-builder2-instance_attributes">
           <nvpair id="fc16-builder2-stuffs" name="give-me-A" value="false"/>
         </instance_attributes>
       </node>
     </nodes>
     <resources>
-      <clone id="MASTER_RSC_A">
-        <meta_attributes id="MASTER_RSC_A-meta_attributes">
-          <nvpair id="MASTER_RSC_A-meta_attributes-promotable" name="promotable" value="true"/>
-          <nvpair id="MASTER_RSC_A-meta_attributes-promoted-max" name="promoted-max" value="1"/>
-          <nvpair id="MASTER_RSC_A-meta_attributes-promoted-node-max" name="promoted-node-max" value="1"/>
-          <nvpair id="MASTER_RSC_A-meta_attributes-clone-max" name="clone-max" value="1"/>
-          <nvpair id="MASTER_RSC_A-meta_attributes-clone-node-max" name="clone-node-max" value="1"/>
-          <nvpair id="MASTER_RSC_A-meta_attributes-notify" name="notify" value="true"/>
-          <nvpair id="MASTER_RSC_A-meta_attributes-target-role" name="target-role" value="Started"/>
+      <clone id="PROMOTABLE_RSC_A">
+        <meta_attributes id="PROMOTABLE_RSC_A-meta_attributes">
+          <nvpair id="PROMOTABLE_RSC_A-meta_attributes-promotable" name="promotable" value="true"/>
+          <nvpair id="PROMOTABLE_RSC_A-meta_attributes-promoted-max" name="promoted-max" value="1"/>
+          <nvpair id="PROMOTABLE_RSC_A-meta_attributes-promoted-node-max" name="promoted-node-max" value="1"/>
+          <nvpair id="PROMOTABLE_RSC_A-meta_attributes-clone-max" name="clone-max" value="1"/>
+          <nvpair id="PROMOTABLE_RSC_A-meta_attributes-clone-node-max" name="clone-node-max" value="1"/>
+          <nvpair id="PROMOTABLE_RSC_A-meta_attributes-notify" name="notify" value="true"/>
+          <nvpair id="PROMOTABLE_RSC_A-meta_attributes-target-role" name="target-role" value="Started"/>
         </meta_attributes>
         <primitive class="ocf" id="NATIVE_RSC_A" provider="pacemaker" type="Stateful">
           <operations>
             <op id="NATIVE_RSC_A-start-0" interval="0" name="start" timeout="240"/>
             <op id="NATIVE_RSC_A-stop-0" interval="0" name="stop" timeout="100"/>
             <op id="NATIVE_RSC_A-monitor-20" interval="20" name="monitor" role="Promoted" timeout="20"/>
             <op id="NATIVE_RSC_A-monitor-30" interval="30" name="monitor" role="Unpromoted" timeout="20"/>
           </operations>
         </primitive>
       </clone>
       <primitive class="ocf" id="NATIVE_RSC_B" provider="pacemaker" type="Dummy">
         <meta_attributes id="NATIVE_RSC_B-meta_attributes">
           <nvpair id="NATIVE_RSC_B-meta_attributes-target-role" name="target-role" value="Stopped"/>
         </meta_attributes>
         <operations>
           <op id="NATIVE_RSC_B-start-0" interval="0" name="start" timeout="240"/>
           <op id="NATIVE_RSC_B-stop-0" interval="0" name="stop" timeout="100"/>
         </operations>
       </primitive>
     </resources>
     <constraints>
-      <rsc_order first="NATIVE_RSC_B" first-action="start" then="MASTER_RSC_A" then-action="start" id="promote_then_start"/>
-      <rsc_location id="A-placement" rsc="MASTER_RSC_A">
+      <rsc_order first="NATIVE_RSC_B" first-action="start" then="PROMOTABLE_RSC_A" then-action="start" id="promote_then_start"/>
+      <rsc_location id="A-placement" rsc="PROMOTABLE_RSC_A">
         <rule boolean-op="or" id="rule-A-placement" score="-INFINITY">
           <expression attribute="give-me-A" id="whatever1" operation="not_defined"/>
           <expression attribute="give-me-A" id="whatever2" operation="ne" value="true"/>
         </rule>
       </rsc_location>
     </constraints>
   </configuration>
   <status>
     <node_state id="fc16-builder" uname="fc16-builder" ha="active" in_ccm="true" crmd="online" join="member" expected="member" crm-debug-origin="do_state_transition" shutdown="0">
       <transient_attributes id="fc16-builder">
         <instance_attributes id="status-fc16-builder">
           <nvpair id="status-fc16-builder-probe_complete" name="probe_complete" value="true"/>
           <nvpair id="status-fc16-builder-promoted-NATIVE_RSC_A.0" name="master-NATIVE_RSC_A:0" value="10"/>
         </instance_attributes>
       </transient_attributes>
       <lrm id="fc16-builder">
         <lrm_resources>
           <lrm_resource id="NATIVE_RSC_A:0" type="Stateful" class="ocf" provider="pacemaker">
             <lrm_rsc_op id="NATIVE_RSC_A:0_last_0" operation_key="NATIVE_RSC_A:0_promote_0" operation="promote" crm-debug-origin="build_active_RAs" crm_feature_set="3.0.6" transition-key="7:5:0:b27a137e-f18a-40ab-ae90-fc916930f1d1" transition-magic="0:0;7:5:0:b27a137e-f18a-40ab-ae90-fc916930f1d1" call-id="12" rc-code="0" op-status="0" interval="0" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
             <lrm_rsc_op id="NATIVE_RSC_A:0_monitor_20000" operation_key="NATIVE_RSC_A:0_monitor_20000" operation="monitor" crm-debug-origin="build_active_RAs" crm_feature_set="3.0.6" transition-key="9:6:8:b27a137e-f18a-40ab-ae90-fc916930f1d1" transition-magic="0:8;9:6:8:b27a137e-f18a-40ab-ae90-fc916930f1d1" call-id="14" rc-code="8" op-status="0" interval="20000" op-digest="4811cef7f7f94e3a35a70be7916cb2fd"/>
           </lrm_resource>
           <lrm_resource id="NATIVE_RSC_B" type="Dummy" class="ocf" provider="pacemaker">
             <lrm_rsc_op id="NATIVE_RSC_B_last_0" operation_key="NATIVE_RSC_B_monitor_0" operation="monitor" crm-debug-origin="build_active_RAs" crm_feature_set="3.0.6" transition-key="5:17:7:b27a137e-f18a-40ab-ae90-fc916930f1d1" transition-magic="0:7;5:17:7:b27a137e-f18a-40ab-ae90-fc916930f1d1" call-id="15" rc-code="7" op-status="0" interval="0" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8" op-force-restart=" state " op-restart-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
           </lrm_resource>
         </lrm_resources>
       </lrm>
     </node_state>
     <node_state id="fc16-builder2" uname="fc16-builder2" ha="active" in_ccm="true" crmd="online" crm-debug-origin="do_state_transition" join="member" expected="member" shutdown="0">
       <transient_attributes id="fc16-builder2">
         <instance_attributes id="status-fc16-builder2">
           <nvpair id="status-fc16-builder2-probe_complete" name="probe_complete" value="true"/>
         </instance_attributes>
       </transient_attributes>
       <lrm id="fc16-builder2">
         <lrm_resources>
           <lrm_resource id="NATIVE_RSC_A:0" type="Dummy" class="ocf" provider="pacemaker">
             <lrm_rsc_op id="NATIVE_RSC_A:0_last_0" operation_key="NATIVE_RSC_A:0_monitor_0" operation="monitor" crm-debug-origin="build_active_RAs" crm_feature_set="3.0.6" transition-key="6:0:7:b27a137e-f18a-40ab-ae90-fc916930f1d1" transition-magic="0:7;6:0:7:b27a137e-f18a-40ab-ae90-fc916930f1d1" call-id="2" rc-code="7" op-status="0" interval="0" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8" op-force-restart=" state " op-restart-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
           </lrm_resource>
           <lrm_resource id="NATIVE_RSC_B" type="Dummy" class="ocf" provider="pacemaker">
             <lrm_rsc_op id="NATIVE_RSC_B_last_0" operation_key="NATIVE_RSC_B_start_0" operation="start" crm-debug-origin="build_active_RAs" crm_feature_set="3.0.6" transition-key="36:17:0:b27a137e-f18a-40ab-ae90-fc916930f1d1" transition-magic="0:0;36:17:0:b27a137e-f18a-40ab-ae90-fc916930f1d1" call-id="4" rc-code="0" op-status="0" interval="0" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8" op-force-restart=" state " op-restart-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
           </lrm_resource>
         </lrm_resources>
       </lrm>
     </node_state>
   </status>
 </cib>
diff --git a/cts/scheduler/xml/order_constraint_stops_unpromoted.xml b/cts/scheduler/xml/order_constraint_stops_unpromoted.xml
index ea8e6e464b..094621e1c4 100644
--- a/cts/scheduler/xml/order_constraint_stops_unpromoted.xml
+++ b/cts/scheduler/xml/order_constraint_stops_unpromoted.xml
@@ -1,79 +1,79 @@
 <cib epoch="24" num_updates="21" admin_epoch="0" validate-with="pacemaker-3.7" crm_feature_set="3.0.6" update-origin="fc16-builder" update-client="cibadmin" cib-last-written="Fri Jul 13 13:51:11 2012" have-quorum="0" dc-uuid="fc16-builder">
   <configuration>
     <crm_config>
       <cluster_property_set id="cib-bootstrap-options">
         <nvpair id="cib-bootstrap-options-dc-version" name="dc-version" value="1.1.7-ec9a806"/>
         <nvpair id="cib-bootstrap-options-cluster-infrastructure" name="cluster-infrastructure" value="corosync"/>
         <nvpair id="cib-bootstrap-options-stonith-enabled" name="stonith-enabled" value="false"/>
         <nvpair id="cib-bootstrap-options-no-quorum-policy" name="no-quorum-policy" value="ignore"/>
       </cluster_property_set>
     </crm_config>
     <nodes>
       <node id="fc16-builder" type="member" uname="fc16-builder">
         <instance_attributes id="fc16-builder-instance_attributes">
           <nvpair id="fc16-builder-stuffs" name="give-me-A" value="true"/>
         </instance_attributes>
       </node>
       <node id="fc16-builder2" uname="fc16-builder2" type="member">
         <instance_attributes id="fc16-builder2-instance_attributes">
           <nvpair id="fc16-builder2-stuffs" name="give-me-A" value="false"/>
         </instance_attributes>
       </node>
     </nodes>
     <resources>
-      <clone id="MASTER_RSC_A">
-        <meta_attributes id="MASTER_RSC_A-meta_attributes">
-          <nvpair id="MASTER_RSC_A-meta_attributes-promotable" name="promotable" value="true"/>
-          <nvpair id="MASTER_RSC_A-meta_attributes-promoted-max" name="promoted-max" value="0"/>
-          <nvpair id="MASTER_RSC_A-meta_attributes-promoted-node-max" name="promoted-node-max" value="0"/>
-          <nvpair id="MASTER_RSC_A-meta_attributes-clone-max" name="clone-max" value="1"/>
-          <nvpair id="MASTER_RSC_A-meta_attributes-clone-node-max" name="clone-node-max" value="1"/>
-          <nvpair id="MASTER_RSC_A-meta_attributes-notify" name="notify" value="true"/>
-          <nvpair id="MASTER_RSC_A-meta_attributes-target-role" name="target-role" value="Started"/>
+      <clone id="PROMOTABLE_RSC_A">
+        <meta_attributes id="PROMOTABLE_RSC_A-meta_attributes">
+          <nvpair id="PROMOTABLE_RSC_A-meta_attributes-promotable" name="promotable" value="true"/>
+          <nvpair id="PROMOTABLE_RSC_A-meta_attributes-promoted-max" name="promoted-max" value="0"/>
+          <nvpair id="PROMOTABLE_RSC_A-meta_attributes-promoted-node-max" name="promoted-node-max" value="0"/>
+          <nvpair id="PROMOTABLE_RSC_A-meta_attributes-clone-max" name="clone-max" value="1"/>
+          <nvpair id="PROMOTABLE_RSC_A-meta_attributes-clone-node-max" name="clone-node-max" value="1"/>
+          <nvpair id="PROMOTABLE_RSC_A-meta_attributes-notify" name="notify" value="true"/>
+          <nvpair id="PROMOTABLE_RSC_A-meta_attributes-target-role" name="target-role" value="Started"/>
         </meta_attributes>
         <primitive class="ocf" id="NATIVE_RSC_A" provider="pacemaker" type="Stateful">
           <operations>
             <op id="NATIVE_RSC_A-start-0" interval="0" name="start" timeout="240"/>
             <op id="NATIVE_RSC_A-stop-0" interval="0" name="stop" timeout="100"/>
             <op id="NATIVE_RSC_A-monitor-20" interval="20" name="monitor" role="Promoted" timeout="20"/>
             <op id="NATIVE_RSC_A-monitor-30" interval="30" name="monitor" role="Unpromoted" timeout="20"/>
           </operations>
         </primitive>
       </clone>
       <primitive class="ocf" id="NATIVE_RSC_B" provider="pacemaker" type="Dummy">
         <meta_attributes id="NATIVE_RSC_B-meta_attributes">
           <nvpair id="NATIVE_RSC_B-meta_attributes-target-role" name="target-role" value="Stopped"/>
         </meta_attributes>
         <operations>
           <op id="NATIVE_RSC_B-start-0" interval="0" name="start" timeout="240"/>
           <op id="NATIVE_RSC_B-stop-0" interval="0" name="stop" timeout="100"/>
         </operations>
       </primitive>
     </resources>
     <constraints>
-      <rsc_order first="NATIVE_RSC_B" first-action="start" then="MASTER_RSC_A" then-action="start" id="promote_then_start"/>
+      <rsc_order first="NATIVE_RSC_B" first-action="start" then="PROMOTABLE_RSC_A" then-action="start" id="promote_then_start"/>
     </constraints>
   </configuration>
   <status>
     <node_state id="fc16-builder" uname="fc16-builder" ha="active" in_ccm="true" crmd="online" join="member" crm-debug-origin="do_update_resource" expected="member" shutdown="0">
       <transient_attributes id="fc16-builder">
         <instance_attributes id="status-fc16-builder">
           <nvpair id="status-fc16-builder-probe_complete" name="probe_complete" value="true"/>
           <nvpair id="status-fc16-builder-promoted-NATIVE_RSC_A.0" name="master-NATIVE_RSC_A:0" value="5"/>
         </instance_attributes>
       </transient_attributes>
       <lrm id="fc16-builder">
         <lrm_resources>
           <lrm_resource id="NATIVE_RSC_A:0" type="Stateful" class="ocf" provider="pacemaker">
             <lrm_rsc_op id="NATIVE_RSC_A:0_last_0" operation_key="NATIVE_RSC_A:0_start_0" operation="start" crm-debug-origin="do_update_resource" crm_feature_set="3.0.6" transition-key="4:4:0:e42da061-f8c3-4ee9-b939-4365931f173f" transition-magic="0:0;4:4:0:e42da061-f8c3-4ee9-b939-4365931f173f" call-id="7" rc-code="0" op-status="0" interval="0" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8" last-run="1334873355" last-rc-change="1334873355" exec-time="20" queue-time="0"/>
             <lrm_rsc_op id="NATIVE_RSC_A:0_last_failure_0" operation_key="NATIVE_RSC_A:0_monitor_0" operation="monitor" crm-debug-origin="build_active_RAs" crm_feature_set="3.0.6" transition-key="4:1:7:e42da061-f8c3-4ee9-b939-4365931f173f" transition-magic="0:0;4:1:7:e42da061-f8c3-4ee9-b939-4365931f173f" call-id="2" rc-code="0" op-status="0" interval="0" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
             <lrm_rsc_op id="NATIVE_RSC_A:0_monitor_30000" operation_key="NATIVE_RSC_A:0_monitor_30000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.6" transition-key="6:5:0:e42da061-f8c3-4ee9-b939-4365931f173f" transition-magic="0:0;6:5:0:e42da061-f8c3-4ee9-b939-4365931f173f" call-id="9" rc-code="0" op-status="0" interval="30000" last-rc-change="1334873355" exec-time="10" queue-time="0" op-digest="4811cef7f7f94e3a35a70be7916cb2fd"/>
           </lrm_resource>
           <lrm_resource id="NATIVE_RSC_B" type="Dummy" class="ocf" provider="pacemaker">
             <lrm_rsc_op id="NATIVE_RSC_B_last_0" operation_key="NATIVE_RSC_B_start_0" operation="start" crm-debug-origin="do_update_resource" crm_feature_set="3.0.6" transition-key="30:4:0:e42da061-f8c3-4ee9-b939-4365931f173f" transition-magic="0:0;30:4:0:e42da061-f8c3-4ee9-b939-4365931f173f" call-id="6" rc-code="0" op-status="0" interval="0" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8" op-force-restart=" state " op-restart-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8" last-run="1334873355" last-rc-change="1334873355" exec-time="30" queue-time="0"/>
           </lrm_resource>
         </lrm_resources>
       </lrm>
     </node_state>
   </status>
 </cib>