diff --git a/cts/scheduler/dot/bug-1822.dot b/cts/scheduler/dot/bug-1822.dot
index f410b58149..598abd6b04 100644
--- a/cts/scheduler/dot/bug-1822.dot
+++ b/cts/scheduler/dot/bug-1822.dot
@@ -1,35 +1,35 @@
  digraph "g" {
 "do_shutdown process1a" [ style=bold color="green" fontcolor="black"]
-"master_slave_Stateful:1_demote_0 process1a" -> "master_slave_Stateful:1_stop_0 process1a" [ style = bold]
-"master_slave_Stateful:1_demote_0 process1a" -> "ms-sf_group:1_demoted_0" [ style = bold]
-"master_slave_Stateful:1_demote_0 process1a" [ style=bold color="green" fontcolor="black"]
-"master_slave_Stateful:1_stop_0 process1a" -> "do_shutdown process1a" [ style = bold]
-"master_slave_Stateful:1_stop_0 process1a" -> "ms-sf_group:1_stopped_0" [ style = bold]
-"master_slave_Stateful:1_stop_0 process1a" [ style=bold color="green" fontcolor="black"]
-"master_slave_procdctl:1_demote_0 process1a" -> "master_slave_procdctl:1_stop_0 process1a" [ style = bold]
-"master_slave_procdctl:1_demote_0 process1a" -> "ms-sf_group:1_demoted_0" [ style = bold]
-"master_slave_procdctl:1_demote_0 process1a" [ style=bold color="green" fontcolor="black"]
-"master_slave_procdctl:1_stop_0 process1a" -> "do_shutdown process1a" [ style = bold]
-"master_slave_procdctl:1_stop_0 process1a" -> "ms-sf_group:1_stopped_0" [ style = bold]
-"master_slave_procdctl:1_stop_0 process1a" [ style=bold color="green" fontcolor="black"]
 "ms-sf_demote_0" -> "ms-sf_demoted_0" [ style = bold]
 "ms-sf_demote_0" -> "ms-sf_group:1_demote_0" [ style = bold]
 "ms-sf_demote_0" [ style=bold color="green" fontcolor="orange"]
 "ms-sf_demoted_0" -> "ms-sf_stop_0" [ style = bold]
 "ms-sf_demoted_0" [ style=bold color="green" fontcolor="orange"]
-"ms-sf_group:1_demote_0" -> "master_slave_Stateful:1_demote_0 process1a" [ style = bold]
-"ms-sf_group:1_demote_0" -> "master_slave_procdctl:1_demote_0 process1a" [ style = bold]
+"ms-sf_group:1_demote_0" -> "promotable_Stateful:1_demote_0 process1a" [ style = bold]
+"ms-sf_group:1_demote_0" -> "promotable_procdctl:1_demote_0 process1a" [ style = bold]
 "ms-sf_group:1_demote_0" [ style=bold color="green" fontcolor="orange"]
 "ms-sf_group:1_demoted_0" -> "ms-sf_demoted_0" [ style = bold]
 "ms-sf_group:1_demoted_0" [ style=bold color="green" fontcolor="orange"]
-"ms-sf_group:1_stop_0" -> "master_slave_Stateful:1_stop_0 process1a" [ style = bold]
-"ms-sf_group:1_stop_0" -> "master_slave_procdctl:1_stop_0 process1a" [ style = bold]
 "ms-sf_group:1_stop_0" -> "ms-sf_group:1_stopped_0" [ style = bold]
+"ms-sf_group:1_stop_0" -> "promotable_Stateful:1_stop_0 process1a" [ style = bold]
+"ms-sf_group:1_stop_0" -> "promotable_procdctl:1_stop_0 process1a" [ style = bold]
 "ms-sf_group:1_stop_0" [ style=bold color="green" fontcolor="orange"]
 "ms-sf_group:1_stopped_0" -> "ms-sf_stopped_0" [ style = bold]
 "ms-sf_group:1_stopped_0" [ style=bold color="green" fontcolor="orange"]
 "ms-sf_stop_0" -> "ms-sf_group:1_stop_0" [ style = bold]
 "ms-sf_stop_0" -> "ms-sf_stopped_0" [ style = bold]
 "ms-sf_stop_0" [ style=bold color="green" fontcolor="orange"]
 "ms-sf_stopped_0" [ style=bold color="green" fontcolor="orange"]
+"promotable_Stateful:1_demote_0 process1a" -> "ms-sf_group:1_demoted_0" [ style = bold]
+"promotable_Stateful:1_demote_0 process1a" -> "promotable_Stateful:1_stop_0 process1a" [ style = bold]
+"promotable_Stateful:1_demote_0 process1a" [ style=bold color="green" fontcolor="black"]
+"promotable_Stateful:1_stop_0 process1a" -> "do_shutdown process1a" [ style = bold]
+"promotable_Stateful:1_stop_0 process1a" -> "ms-sf_group:1_stopped_0" [ style = bold]
+"promotable_Stateful:1_stop_0 process1a" [ style=bold color="green" fontcolor="black"]
+"promotable_procdctl:1_demote_0 process1a" -> "ms-sf_group:1_demoted_0" [ style = bold]
+"promotable_procdctl:1_demote_0 process1a" -> "promotable_procdctl:1_stop_0 process1a" [ style = bold]
+"promotable_procdctl:1_demote_0 process1a" [ style=bold color="green" fontcolor="black"]
+"promotable_procdctl:1_stop_0 process1a" -> "do_shutdown process1a" [ style = bold]
+"promotable_procdctl:1_stop_0 process1a" -> "ms-sf_group:1_stopped_0" [ style = bold]
+"promotable_procdctl:1_stop_0 process1a" [ style=bold color="green" fontcolor="black"]
 }
diff --git a/cts/scheduler/dot/clbz5007-promotable-colocation.dot b/cts/scheduler/dot/clbz5007-promotable-colocation.dot
index 84900bd357..862797d39f 100644
--- a/cts/scheduler/dot/clbz5007-promotable-colocation.dot
+++ b/cts/scheduler/dot/clbz5007-promotable-colocation.dot
@@ -1,8 +1,8 @@
  digraph "g" {
-"MASTER_IP_start_0 fc16-builder" [ style=bold color="green" fontcolor="black"]
-"MASTER_IP_stop_0 fc16-builder2" -> "MASTER_IP_start_0 fc16-builder" [ style = bold]
-"MASTER_IP_stop_0 fc16-builder2" [ style=bold color="green" fontcolor="black"]
-"SLAVE_IP_start_0 fc16-builder2" [ style=bold color="green" fontcolor="black"]
-"SLAVE_IP_stop_0 fc16-builder" -> "SLAVE_IP_start_0 fc16-builder2" [ style = bold]
-"SLAVE_IP_stop_0 fc16-builder" [ style=bold color="green" fontcolor="black"]
+"PROMOTED_IP_start_0 fc16-builder" [ style=bold color="green" fontcolor="black"]
+"PROMOTED_IP_stop_0 fc16-builder2" -> "PROMOTED_IP_start_0 fc16-builder" [ style = bold]
+"PROMOTED_IP_stop_0 fc16-builder2" [ style=bold color="green" fontcolor="black"]
+"UNPROMOTED_IP_start_0 fc16-builder2" [ style=bold color="green" fontcolor="black"]
+"UNPROMOTED_IP_stop_0 fc16-builder" -> "UNPROMOTED_IP_start_0 fc16-builder2" [ style = bold]
+"UNPROMOTED_IP_stop_0 fc16-builder" [ style=bold color="green" fontcolor="black"]
 }
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/dot/promoted-group.dot b/cts/scheduler/dot/promoted-group.dot
index 952ff9f9cd..2a2628ef6c 100644
--- a/cts/scheduler/dot/promoted-group.dot
+++ b/cts/scheduler/dot/promoted-group.dot
@@ -1,15 +1,15 @@
  digraph "g" {
-"Cancel master_slave_Stateful:1_monitor_5000 rh44-1" -> "master_slave_Stateful:1_promote_0 rh44-1" [ style = bold]
-"Cancel master_slave_Stateful:1_monitor_5000 rh44-1" [ style=bold color="green" fontcolor="black"]
-"grp_ms_sf:1_promote_0" -> "master_slave_Stateful:1_promote_0 rh44-1" [ style = bold]
+"Cancel promotable_Stateful:1_monitor_5000 rh44-1" -> "promotable_Stateful:1_promote_0 rh44-1" [ style = bold]
+"Cancel promotable_Stateful:1_monitor_5000 rh44-1" [ style=bold color="green" fontcolor="black"]
+"grp_ms_sf:1_promote_0" -> "promotable_Stateful:1_promote_0 rh44-1" [ style = bold]
 "grp_ms_sf:1_promote_0" [ style=bold color="green" fontcolor="orange"]
 "grp_ms_sf:1_promoted_0" -> "ms-sf_promoted_0" [ style = bold]
 "grp_ms_sf:1_promoted_0" [ style=bold color="green" fontcolor="orange"]
-"master_slave_Stateful:1_monitor_6000 rh44-1" [ style=bold color="green" fontcolor="black"]
-"master_slave_Stateful:1_promote_0 rh44-1" -> "grp_ms_sf:1_promoted_0" [ style = bold]
-"master_slave_Stateful:1_promote_0 rh44-1" -> "master_slave_Stateful:1_monitor_6000 rh44-1" [ style = bold]
-"master_slave_Stateful:1_promote_0 rh44-1" [ style=bold color="green" fontcolor="black"]
 "ms-sf_promote_0" -> "grp_ms_sf:1_promote_0" [ style = bold]
 "ms-sf_promote_0" [ style=bold color="green" fontcolor="orange"]
 "ms-sf_promoted_0" [ style=bold color="green" fontcolor="orange"]
+"promotable_Stateful:1_monitor_6000 rh44-1" [ style=bold color="green" fontcolor="black"]
+"promotable_Stateful:1_promote_0 rh44-1" -> "grp_ms_sf:1_promoted_0" [ style = bold]
+"promotable_Stateful:1_promote_0 rh44-1" -> "promotable_Stateful:1_monitor_6000 rh44-1" [ style = bold]
+"promotable_Stateful:1_promote_0 rh44-1" [ style=bold color="green" fontcolor="black"]
 }
diff --git a/cts/scheduler/exp/bug-1822.exp b/cts/scheduler/exp/bug-1822.exp
index defc49fc7f..1206c97002 100644
--- a/cts/scheduler/exp/bug-1822.exp
+++ b/cts/scheduler/exp/bug-1822.exp
@@ -1,185 +1,185 @@
 <transition_graph cluster-delay="180s" stonith-timeout="60s" failed-stop-offset="INFINITY" failed-start-offset="INFINITY"  transition_id="0">
   <synapse id="0">
     <action_set>
       <pseudo_event id="21" operation="demoted" operation_key="ms-sf_group:1_demoted_0">
         <attributes CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_promoted_max="1" CRM_meta_promoted_node_max="1" CRM_meta_timeout="120000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="12" operation="demote" operation_key="master_slave_Stateful:1_demote_0" on_node="process1a" on_node_uuid="4dbb8c56-330e-4835-a15e-c0aa632d4e89"/>
+        <rsc_op id="12" operation="demote" operation_key="promotable_Stateful:1_demote_0" on_node="process1a" on_node_uuid="4dbb8c56-330e-4835-a15e-c0aa632d4e89"/>
       </trigger>
       <trigger>
-        <rsc_op id="14" operation="demote" operation_key="master_slave_procdctl:1_demote_0" on_node="process1a" on_node_uuid="4dbb8c56-330e-4835-a15e-c0aa632d4e89"/>
+        <rsc_op id="14" operation="demote" operation_key="promotable_procdctl:1_demote_0" on_node="process1a" on_node_uuid="4dbb8c56-330e-4835-a15e-c0aa632d4e89"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="1">
     <action_set>
       <pseudo_event id="20" operation="demote" operation_key="ms-sf_group:1_demote_0">
         <attributes CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_promoted_max="1" CRM_meta_promoted_node_max="1" CRM_meta_timeout="120000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
         <pseudo_event id="30" operation="demote" operation_key="ms-sf_demote_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="2">
     <action_set>
       <pseudo_event id="19" operation="stopped" operation_key="ms-sf_group:1_stopped_0">
         <attributes CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_promoted_max="1" CRM_meta_promoted_node_max="1" CRM_meta_timeout="120000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="13" operation="stop" operation_key="master_slave_Stateful:1_stop_0" on_node="process1a" on_node_uuid="4dbb8c56-330e-4835-a15e-c0aa632d4e89"/>
+        <rsc_op id="13" operation="stop" operation_key="promotable_Stateful:1_stop_0" on_node="process1a" on_node_uuid="4dbb8c56-330e-4835-a15e-c0aa632d4e89"/>
       </trigger>
       <trigger>
-        <rsc_op id="15" operation="stop" operation_key="master_slave_procdctl:1_stop_0" on_node="process1a" on_node_uuid="4dbb8c56-330e-4835-a15e-c0aa632d4e89"/>
+        <rsc_op id="15" operation="stop" operation_key="promotable_procdctl:1_stop_0" on_node="process1a" on_node_uuid="4dbb8c56-330e-4835-a15e-c0aa632d4e89"/>
       </trigger>
       <trigger>
         <pseudo_event id="18" operation="stop" operation_key="ms-sf_group:1_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="3">
     <action_set>
       <pseudo_event id="18" operation="stop" operation_key="ms-sf_group:1_stop_0">
         <attributes CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_promoted_max="1" CRM_meta_promoted_node_max="1" CRM_meta_timeout="120000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
         <pseudo_event id="26" operation="stop" operation_key="ms-sf_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="4">
     <action_set>
-      <rsc_op id="13" operation="stop" operation_key="master_slave_Stateful:1_stop_0" on_node="process1a" on_node_uuid="4dbb8c56-330e-4835-a15e-c0aa632d4e89">
-        <primitive id="master_slave_Stateful:1" class="ocf" provider="heartbeat" type="Dummy-statful"/>
+      <rsc_op id="13" operation="stop" operation_key="promotable_Stateful:1_stop_0" on_node="process1a" on_node_uuid="4dbb8c56-330e-4835-a15e-c0aa632d4e89">
+        <primitive id="promotable_Stateful:1" class="ocf" provider="heartbeat" type="Dummy-statful"/>
         <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_name="stop" CRM_meta_notify="false" CRM_meta_on_fail="stop" CRM_meta_on_node="process1a" CRM_meta_on_node_uuid="4dbb8c56-330e-4835-a15e-c0aa632d4e89" CRM_meta_promoted_max="1" CRM_meta_promoted_node_max="1" CRM_meta_timeout="60000"  sleep_time="10000"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="12" operation="demote" operation_key="master_slave_Stateful:1_demote_0" on_node="process1a" on_node_uuid="4dbb8c56-330e-4835-a15e-c0aa632d4e89"/>
+        <rsc_op id="12" operation="demote" operation_key="promotable_Stateful:1_demote_0" on_node="process1a" on_node_uuid="4dbb8c56-330e-4835-a15e-c0aa632d4e89"/>
       </trigger>
       <trigger>
         <pseudo_event id="18" operation="stop" operation_key="ms-sf_group:1_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="5">
     <action_set>
-      <rsc_op id="12" operation="demote" operation_key="master_slave_Stateful:1_demote_0" on_node="process1a" on_node_uuid="4dbb8c56-330e-4835-a15e-c0aa632d4e89">
-        <primitive id="master_slave_Stateful:1" class="ocf" provider="heartbeat" type="Dummy-statful"/>
+      <rsc_op id="12" operation="demote" operation_key="promotable_Stateful:1_demote_0" on_node="process1a" on_node_uuid="4dbb8c56-330e-4835-a15e-c0aa632d4e89">
+        <primitive id="promotable_Stateful:1" class="ocf" provider="heartbeat" type="Dummy-statful"/>
         <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_on_node="process1a" CRM_meta_on_node_uuid="4dbb8c56-330e-4835-a15e-c0aa632d4e89" CRM_meta_promoted_max="1" CRM_meta_promoted_node_max="1" CRM_meta_timeout="120000"  sleep_time="10000"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
         <pseudo_event id="20" operation="demote" operation_key="ms-sf_group:1_demote_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="6">
     <action_set>
-      <rsc_op id="15" operation="stop" operation_key="master_slave_procdctl:1_stop_0" on_node="process1a" on_node_uuid="4dbb8c56-330e-4835-a15e-c0aa632d4e89">
-        <primitive id="master_slave_procdctl:1" class="ocf" provider="heartbeat" type="procdctl"/>
+      <rsc_op id="15" operation="stop" operation_key="promotable_procdctl:1_stop_0" on_node="process1a" on_node_uuid="4dbb8c56-330e-4835-a15e-c0aa632d4e89">
+        <primitive id="promotable_procdctl:1" class="ocf" provider="heartbeat" type="procdctl"/>
         <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_name="stop" CRM_meta_notify="false" CRM_meta_on_fail="stop" CRM_meta_on_node="process1a" CRM_meta_on_node_uuid="4dbb8c56-330e-4835-a15e-c0aa632d4e89" CRM_meta_promoted_max="1" CRM_meta_promoted_node_max="1" CRM_meta_timeout="60000"  procd="sleep 10000"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="14" operation="demote" operation_key="master_slave_procdctl:1_demote_0" on_node="process1a" on_node_uuid="4dbb8c56-330e-4835-a15e-c0aa632d4e89"/>
+        <rsc_op id="14" operation="demote" operation_key="promotable_procdctl:1_demote_0" on_node="process1a" on_node_uuid="4dbb8c56-330e-4835-a15e-c0aa632d4e89"/>
       </trigger>
       <trigger>
         <pseudo_event id="18" operation="stop" operation_key="ms-sf_group:1_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="7">
     <action_set>
-      <rsc_op id="14" operation="demote" operation_key="master_slave_procdctl:1_demote_0" on_node="process1a" on_node_uuid="4dbb8c56-330e-4835-a15e-c0aa632d4e89">
-        <primitive id="master_slave_procdctl:1" class="ocf" provider="heartbeat" type="procdctl"/>
+      <rsc_op id="14" operation="demote" operation_key="promotable_procdctl:1_demote_0" on_node="process1a" on_node_uuid="4dbb8c56-330e-4835-a15e-c0aa632d4e89">
+        <primitive id="promotable_procdctl:1" class="ocf" provider="heartbeat" type="procdctl"/>
         <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_on_node="process1a" CRM_meta_on_node_uuid="4dbb8c56-330e-4835-a15e-c0aa632d4e89" CRM_meta_promoted_max="1" CRM_meta_promoted_node_max="1" CRM_meta_timeout="120000"  procd="sleep 10000"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
         <pseudo_event id="20" operation="demote" operation_key="ms-sf_group:1_demote_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="8" priority="1000000">
     <action_set>
       <pseudo_event id="31" operation="demoted" operation_key="ms-sf_demoted_0">
         <attributes CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_promoted_max="1" CRM_meta_promoted_node_max="1" CRM_meta_timeout="120000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
         <pseudo_event id="21" operation="demoted" operation_key="ms-sf_group:1_demoted_0"/>
       </trigger>
       <trigger>
         <pseudo_event id="30" operation="demote" operation_key="ms-sf_demote_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="9">
     <action_set>
       <pseudo_event id="30" operation="demote" operation_key="ms-sf_demote_0">
         <attributes CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_promoted_max="1" CRM_meta_promoted_node_max="1" CRM_meta_timeout="120000" />
       </pseudo_event>
     </action_set>
     <inputs/>
   </synapse>
   <synapse id="10" priority="1000000">
     <action_set>
       <pseudo_event id="27" operation="stopped" operation_key="ms-sf_stopped_0">
         <attributes CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_promoted_max="1" CRM_meta_promoted_node_max="1" CRM_meta_timeout="120000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
         <pseudo_event id="19" operation="stopped" operation_key="ms-sf_group:1_stopped_0"/>
       </trigger>
       <trigger>
         <pseudo_event id="26" operation="stop" operation_key="ms-sf_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="11">
     <action_set>
       <pseudo_event id="26" operation="stop" operation_key="ms-sf_stop_0">
         <attributes CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_promoted_max="1" CRM_meta_promoted_node_max="1" CRM_meta_timeout="120000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
         <pseudo_event id="31" operation="demoted" operation_key="ms-sf_demoted_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="12">
     <action_set>
       <crm_event id="32" operation="do_shutdown" operation_key="do_shutdown-process1a" on_node="process1a" on_node_uuid="4dbb8c56-330e-4835-a15e-c0aa632d4e89">
         <attributes CRM_meta_on_node="process1a" CRM_meta_on_node_uuid="4dbb8c56-330e-4835-a15e-c0aa632d4e89" CRM_meta_op_no_wait="true" />
         <downed>
           <node id="4dbb8c56-330e-4835-a15e-c0aa632d4e89"/>
         </downed>
       </crm_event>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="13" operation="stop" operation_key="master_slave_Stateful:1_stop_0" on_node="process1a" on_node_uuid="4dbb8c56-330e-4835-a15e-c0aa632d4e89"/>
+        <rsc_op id="13" operation="stop" operation_key="promotable_Stateful:1_stop_0" on_node="process1a" on_node_uuid="4dbb8c56-330e-4835-a15e-c0aa632d4e89"/>
       </trigger>
       <trigger>
-        <rsc_op id="15" operation="stop" operation_key="master_slave_procdctl:1_stop_0" on_node="process1a" on_node_uuid="4dbb8c56-330e-4835-a15e-c0aa632d4e89"/>
+        <rsc_op id="15" operation="stop" operation_key="promotable_procdctl:1_stop_0" on_node="process1a" on_node_uuid="4dbb8c56-330e-4835-a15e-c0aa632d4e89"/>
       </trigger>
     </inputs>
   </synapse>
 </transition_graph>
diff --git a/cts/scheduler/exp/clbz5007-promotable-colocation.exp b/cts/scheduler/exp/clbz5007-promotable-colocation.exp
index e2b20fa2a0..8ce6372476 100644
--- a/cts/scheduler/exp/clbz5007-promotable-colocation.exp
+++ b/cts/scheduler/exp/clbz5007-promotable-colocation.exp
@@ -1,46 +1,46 @@
 <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="34" operation="start" operation_key="SLAVE_IP_start_0" on_node="fc16-builder2" on_node_uuid="fc16-builder2">
-        <primitive id="SLAVE_IP" class="ocf" provider="pacemaker" type="Dummy"/>
+      <rsc_op id="34" operation="start" operation_key="UNPROMOTED_IP_start_0" on_node="fc16-builder2" on_node_uuid="fc16-builder2">
+        <primitive id="UNPROMOTED_IP" class="ocf" provider="pacemaker" type="Dummy"/>
         <attributes CRM_meta_on_node="fc16-builder2" CRM_meta_on_node_uuid="fc16-builder2" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="33" operation="stop" operation_key="SLAVE_IP_stop_0" on_node="fc16-builder" on_node_uuid="fc16-builder"/>
+        <rsc_op id="33" operation="stop" operation_key="UNPROMOTED_IP_stop_0" on_node="fc16-builder" on_node_uuid="fc16-builder"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="1">
     <action_set>
-      <rsc_op id="33" operation="stop" operation_key="SLAVE_IP_stop_0" on_node="fc16-builder" on_node_uuid="fc16-builder">
-        <primitive id="SLAVE_IP" class="ocf" provider="pacemaker" type="Dummy"/>
+      <rsc_op id="33" operation="stop" operation_key="UNPROMOTED_IP_stop_0" on_node="fc16-builder" on_node_uuid="fc16-builder">
+        <primitive id="UNPROMOTED_IP" class="ocf" provider="pacemaker" type="Dummy"/>
         <attributes CRM_meta_on_node="fc16-builder" CRM_meta_on_node_uuid="fc16-builder" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs/>
   </synapse>
   <synapse id="2">
     <action_set>
-      <rsc_op id="36" operation="start" operation_key="MASTER_IP_start_0" on_node="fc16-builder" on_node_uuid="fc16-builder">
-        <primitive id="MASTER_IP" class="ocf" provider="pacemaker" type="Dummy"/>
+      <rsc_op id="36" operation="start" operation_key="PROMOTED_IP_start_0" on_node="fc16-builder" on_node_uuid="fc16-builder">
+        <primitive id="PROMOTED_IP" class="ocf" provider="pacemaker" type="Dummy"/>
         <attributes CRM_meta_on_node="fc16-builder" CRM_meta_on_node_uuid="fc16-builder" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="35" operation="stop" operation_key="MASTER_IP_stop_0" on_node="fc16-builder2" on_node_uuid="fc16-builder2"/>
+        <rsc_op id="35" operation="stop" operation_key="PROMOTED_IP_stop_0" on_node="fc16-builder2" on_node_uuid="fc16-builder2"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="3">
     <action_set>
-      <rsc_op id="35" operation="stop" operation_key="MASTER_IP_stop_0" on_node="fc16-builder2" on_node_uuid="fc16-builder2">
-        <primitive id="MASTER_IP" class="ocf" provider="pacemaker" type="Dummy"/>
+      <rsc_op id="35" operation="stop" operation_key="PROMOTED_IP_stop_0" on_node="fc16-builder2" on_node_uuid="fc16-builder2">
+        <primitive id="PROMOTED_IP" class="ocf" provider="pacemaker" type="Dummy"/>
         <attributes CRM_meta_on_node="fc16-builder2" CRM_meta_on_node_uuid="fc16-builder2" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs/>
   </synapse>
 </transition_graph>
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/exp/promoted-group.exp b/cts/scheduler/exp/promoted-group.exp
index fbe0845a45..ef7e0937d0 100644
--- a/cts/scheduler/exp/promoted-group.exp
+++ b/cts/scheduler/exp/promoted-group.exp
@@ -1,84 +1,84 @@
 <transition_graph cluster-delay="180s" stonith-timeout="60s" failed-stop-offset="INFINITY" failed-start-offset="INFINITY"  transition_id="0">
   <synapse id="0">
     <action_set>
       <pseudo_event id="31" operation="promoted" operation_key="grp_ms_sf:1_promoted_0">
         <attributes CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_promoted_max="1" CRM_meta_promoted_node_max="1" CRM_meta_timeout="120000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="22" operation="promote" operation_key="master_slave_Stateful:1_promote_0" on_node="rh44-1" on_node_uuid="782b1222-d1b9-4993-8f0d-b8b67801a2c8"/>
+        <rsc_op id="22" operation="promote" operation_key="promotable_Stateful:1_promote_0" on_node="rh44-1" on_node_uuid="782b1222-d1b9-4993-8f0d-b8b67801a2c8"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="1">
     <action_set>
       <pseudo_event id="30" operation="promote" operation_key="grp_ms_sf:1_promote_0">
         <attributes CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_promoted_max="1" CRM_meta_promoted_node_max="1" CRM_meta_timeout="120000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
         <pseudo_event id="36" operation="promote" operation_key="ms-sf_promote_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="2">
     <action_set>
-      <rsc_op id="23" operation="monitor" operation_key="master_slave_Stateful:1_monitor_6000" on_node="rh44-1" on_node_uuid="782b1222-d1b9-4993-8f0d-b8b67801a2c8">
-        <primitive id="master_slave_Stateful:1" class="ocf" provider="heartbeat" type="Stateful"/>
+      <rsc_op id="23" operation="monitor" operation_key="promotable_Stateful:1_monitor_6000" on_node="rh44-1" on_node_uuid="782b1222-d1b9-4993-8f0d-b8b67801a2c8">
+        <primitive id="promotable_Stateful:1" class="ocf" provider="heartbeat" type="Stateful"/>
         <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_interval="6000" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_name="monitor" CRM_meta_notify="false" CRM_meta_on_node="rh44-1" CRM_meta_on_node_uuid="782b1222-d1b9-4993-8f0d-b8b67801a2c8" CRM_meta_op_target_rc="8" CRM_meta_promoted_max="1" CRM_meta_promoted_node_max="1" CRM_meta_role="Promoted" CRM_meta_timeout="30000" />
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="22" operation="promote" operation_key="master_slave_Stateful:1_promote_0" on_node="rh44-1" on_node_uuid="782b1222-d1b9-4993-8f0d-b8b67801a2c8"/>
+        <rsc_op id="22" operation="promote" operation_key="promotable_Stateful:1_promote_0" on_node="rh44-1" on_node_uuid="782b1222-d1b9-4993-8f0d-b8b67801a2c8"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="3">
     <action_set>
-      <rsc_op id="22" operation="promote" operation_key="master_slave_Stateful:1_promote_0" on_node="rh44-1" on_node_uuid="782b1222-d1b9-4993-8f0d-b8b67801a2c8">
-        <primitive id="master_slave_Stateful:1" class="ocf" provider="heartbeat" type="Stateful"/>
+      <rsc_op id="22" operation="promote" operation_key="promotable_Stateful:1_promote_0" on_node="rh44-1" on_node_uuid="782b1222-d1b9-4993-8f0d-b8b67801a2c8">
+        <primitive id="promotable_Stateful:1" class="ocf" provider="heartbeat" type="Stateful"/>
         <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_on_node="rh44-1" CRM_meta_on_node_uuid="782b1222-d1b9-4993-8f0d-b8b67801a2c8" CRM_meta_promoted_max="1" CRM_meta_promoted_node_max="1" CRM_meta_timeout="120000" />
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="1" operation="cancel" operation_key="master_slave_Stateful:1_monitor_5000" on_node="rh44-1" on_node_uuid="782b1222-d1b9-4993-8f0d-b8b67801a2c8"/>
+        <rsc_op id="1" operation="cancel" operation_key="promotable_Stateful:1_monitor_5000" on_node="rh44-1" on_node_uuid="782b1222-d1b9-4993-8f0d-b8b67801a2c8"/>
       </trigger>
       <trigger>
         <pseudo_event id="30" operation="promote" operation_key="grp_ms_sf:1_promote_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="4">
     <action_set>
-      <rsc_op id="1" operation="cancel" operation_key="master_slave_Stateful:1_monitor_5000" on_node="rh44-1" on_node_uuid="782b1222-d1b9-4993-8f0d-b8b67801a2c8">
-        <primitive id="master_slave_Stateful:1" class="ocf" provider="heartbeat" type="Stateful"/>
+      <rsc_op id="1" operation="cancel" operation_key="promotable_Stateful:1_monitor_5000" on_node="rh44-1" on_node_uuid="782b1222-d1b9-4993-8f0d-b8b67801a2c8">
+        <primitive id="promotable_Stateful:1" class="ocf" provider="heartbeat" type="Stateful"/>
         <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_interval="5000" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_name="monitor" CRM_meta_notify="false" CRM_meta_on_node="rh44-1" CRM_meta_on_node_uuid="782b1222-d1b9-4993-8f0d-b8b67801a2c8" CRM_meta_operation="monitor" CRM_meta_promoted_max="1" CRM_meta_promoted_node_max="1" CRM_meta_timeout="30000" />
       </rsc_op>
     </action_set>
     <inputs/>
   </synapse>
   <synapse id="5" priority="1000000">
     <action_set>
       <pseudo_event id="37" operation="promoted" operation_key="ms-sf_promoted_0">
         <attributes CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_promoted_max="1" CRM_meta_promoted_node_max="1" CRM_meta_timeout="120000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
         <pseudo_event id="31" operation="promoted" operation_key="grp_ms_sf:1_promoted_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="6">
     <action_set>
       <pseudo_event id="36" operation="promote" operation_key="ms-sf_promote_0">
         <attributes CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_promoted_max="1" CRM_meta_promoted_node_max="1" CRM_meta_timeout="120000" />
       </pseudo_event>
     </action_set>
     <inputs/>
   </synapse>
 </transition_graph>
diff --git a/cts/scheduler/scores/bug-1822.scores b/cts/scheduler/scores/bug-1822.scores
index 54d63f7449..4f79b5f83f 100644
--- a/cts/scheduler/scores/bug-1822.scores
+++ b/cts/scheduler/scores/bug-1822.scores
@@ -1,37 +1,37 @@
 
 ms-sf_group:0 promotion score on process2b: -INFINITY
 ms-sf_group:1 promotion score on none: 0
-pcmk__clone_allocate: master_slave_Stateful:0 allocation score on process1a: 0
-pcmk__clone_allocate: master_slave_Stateful:0 allocation score on process2b: INFINITY
-pcmk__clone_allocate: master_slave_Stateful:1 allocation score on process1a: INFINITY
-pcmk__clone_allocate: master_slave_Stateful:1 allocation score on process2b: 0
-pcmk__clone_allocate: master_slave_procdctl:0 allocation score on process1a: -INFINITY
-pcmk__clone_allocate: master_slave_procdctl:0 allocation score on process2b: -INFINITY
-pcmk__clone_allocate: master_slave_procdctl:1 allocation score on process1a: INFINITY
-pcmk__clone_allocate: master_slave_procdctl:1 allocation score on process2b: -INFINITY
 pcmk__clone_allocate: ms-sf allocation score on process1a: 0
 pcmk__clone_allocate: ms-sf allocation score on process2b: 0
 pcmk__clone_allocate: ms-sf_group:0 allocation score on process1a: 0
 pcmk__clone_allocate: ms-sf_group:0 allocation score on process2b: 0
 pcmk__clone_allocate: ms-sf_group:1 allocation score on process1a: 0
 pcmk__clone_allocate: ms-sf_group:1 allocation score on process2b: 0
-pcmk__group_allocate: master_slave_Stateful:0 allocation score on process1a: -INFINITY
-pcmk__group_allocate: master_slave_Stateful:0 allocation score on process2b: INFINITY
-pcmk__group_allocate: master_slave_Stateful:1 allocation score on process1a: -INFINITY
-pcmk__group_allocate: master_slave_Stateful:1 allocation score on process2b: -INFINITY
-pcmk__group_allocate: master_slave_procdctl:0 allocation score on process1a: -INFINITY
-pcmk__group_allocate: master_slave_procdctl:0 allocation score on process2b: -INFINITY
-pcmk__group_allocate: master_slave_procdctl:1 allocation score on process1a: -INFINITY
-pcmk__group_allocate: master_slave_procdctl:1 allocation score on process2b: -INFINITY
+pcmk__clone_allocate: promotable_Stateful:0 allocation score on process1a: 0
+pcmk__clone_allocate: promotable_Stateful:0 allocation score on process2b: INFINITY
+pcmk__clone_allocate: promotable_Stateful:1 allocation score on process1a: INFINITY
+pcmk__clone_allocate: promotable_Stateful:1 allocation score on process2b: 0
+pcmk__clone_allocate: promotable_procdctl:0 allocation score on process1a: -INFINITY
+pcmk__clone_allocate: promotable_procdctl:0 allocation score on process2b: -INFINITY
+pcmk__clone_allocate: promotable_procdctl:1 allocation score on process1a: INFINITY
+pcmk__clone_allocate: promotable_procdctl:1 allocation score on process2b: -INFINITY
 pcmk__group_allocate: ms-sf_group:0 allocation score on process1a: -INFINITY
 pcmk__group_allocate: ms-sf_group:0 allocation score on process2b: 0
 pcmk__group_allocate: ms-sf_group:1 allocation score on process1a: -INFINITY
 pcmk__group_allocate: ms-sf_group:1 allocation score on process2b: -INFINITY
-pcmk__primitive_assign: master_slave_Stateful:0 allocation score on process1a: -INFINITY
-pcmk__primitive_assign: master_slave_Stateful:0 allocation score on process2b: INFINITY
-pcmk__primitive_assign: master_slave_Stateful:1 allocation score on process1a: -INFINITY
-pcmk__primitive_assign: master_slave_Stateful:1 allocation score on process2b: -INFINITY
-pcmk__primitive_assign: master_slave_procdctl:0 allocation score on process1a: -INFINITY
-pcmk__primitive_assign: master_slave_procdctl:0 allocation score on process2b: -INFINITY
-pcmk__primitive_assign: master_slave_procdctl:1 allocation score on process1a: -INFINITY
-pcmk__primitive_assign: master_slave_procdctl:1 allocation score on process2b: -INFINITY
+pcmk__group_allocate: promotable_Stateful:0 allocation score on process1a: -INFINITY
+pcmk__group_allocate: promotable_Stateful:0 allocation score on process2b: INFINITY
+pcmk__group_allocate: promotable_Stateful:1 allocation score on process1a: -INFINITY
+pcmk__group_allocate: promotable_Stateful:1 allocation score on process2b: -INFINITY
+pcmk__group_allocate: promotable_procdctl:0 allocation score on process1a: -INFINITY
+pcmk__group_allocate: promotable_procdctl:0 allocation score on process2b: -INFINITY
+pcmk__group_allocate: promotable_procdctl:1 allocation score on process1a: -INFINITY
+pcmk__group_allocate: promotable_procdctl:1 allocation score on process2b: -INFINITY
+pcmk__primitive_assign: promotable_Stateful:0 allocation score on process1a: -INFINITY
+pcmk__primitive_assign: promotable_Stateful:0 allocation score on process2b: INFINITY
+pcmk__primitive_assign: promotable_Stateful:1 allocation score on process1a: -INFINITY
+pcmk__primitive_assign: promotable_Stateful:1 allocation score on process2b: -INFINITY
+pcmk__primitive_assign: promotable_procdctl:0 allocation score on process1a: -INFINITY
+pcmk__primitive_assign: promotable_procdctl:0 allocation score on process2b: -INFINITY
+pcmk__primitive_assign: promotable_procdctl:1 allocation score on process1a: -INFINITY
+pcmk__primitive_assign: promotable_procdctl:1 allocation score on process2b: -INFINITY
diff --git a/cts/scheduler/scores/clbz5007-promotable-colocation.scores b/cts/scheduler/scores/clbz5007-promotable-colocation.scores
index 435e89414e..cbaab5c844 100644
--- a/cts/scheduler/scores/clbz5007-promotable-colocation.scores
+++ b/cts/scheduler/scores/clbz5007-promotable-colocation.scores
@@ -1,17 +1,17 @@
 
 DUMMY:0 promotion score on fc16-builder: 10
 DUMMY:1 promotion score on fc16-builder2: 5
 pcmk__clone_allocate: DUMMY:0 allocation score on fc16-builder2: 0
 pcmk__clone_allocate: DUMMY:0 allocation score on fc16-builder: 11
 pcmk__clone_allocate: DUMMY:1 allocation score on fc16-builder2: 6
 pcmk__clone_allocate: DUMMY:1 allocation score on fc16-builder: 0
 pcmk__clone_allocate: MS_DUMMY allocation score on fc16-builder2: 0
 pcmk__clone_allocate: MS_DUMMY allocation score on fc16-builder: 0
 pcmk__primitive_assign: DUMMY:0 allocation score on fc16-builder2: 0
 pcmk__primitive_assign: DUMMY:0 allocation score on fc16-builder: 11
 pcmk__primitive_assign: DUMMY:1 allocation score on fc16-builder2: 6
 pcmk__primitive_assign: DUMMY:1 allocation score on fc16-builder: -INFINITY
-pcmk__primitive_assign: MASTER_IP allocation score on fc16-builder2: -INFINITY
-pcmk__primitive_assign: MASTER_IP allocation score on fc16-builder: 11
-pcmk__primitive_assign: SLAVE_IP allocation score on fc16-builder2: 1000
-pcmk__primitive_assign: SLAVE_IP allocation score on fc16-builder: 101
+pcmk__primitive_assign: PROMOTED_IP allocation score on fc16-builder2: -INFINITY
+pcmk__primitive_assign: PROMOTED_IP allocation score on fc16-builder: 11
+pcmk__primitive_assign: UNPROMOTED_IP allocation score on fc16-builder2: 1000
+pcmk__primitive_assign: UNPROMOTED_IP allocation score on fc16-builder: 101
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/scores/promoted-group.scores b/cts/scheduler/scores/promoted-group.scores
index df15545a03..d4a4919c51 100644
--- a/cts/scheduler/scores/promoted-group.scores
+++ b/cts/scheduler/scores/promoted-group.scores
@@ -1,31 +1,31 @@
 
 grp_ms_sf:0 promotion score on rh44-2: 49
 grp_ms_sf:1 promotion score on rh44-1: 99
 pcmk__clone_allocate: grp_ms_sf:0 allocation score on rh44-1: 0
 pcmk__clone_allocate: grp_ms_sf:0 allocation score on rh44-2: 0
 pcmk__clone_allocate: grp_ms_sf:1 allocation score on rh44-1: 0
 pcmk__clone_allocate: grp_ms_sf:1 allocation score on rh44-2: 0
-pcmk__clone_allocate: master_slave_Stateful:0 allocation score on rh44-1: 0
-pcmk__clone_allocate: master_slave_Stateful:0 allocation score on rh44-2: INFINITY
-pcmk__clone_allocate: master_slave_Stateful:1 allocation score on rh44-1: INFINITY
-pcmk__clone_allocate: master_slave_Stateful:1 allocation score on rh44-2: 0
 pcmk__clone_allocate: ms-sf allocation score on rh44-1: 0
 pcmk__clone_allocate: ms-sf allocation score on rh44-2: 0
+pcmk__clone_allocate: promotable_Stateful:0 allocation score on rh44-1: 0
+pcmk__clone_allocate: promotable_Stateful:0 allocation score on rh44-2: INFINITY
+pcmk__clone_allocate: promotable_Stateful:1 allocation score on rh44-1: INFINITY
+pcmk__clone_allocate: promotable_Stateful:1 allocation score on rh44-2: 0
 pcmk__group_allocate: grp_ms_sf:0 allocation score on rh44-1: 0
 pcmk__group_allocate: grp_ms_sf:0 allocation score on rh44-2: 0
 pcmk__group_allocate: grp_ms_sf:1 allocation score on rh44-1: 0
 pcmk__group_allocate: grp_ms_sf:1 allocation score on rh44-2: -INFINITY
-pcmk__group_allocate: master_slave_Stateful:0 allocation score on rh44-1: 0
-pcmk__group_allocate: master_slave_Stateful:0 allocation score on rh44-2: INFINITY
-pcmk__group_allocate: master_slave_Stateful:1 allocation score on rh44-1: INFINITY
-pcmk__group_allocate: master_slave_Stateful:1 allocation score on rh44-2: -INFINITY
+pcmk__group_allocate: promotable_Stateful:0 allocation score on rh44-1: 0
+pcmk__group_allocate: promotable_Stateful:0 allocation score on rh44-2: INFINITY
+pcmk__group_allocate: promotable_Stateful:1 allocation score on rh44-1: INFINITY
+pcmk__group_allocate: promotable_Stateful:1 allocation score on rh44-2: -INFINITY
 pcmk__group_allocate: resource_1 allocation score on rh44-1: INFINITY
 pcmk__group_allocate: resource_1 allocation score on rh44-2: 100
 pcmk__group_allocate: test allocation score on rh44-1: 200
 pcmk__group_allocate: test allocation score on rh44-2: 100
-pcmk__primitive_assign: master_slave_Stateful:0 allocation score on rh44-1: 0
-pcmk__primitive_assign: master_slave_Stateful:0 allocation score on rh44-2: INFINITY
-pcmk__primitive_assign: master_slave_Stateful:1 allocation score on rh44-1: INFINITY
-pcmk__primitive_assign: master_slave_Stateful:1 allocation score on rh44-2: -INFINITY
+pcmk__primitive_assign: promotable_Stateful:0 allocation score on rh44-1: 0
+pcmk__primitive_assign: promotable_Stateful:0 allocation score on rh44-2: INFINITY
+pcmk__primitive_assign: promotable_Stateful:1 allocation score on rh44-1: INFINITY
+pcmk__primitive_assign: promotable_Stateful:1 allocation score on rh44-2: -INFINITY
 pcmk__primitive_assign: resource_1 allocation score on rh44-1: INFINITY
 pcmk__primitive_assign: resource_1 allocation score on rh44-2: 100
diff --git a/cts/scheduler/summary/bug-1822.summary b/cts/scheduler/summary/bug-1822.summary
index 00457a9c39..3890a02730 100644
--- a/cts/scheduler/summary/bug-1822.summary
+++ b/cts/scheduler/summary/bug-1822.summary
@@ -1,44 +1,44 @@
 Current cluster status:
   * Node List:
     * Online: [ process1a process2b ]
 
   * Full List of Resources:
     * Clone Set: ms-sf [ms-sf_group] (promotable, unique):
       * Resource Group: ms-sf_group:0:
-        * master_slave_Stateful:0	(ocf:heartbeat:Dummy-statful):	 Unpromoted process2b
-        * master_slave_procdctl:0	(ocf:heartbeat:procdctl):	 Stopped
+        * promotable_Stateful:0	(ocf:heartbeat:Dummy-statful):	 Unpromoted process2b
+        * promotable_procdctl:0	(ocf:heartbeat:procdctl):	 Stopped
       * Resource Group: ms-sf_group:1:
-        * master_slave_Stateful:1	(ocf:heartbeat:Dummy-statful):	 Promoted process1a
-        * master_slave_procdctl:1	(ocf:heartbeat:procdctl):	 Promoted process1a
+        * promotable_Stateful:1	(ocf:heartbeat:Dummy-statful):	 Promoted process1a
+        * promotable_procdctl:1	(ocf:heartbeat:procdctl):	 Promoted process1a
 
 Transition Summary:
-  * Stop       master_slave_Stateful:1     ( Promoted process1a )  due to node availability
-  * Stop       master_slave_procdctl:1     ( Promoted process1a )  due to node availability
+  * Stop       promotable_Stateful:1     ( Promoted process1a )  due to node availability
+  * Stop       promotable_procdctl:1     ( Promoted process1a )  due to node availability
 
 Executing Cluster Transition:
   * Pseudo action:   ms-sf_demote_0
   * Pseudo action:   ms-sf_group:1_demote_0
-  * Resource action: master_slave_Stateful:1 demote on process1a
-  * Resource action: master_slave_procdctl:1 demote on process1a
+  * Resource action: promotable_Stateful:1 demote on process1a
+  * Resource action: promotable_procdctl:1 demote on process1a
   * Pseudo action:   ms-sf_group:1_demoted_0
   * Pseudo action:   ms-sf_demoted_0
   * Pseudo action:   ms-sf_stop_0
   * Pseudo action:   ms-sf_group:1_stop_0
-  * Resource action: master_slave_Stateful:1 stop on process1a
-  * Resource action: master_slave_procdctl:1 stop on process1a
+  * Resource action: promotable_Stateful:1 stop on process1a
+  * Resource action: promotable_procdctl:1 stop on process1a
   * Cluster action:  do_shutdown on process1a
   * Pseudo action:   ms-sf_group:1_stopped_0
   * Pseudo action:   ms-sf_stopped_0
 
 Revised Cluster Status:
   * Node List:
     * Online: [ process1a process2b ]
 
   * Full List of Resources:
     * Clone Set: ms-sf [ms-sf_group] (promotable, unique):
       * Resource Group: ms-sf_group:0:
-        * master_slave_Stateful:0	(ocf:heartbeat:Dummy-statful):	 Unpromoted process2b
-        * master_slave_procdctl:0	(ocf:heartbeat:procdctl):	 Stopped
+        * promotable_Stateful:0	(ocf:heartbeat:Dummy-statful):	 Unpromoted process2b
+        * promotable_procdctl:0	(ocf:heartbeat:procdctl):	 Stopped
       * Resource Group: ms-sf_group:1:
-        * master_slave_Stateful:1	(ocf:heartbeat:Dummy-statful):	 Stopped
-        * master_slave_procdctl:1	(ocf:heartbeat:procdctl):	 Stopped
+        * promotable_Stateful:1	(ocf:heartbeat:Dummy-statful):	 Stopped
+        * promotable_procdctl:1	(ocf:heartbeat:procdctl):	 Stopped
diff --git a/cts/scheduler/summary/clbz5007-promotable-colocation.summary b/cts/scheduler/summary/clbz5007-promotable-colocation.summary
index 463fc10dde..98b2d75ca5 100644
--- a/cts/scheduler/summary/clbz5007-promotable-colocation.summary
+++ b/cts/scheduler/summary/clbz5007-promotable-colocation.summary
@@ -1,31 +1,31 @@
 Current cluster status:
   * Node List:
     * Online: [ fc16-builder fc16-builder2 ]
 
   * Full List of Resources:
     * Clone Set: MS_DUMMY [DUMMY] (promotable):
       * Promoted: [ fc16-builder ]
       * Unpromoted: [ fc16-builder2 ]
-    * SLAVE_IP	(ocf:pacemaker:Dummy):	 Started fc16-builder
-    * MASTER_IP	(ocf:pacemaker:Dummy):	 Started fc16-builder2
+    * UNPROMOTED_IP	(ocf:pacemaker:Dummy):	 Started fc16-builder
+    * PROMOTED_IP	(ocf:pacemaker:Dummy):	 Started fc16-builder2
 
 Transition Summary:
-  * Move       SLAVE_IP     ( fc16-builder -> fc16-builder2 )
-  * Move       MASTER_IP    ( fc16-builder2 -> fc16-builder )
+  * Move       UNPROMOTED_IP     ( fc16-builder -> fc16-builder2 )
+  * Move       PROMOTED_IP     ( fc16-builder2 -> fc16-builder )
 
 Executing Cluster Transition:
-  * Resource action: SLAVE_IP        stop on fc16-builder
-  * Resource action: MASTER_IP       stop on fc16-builder2
-  * Resource action: SLAVE_IP        start on fc16-builder2
-  * Resource action: MASTER_IP       start on fc16-builder
+  * Resource action: UNPROMOTED_IP   stop on fc16-builder
+  * Resource action: PROMOTED_IP     stop on fc16-builder2
+  * Resource action: UNPROMOTED_IP   start on fc16-builder2
+  * Resource action: PROMOTED_IP     start on fc16-builder
 
 Revised Cluster Status:
   * Node List:
     * Online: [ fc16-builder fc16-builder2 ]
 
   * Full List of Resources:
     * Clone Set: MS_DUMMY [DUMMY] (promotable):
       * Promoted: [ fc16-builder ]
       * Unpromoted: [ fc16-builder2 ]
-    * SLAVE_IP	(ocf:pacemaker:Dummy):	 Started fc16-builder2
-    * MASTER_IP	(ocf:pacemaker:Dummy):	 Started fc16-builder
+    * UNPROMOTED_IP	(ocf:pacemaker:Dummy):	 Started fc16-builder2
+    * PROMOTED_IP	(ocf:pacemaker:Dummy):	 Started fc16-builder
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/summary/promoted-group.summary b/cts/scheduler/summary/promoted-group.summary
index 594d1b50d4..44b380c25b 100644
--- a/cts/scheduler/summary/promoted-group.summary
+++ b/cts/scheduler/summary/promoted-group.summary
@@ -1,37 +1,37 @@
 Current cluster status:
   * Node List:
     * Online: [ rh44-1 rh44-2 ]
 
   * Full List of Resources:
     * Resource Group: test:
       * resource_1	(ocf:heartbeat:IPaddr):	 Started rh44-1
     * Clone Set: ms-sf [grp_ms_sf] (promotable, unique):
       * Resource Group: grp_ms_sf:0:
-        * master_slave_Stateful:0	(ocf:heartbeat:Stateful):	 Unpromoted rh44-2
+        * promotable_Stateful:0	(ocf:heartbeat:Stateful):	 Unpromoted rh44-2
       * Resource Group: grp_ms_sf:1:
-        * master_slave_Stateful:1	(ocf:heartbeat:Stateful):	 Unpromoted rh44-1
+        * promotable_Stateful:1	(ocf:heartbeat:Stateful):	 Unpromoted rh44-1
 
 Transition Summary:
-  * Promote    master_slave_Stateful:1     ( Unpromoted -> Promoted rh44-1 )
+  * Promote    promotable_Stateful:1     ( Unpromoted -> Promoted rh44-1 )
 
 Executing Cluster Transition:
-  * Resource action: master_slave_Stateful:1 cancel=5000 on rh44-1
+  * Resource action: promotable_Stateful:1 cancel=5000 on rh44-1
   * Pseudo action:   ms-sf_promote_0
   * Pseudo action:   grp_ms_sf:1_promote_0
-  * Resource action: master_slave_Stateful:1 promote on rh44-1
+  * Resource action: promotable_Stateful:1 promote on rh44-1
   * Pseudo action:   grp_ms_sf:1_promoted_0
-  * Resource action: master_slave_Stateful:1 monitor=6000 on rh44-1
+  * Resource action: promotable_Stateful:1 monitor=6000 on rh44-1
   * Pseudo action:   ms-sf_promoted_0
 
 Revised Cluster Status:
   * Node List:
     * Online: [ rh44-1 rh44-2 ]
 
   * Full List of Resources:
     * Resource Group: test:
       * resource_1	(ocf:heartbeat:IPaddr):	 Started rh44-1
     * Clone Set: ms-sf [grp_ms_sf] (promotable, unique):
       * Resource Group: grp_ms_sf:0:
-        * master_slave_Stateful:0	(ocf:heartbeat:Stateful):	 Unpromoted rh44-2
+        * promotable_Stateful:0	(ocf:heartbeat:Stateful):	 Unpromoted rh44-2
       * Resource Group: grp_ms_sf:1:
-        * master_slave_Stateful:1	(ocf:heartbeat:Stateful):	 Promoted rh44-1
+        * promotable_Stateful:1	(ocf:heartbeat:Stateful):	 Promoted rh44-1
diff --git a/cts/scheduler/xml/bug-1822.xml b/cts/scheduler/xml/bug-1822.xml
index 2dba17de80..ae673fb46d 100644
--- a/cts/scheduler/xml/bug-1822.xml
+++ b/cts/scheduler/xml/bug-1822.xml
@@ -1,169 +1,169 @@
 <cib admin_epoch="0" epoch="68" num_updates="74" dc-uuid="e38f935d-6059-4540-8679-bc32a8256839" have-quorum="true" remote-tls-port="0" validate-with="pacemaker-3.7" cib-last-written="Fri Jul 13 13:51:00 2012">
   <configuration>
     <crm_config>
       <cluster_property_set id="set01">
         <nvpair id="nvpair.id21867" name="stonith-enabled" value="false"/>
         <nvpair id="nvpair.id21875" name="stonith-action" value="reboot"/>
         <nvpair id="nvpair.id21884" name="cluster-delay" value="180s"/>
         <nvpair id="nvpair.id21901" name="no-quorum-policy" value="ignore"/>
         <nvpair id="nvpair.id21910" name="symmetric-cluster" value="true"/>
         <nvpair id="nvpair.id21938" name="stop-orphan-resources" value="true"/>
         <nvpair id="nvpair.id21947" name="stop-orphan-actions" value="true"/>
         <nvpair id="nvpair.id21965" name="dc-deadtime" value="10s"/>
         <nvpair id="nvpair.id21973" name="cluster-recheck-interval" value="0"/>
         <nvpair id="nvpair.id21982" name="election-timeout" value="2min"/>
         <nvpair id="nvpair.id21991" name="shutdown-escalation" value="20min"/>
         <nvpair id="nvpair.id22000" name="crmd-integration-timeout" value="3min"/>
         <nvpair id="nvpair.id22009" name="crmd-finalization-timeout" value="10min"/>
         <nvpair id="nvpair.id22018" name="pe-error-series-max" value="-1"/>
         <nvpair id="nvpair.id22027" name="pe-warn-series-max" value="-1"/>
         <nvpair id="nvpair.id22036" name="pe-input-series-max" value="-1"/>
         <nvpair id="nvpair.id22045" name="startup-fencing" value="true"/>
       </cluster_property_set>
       <cluster_property_set id="cib-bootstrap-options">
         <nvpair name="last-lrm-refresh" id="nvpair.id22062" value="1189560161"/>
         <nvpair name="dc-version" id="nvpair.id22071" value="2.1.3-node: 09a2043b4cd2682f88dd1a81dc32a6d1d1870f06"/>
       </cluster_property_set>
     </crm_config>
     <rsc_defaults>
       <meta_attributes id="nvpair.id218777">
         <nvpair id="nvpair.id21877" name="migration-threshold" value="1"/>
         <nvpair id="rsc_defaults-resource-stickiness" name="resource-stickiness" value="INFINITY"/>
       </meta_attributes>
     </rsc_defaults>
     <op_defaults>
       <meta_attributes id="op_defaults-meta_attributes">
         <nvpair id="op_defaults-timeout" name="timeout" value="120s"/>
       </meta_attributes>
     </op_defaults>
     <nodes>
       <node id="4dbb8c56-330e-4835-a15e-c0aa632d4e89" uname="process1a" type="member"/>
       <node id="e38f935d-6059-4540-8679-bc32a8256839" uname="process2b" type="member"/>
     </nodes>
     <resources>
       <clone id="ms-sf">
         <group id="ms-sf_group">
-          <primitive id="master_slave_Stateful" class="ocf" type="Dummy-statful" provider="heartbeat">
+          <primitive id="promotable_Stateful" class="ocf" type="Dummy-statful" provider="heartbeat">
             <operations>
               <op name="start" interval="0" id="stateful_start" timeout="60s" on-fail="stop"/>
               <op name="monitor" interval="600s" id="stateful_monitor" timeout="60s" on-fail="stop"/>
               <op name="stop" interval="0" id="stateful_stop" timeout="60s" on-fail="stop"/>
             </operations>
             <instance_attributes id="instance_attributes.id22215">
               <nvpair id="nvpair.id22222" name="sleep_time" value="10000"/>
             </instance_attributes>
           </primitive>
-          <primitive id="master_slave_procdctl" class="ocf" type="procdctl" provider="heartbeat">
+          <primitive id="promotable_procdctl" class="ocf" type="procdctl" provider="heartbeat">
             <operations>
               <op name="start" interval="0" id="ctl_start" timeout="60s" on-fail="stop"/>
               <op name="monitor" interval="600s" id="ctl_monitor" timeout="60s" on-fail="stop"/>
               <op name="stop" interval="0" id="ctl_stop" timeout="60s" on-fail="stop"/>
             </operations>
             <instance_attributes id="instance_attributes.id22281">
               <nvpair id="nvpair.id22288" name="procd" value="sleep 10000"/>
             </instance_attributes>
           </primitive>
           <meta_attributes id="group-ms-sf_group.meta"/>
         </group>
         <meta_attributes id="clone-ms-sf.meta">
           <nvpair id="promotable.meta.auto-79" name="promotable" value="true"/>
           <nvpair id="ordered.meta.auto-79" name="ordered" value="false"/>
           <nvpair id="interleave.meta.auto-79" name="interleave" value="false"/>
           <nvpair id="notify.meta.auto-79" name="notify" value="false"/>
           <nvpair id="nvpair.meta.auto-85" name="clone-max" value="2"/>
           <nvpair id="nvpair.meta.auto-87" name="clone-node-max" value="1"/>
           <nvpair id="nvpair.meta.auto-89" name="promoted-max" value="1"/>
           <nvpair id="nvpair.meta.auto-91" name="promoted-node-max" value="1"/>
           <nvpair id="unique-1" name="globally-unique" value="true"/>
         </meta_attributes>
       </clone>
     </resources>
     <constraints>
       <rsc_location id="loc-ms-sf" rsc="ms-sf">
         <rule id="rule-ms-sf-0" role="Promoted" score="100">
           <expression attribute="#uname" operation="eq" value="process1a" id="expression.id22321"/>
         </rule>
         <rule id="rule-ms-sf-1" role="Promoted" score="50">
           <expression attribute="#uname" operation="eq" value="process2b" id="expression.id22340"/>
         </rule>
       </rsc_location>
     </constraints>
   </configuration>
   <status>
     <node_state id="4dbb8c56-330e-4835-a15e-c0aa632d4e89" uname="process1a" crmd="online" shutdown="1200361857" in_ccm="true" join="member" ha="active" expected="down">
       <transient_attributes id="transient_attributes.auto-1">
         <instance_attributes id="instance_attributes.shutdown">
           <nvpair id="nvp.shutdown" name="shutdown" value="1234"/>
         </instance_attributes>
         <instance_attributes id="instance_attributes.id22381">
           <nvpair id="nvpair.id22388" name="default_ping_set" value="100"/>
           <nvpair id="nvpair.id22397" name="probe_complete" value="true"/>
-          <nvpair id="nvpair.id22407" name="fail-count-master_slave_procdctl:0" value="1"/>
+          <nvpair id="nvpair.id22407" name="fail-count-promotable_procdctl:0" value="1"/>
         </instance_attributes>
       </transient_attributes>
       <lrm id="lrm.auto-1">
         <lrm_resources id="lrm_resources.id22425">
-          <lrm_resource id="master_slave_procdctl:0" type="procdctl" class="ocf" provider="heartbeat">
-            <lrm_rsc_op id="master_slave_procdctl-0_monitor_0" operation="monitor" transition-key="4:0:7:45cb54ab-1707-4655-87e9-3445a5a41d58" transition-magic="0:7;4:0:7:45cb54ab-1707-4655-87e9-3445a5a41d58" call-id="3" crm_feature_set="2.0" rc-code="7" op-status="0" interval="0" op-digest="607a19b4aed4ea719038c4e0cd4c8e46"/>
-            <lrm_rsc_op id="master_slave_procdctl-0_start_0" operation="start" transition-key="7:1:0:45cb54ab-1707-4655-87e9-3445a5a41d58" transition-magic="0:0;7:1:0:45cb54ab-1707-4655-87e9-3445a5a41d58" call-id="7" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="607a19b4aed4ea719038c4e0cd4c8e46"/>
-            <lrm_rsc_op id="master_slave_procdctl-0_promote_0" operation="promote" transition-key="14:2:0:45cb54ab-1707-4655-87e9-3445a5a41d58" transition-magic="0:0;14:2:0:45cb54ab-1707-4655-87e9-3445a5a41d58" call-id="9" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="607a19b4aed4ea719038c4e0cd4c8e46"/>
-            <lrm_rsc_op id="master_slave_procdctl-0_demote_0" operation="demote" transition-key="23:6:0:45cb54ab-1707-4655-87e9-3445a5a41d58" transition-magic="0:0;23:6:0:45cb54ab-1707-4655-87e9-3445a5a41d58" call-id="12" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="607a19b4aed4ea719038c4e0cd4c8e46"/>
-            <lrm_rsc_op id="master_slave_procdctl-0_stop_0" operation="stop" transition-key="2:6:0:45cb54ab-1707-4655-87e9-3445a5a41d58" transition-magic="0:0;2:6:0:45cb54ab-1707-4655-87e9-3445a5a41d58" call-id="13" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="607a19b4aed4ea719038c4e0cd4c8e46"/>
+          <lrm_resource id="promotable_procdctl:0" type="procdctl" class="ocf" provider="heartbeat">
+            <lrm_rsc_op id="promotable_procdctl-0_monitor_0" operation="monitor" transition-key="4:0:7:45cb54ab-1707-4655-87e9-3445a5a41d58" transition-magic="0:7;4:0:7:45cb54ab-1707-4655-87e9-3445a5a41d58" call-id="3" crm_feature_set="2.0" rc-code="7" op-status="0" interval="0" op-digest="607a19b4aed4ea719038c4e0cd4c8e46"/>
+            <lrm_rsc_op id="promotable_procdctl-0_start_0" operation="start" transition-key="7:1:0:45cb54ab-1707-4655-87e9-3445a5a41d58" transition-magic="0:0;7:1:0:45cb54ab-1707-4655-87e9-3445a5a41d58" call-id="7" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="607a19b4aed4ea719038c4e0cd4c8e46"/>
+            <lrm_rsc_op id="promotable_procdctl-0_promote_0" operation="promote" transition-key="14:2:0:45cb54ab-1707-4655-87e9-3445a5a41d58" transition-magic="0:0;14:2:0:45cb54ab-1707-4655-87e9-3445a5a41d58" call-id="9" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="607a19b4aed4ea719038c4e0cd4c8e46"/>
+            <lrm_rsc_op id="promotable_procdctl-0_demote_0" operation="demote" transition-key="23:6:0:45cb54ab-1707-4655-87e9-3445a5a41d58" transition-magic="0:0;23:6:0:45cb54ab-1707-4655-87e9-3445a5a41d58" call-id="12" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="607a19b4aed4ea719038c4e0cd4c8e46"/>
+            <lrm_rsc_op id="promotable_procdctl-0_stop_0" operation="stop" transition-key="2:6:0:45cb54ab-1707-4655-87e9-3445a5a41d58" transition-magic="0:0;2:6:0:45cb54ab-1707-4655-87e9-3445a5a41d58" call-id="13" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="607a19b4aed4ea719038c4e0cd4c8e46"/>
           </lrm_resource>
-          <lrm_resource id="master_slave_Stateful:0" type="Dummy-statful" class="ocf" provider="heartbeat">
-            <lrm_rsc_op id="master_slave_Stateful-0_monitor_0" operation="monitor" transition-key="3:0:7:45cb54ab-1707-4655-87e9-3445a5a41d58" transition-magic="0:7;3:0:7:45cb54ab-1707-4655-87e9-3445a5a41d58" call-id="2" crm_feature_set="2.0" rc-code="7" op-status="0" interval="0" op-digest="b23e2bc1a5d8239bd4a4c58b71e3f413"/>
-            <lrm_rsc_op id="master_slave_Stateful-0_start_0" operation="start" transition-key="5:1:0:45cb54ab-1707-4655-87e9-3445a5a41d58" transition-magic="0:0;5:1:0:45cb54ab-1707-4655-87e9-3445a5a41d58" call-id="6" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="b23e2bc1a5d8239bd4a4c58b71e3f413"/>
-            <lrm_rsc_op id="master_slave_Stateful-0_promote_0" operation="promote" transition-key="10:2:0:45cb54ab-1707-4655-87e9-3445a5a41d58" transition-magic="0:0;10:2:0:45cb54ab-1707-4655-87e9-3445a5a41d58" call-id="8" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="b23e2bc1a5d8239bd4a4c58b71e3f413"/>
-            <lrm_rsc_op id="master_slave_Stateful-0_demote_0" operation="demote" transition-key="19:6:0:45cb54ab-1707-4655-87e9-3445a5a41d58" transition-magic="0:0;19:6:0:45cb54ab-1707-4655-87e9-3445a5a41d58" call-id="11" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="b23e2bc1a5d8239bd4a4c58b71e3f413"/>
-            <lrm_rsc_op id="master_slave_Stateful-0_stop_0" operation="stop" transition-key="20:6:0:45cb54ab-1707-4655-87e9-3445a5a41d58" transition-magic="0:0;20:6:0:45cb54ab-1707-4655-87e9-3445a5a41d58" call-id="14" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="b23e2bc1a5d8239bd4a4c58b71e3f413"/>
+          <lrm_resource id="promotable_Stateful:0" type="Dummy-statful" class="ocf" provider="heartbeat">
+            <lrm_rsc_op id="promotable_Stateful-0_monitor_0" operation="monitor" transition-key="3:0:7:45cb54ab-1707-4655-87e9-3445a5a41d58" transition-magic="0:7;3:0:7:45cb54ab-1707-4655-87e9-3445a5a41d58" call-id="2" crm_feature_set="2.0" rc-code="7" op-status="0" interval="0" op-digest="b23e2bc1a5d8239bd4a4c58b71e3f413"/>
+            <lrm_rsc_op id="promotable_Stateful-0_start_0" operation="start" transition-key="5:1:0:45cb54ab-1707-4655-87e9-3445a5a41d58" transition-magic="0:0;5:1:0:45cb54ab-1707-4655-87e9-3445a5a41d58" call-id="6" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="b23e2bc1a5d8239bd4a4c58b71e3f413"/>
+            <lrm_rsc_op id="promotable_Stateful-0_promote_0" operation="promote" transition-key="10:2:0:45cb54ab-1707-4655-87e9-3445a5a41d58" transition-magic="0:0;10:2:0:45cb54ab-1707-4655-87e9-3445a5a41d58" call-id="8" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="b23e2bc1a5d8239bd4a4c58b71e3f413"/>
+            <lrm_rsc_op id="promotable_Stateful-0_demote_0" operation="demote" transition-key="19:6:0:45cb54ab-1707-4655-87e9-3445a5a41d58" transition-magic="0:0;19:6:0:45cb54ab-1707-4655-87e9-3445a5a41d58" call-id="11" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="b23e2bc1a5d8239bd4a4c58b71e3f413"/>
+            <lrm_rsc_op id="promotable_Stateful-0_stop_0" operation="stop" transition-key="20:6:0:45cb54ab-1707-4655-87e9-3445a5a41d58" transition-magic="0:0;20:6:0:45cb54ab-1707-4655-87e9-3445a5a41d58" call-id="14" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="b23e2bc1a5d8239bd4a4c58b71e3f413"/>
           </lrm_resource>
-          <lrm_resource id="master_slave_procdctl:1" type="procdctl" class="ocf" provider="heartbeat">
-            <lrm_rsc_op id="master_slave_procdctl-1_monitor_0" operation="monitor" transition-key="6:0:7:45cb54ab-1707-4655-87e9-3445a5a41d58" transition-magic="0:7;6:0:7:45cb54ab-1707-4655-87e9-3445a5a41d58" call-id="5" crm_feature_set="2.0" rc-code="7" op-status="0" interval="0" op-digest="607a19b4aed4ea719038c4e0cd4c8e46"/>
-            <lrm_rsc_op id="master_slave_procdctl-1_start_0" operation="start" transition-key="14:6:0:45cb54ab-1707-4655-87e9-3445a5a41d58" transition-magic="0:0;14:6:0:45cb54ab-1707-4655-87e9-3445a5a41d58" call-id="16" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="607a19b4aed4ea719038c4e0cd4c8e46"/>
-            <lrm_rsc_op id="master_slave_procdctl-1_promote_0" operation="promote" transition-key="13:6:0:45cb54ab-1707-4655-87e9-3445a5a41d58" transition-magic="0:0;13:6:0:45cb54ab-1707-4655-87e9-3445a5a41d58" call-id="18" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="607a19b4aed4ea719038c4e0cd4c8e46"/>
+          <lrm_resource id="promotable_procdctl:1" type="procdctl" class="ocf" provider="heartbeat">
+            <lrm_rsc_op id="promotable_procdctl-1_monitor_0" operation="monitor" transition-key="6:0:7:45cb54ab-1707-4655-87e9-3445a5a41d58" transition-magic="0:7;6:0:7:45cb54ab-1707-4655-87e9-3445a5a41d58" call-id="5" crm_feature_set="2.0" rc-code="7" op-status="0" interval="0" op-digest="607a19b4aed4ea719038c4e0cd4c8e46"/>
+            <lrm_rsc_op id="promotable_procdctl-1_start_0" operation="start" transition-key="14:6:0:45cb54ab-1707-4655-87e9-3445a5a41d58" transition-magic="0:0;14:6:0:45cb54ab-1707-4655-87e9-3445a5a41d58" call-id="16" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="607a19b4aed4ea719038c4e0cd4c8e46"/>
+            <lrm_rsc_op id="promotable_procdctl-1_promote_0" operation="promote" transition-key="13:6:0:45cb54ab-1707-4655-87e9-3445a5a41d58" transition-magic="0:0;13:6:0:45cb54ab-1707-4655-87e9-3445a5a41d58" call-id="18" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="607a19b4aed4ea719038c4e0cd4c8e46"/>
           </lrm_resource>
-          <lrm_resource id="master_slave_Stateful:1" type="Dummy-statful" class="ocf" provider="heartbeat">
-            <lrm_rsc_op id="master_slave_Stateful-1_monitor_0" operation="monitor" transition-key="5:0:7:45cb54ab-1707-4655-87e9-3445a5a41d58" transition-magic="0:7;5:0:7:45cb54ab-1707-4655-87e9-3445a5a41d58" call-id="4" crm_feature_set="2.0" rc-code="7" op-status="0" interval="0" op-digest="b23e2bc1a5d8239bd4a4c58b71e3f413"/>
-            <lrm_rsc_op id="master_slave_Stateful-1_start_0" operation="start" transition-key="11:6:0:45cb54ab-1707-4655-87e9-3445a5a41d58" transition-magic="0:0;11:6:0:45cb54ab-1707-4655-87e9-3445a5a41d58" call-id="15" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="b23e2bc1a5d8239bd4a4c58b71e3f413"/>
-            <lrm_rsc_op id="master_slave_Stateful-1_promote_0" operation="promote" transition-key="12:6:0:45cb54ab-1707-4655-87e9-3445a5a41d58" transition-magic="0:0;12:6:0:45cb54ab-1707-4655-87e9-3445a5a41d58" call-id="17" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="b23e2bc1a5d8239bd4a4c58b71e3f413"/>
+          <lrm_resource id="promotable_Stateful:1" type="Dummy-statful" class="ocf" provider="heartbeat">
+            <lrm_rsc_op id="promotable_Stateful-1_monitor_0" operation="monitor" transition-key="5:0:7:45cb54ab-1707-4655-87e9-3445a5a41d58" transition-magic="0:7;5:0:7:45cb54ab-1707-4655-87e9-3445a5a41d58" call-id="4" crm_feature_set="2.0" rc-code="7" op-status="0" interval="0" op-digest="b23e2bc1a5d8239bd4a4c58b71e3f413"/>
+            <lrm_rsc_op id="promotable_Stateful-1_start_0" operation="start" transition-key="11:6:0:45cb54ab-1707-4655-87e9-3445a5a41d58" transition-magic="0:0;11:6:0:45cb54ab-1707-4655-87e9-3445a5a41d58" call-id="15" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="b23e2bc1a5d8239bd4a4c58b71e3f413"/>
+            <lrm_rsc_op id="promotable_Stateful-1_promote_0" operation="promote" transition-key="12:6:0:45cb54ab-1707-4655-87e9-3445a5a41d58" transition-magic="0:0;12:6:0:45cb54ab-1707-4655-87e9-3445a5a41d58" call-id="17" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="b23e2bc1a5d8239bd4a4c58b71e3f413"/>
           </lrm_resource>
         </lrm_resources>
       </lrm>
     </node_state>
     <node_state id="e38f935d-6059-4540-8679-bc32a8256839" uname="process2b" crmd="online" in_ccm="true" join="member" ha="active" expected="member" shutdown="0">
       <transient_attributes id="e38f935d-6059-4540-8679-bc32a8256839">
         <instance_attributes id="instance_attributes.id22931">
           <nvpair id="nvpair.id22938" name="default_ping_set" value="100"/>
           <nvpair id="nvpair.id22947" name="probe_complete" value="true"/>
-          <nvpair id="nvpair.id22957" name="fail-count-master_slave_procdctl:1" value="1"/>
-          <nvpair id="nvpair.id22966" name="fail-count-master_slave_procdctl:0" value="1"/>
+          <nvpair id="nvpair.id22957" name="fail-count-promotable_procdctl:1" value="1"/>
+          <nvpair id="nvpair.id22966" name="fail-count-promotable_procdctl:0" value="1"/>
         </instance_attributes>
       </transient_attributes>
       <lrm id="e38f935d-6059-4540-8679-bc32a8256839">
         <lrm_resources id="lrm_resources.id22984">
-          <lrm_resource id="master_slave_Stateful:0" type="Dummy-statful" class="ocf" provider="heartbeat">
-            <lrm_rsc_op id="master_slave_Stateful-0_monitor_0" operation="monitor" transition-key="8:0:7:45cb54ab-1707-4655-87e9-3445a5a41d58" transition-magic="0:7;8:0:7:45cb54ab-1707-4655-87e9-3445a5a41d58" call-id="2" crm_feature_set="2.0" rc-code="7" op-status="0" interval="0" op-digest="b23e2bc1a5d8239bd4a4c58b71e3f413"/>
-            <lrm_rsc_op id="master_slave_Stateful-0_start_0" operation="start" transition-key="23:8:0:45cb54ab-1707-4655-87e9-3445a5a41d58" transition-magic="0:0;23:8:0:45cb54ab-1707-4655-87e9-3445a5a41d58" call-id="23" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="b23e2bc1a5d8239bd4a4c58b71e3f413"/>
-            <lrm_rsc_op id="master_slave_Stateful-0_stop_0" operation="stop" transition-key="22:8:0:45cb54ab-1707-4655-87e9-3445a5a41d58" transition-magic="0:0;22:8:0:45cb54ab-1707-4655-87e9-3445a5a41d58" call-id="21" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="b23e2bc1a5d8239bd4a4c58b71e3f413"/>
-            <lrm_rsc_op id="master_slave_Stateful-0_monitor_600000" operation="monitor" transition-key="1:8:0:45cb54ab-1707-4655-87e9-3445a5a41d58" transition-magic="0:0;1:8:0:45cb54ab-1707-4655-87e9-3445a5a41d58" call-id="24" crm_feature_set="2.0" rc-code="0" op-status="0" interval="600000" op-digest="58c3e9fea8672fc540116121073095bc"/>
+          <lrm_resource id="promotable_Stateful:0" type="Dummy-statful" class="ocf" provider="heartbeat">
+            <lrm_rsc_op id="promotable_Stateful-0_monitor_0" operation="monitor" transition-key="8:0:7:45cb54ab-1707-4655-87e9-3445a5a41d58" transition-magic="0:7;8:0:7:45cb54ab-1707-4655-87e9-3445a5a41d58" call-id="2" crm_feature_set="2.0" rc-code="7" op-status="0" interval="0" op-digest="b23e2bc1a5d8239bd4a4c58b71e3f413"/>
+            <lrm_rsc_op id="promotable_Stateful-0_start_0" operation="start" transition-key="23:8:0:45cb54ab-1707-4655-87e9-3445a5a41d58" transition-magic="0:0;23:8:0:45cb54ab-1707-4655-87e9-3445a5a41d58" call-id="23" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="b23e2bc1a5d8239bd4a4c58b71e3f413"/>
+            <lrm_rsc_op id="promotable_Stateful-0_stop_0" operation="stop" transition-key="22:8:0:45cb54ab-1707-4655-87e9-3445a5a41d58" transition-magic="0:0;22:8:0:45cb54ab-1707-4655-87e9-3445a5a41d58" call-id="21" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="b23e2bc1a5d8239bd4a4c58b71e3f413"/>
+            <lrm_rsc_op id="promotable_Stateful-0_monitor_600000" operation="monitor" transition-key="1:8:0:45cb54ab-1707-4655-87e9-3445a5a41d58" transition-magic="0:0;1:8:0:45cb54ab-1707-4655-87e9-3445a5a41d58" call-id="24" crm_feature_set="2.0" rc-code="0" op-status="0" interval="600000" op-digest="58c3e9fea8672fc540116121073095bc"/>
           </lrm_resource>
-          <lrm_resource id="master_slave_Stateful:1" type="Dummy-statful" class="ocf" provider="heartbeat">
-            <lrm_rsc_op id="master_slave_Stateful-1_monitor_0" operation="monitor" transition-key="10:0:7:45cb54ab-1707-4655-87e9-3445a5a41d58" transition-magic="0:7;10:0:7:45cb54ab-1707-4655-87e9-3445a5a41d58" call-id="4" crm_feature_set="2.0" rc-code="7" op-status="0" interval="0" op-digest="b23e2bc1a5d8239bd4a4c58b71e3f413"/>
-            <lrm_rsc_op id="master_slave_Stateful-1_start_0" operation="start" transition-key="23:4:0:45cb54ab-1707-4655-87e9-3445a5a41d58" transition-magic="0:0;23:4:0:45cb54ab-1707-4655-87e9-3445a5a41d58" call-id="13" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="b23e2bc1a5d8239bd4a4c58b71e3f413"/>
-            <lrm_rsc_op id="master_slave_Stateful-1_stop_0" operation="stop" transition-key="10:6:0:45cb54ab-1707-4655-87e9-3445a5a41d58" transition-magic="0:0;10:6:0:45cb54ab-1707-4655-87e9-3445a5a41d58" call-id="15" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="b23e2bc1a5d8239bd4a4c58b71e3f413"/>
+          <lrm_resource id="promotable_Stateful:1" type="Dummy-statful" class="ocf" provider="heartbeat">
+            <lrm_rsc_op id="promotable_Stateful-1_monitor_0" operation="monitor" transition-key="10:0:7:45cb54ab-1707-4655-87e9-3445a5a41d58" transition-magic="0:7;10:0:7:45cb54ab-1707-4655-87e9-3445a5a41d58" call-id="4" crm_feature_set="2.0" rc-code="7" op-status="0" interval="0" op-digest="b23e2bc1a5d8239bd4a4c58b71e3f413"/>
+            <lrm_rsc_op id="promotable_Stateful-1_start_0" operation="start" transition-key="23:4:0:45cb54ab-1707-4655-87e9-3445a5a41d58" transition-magic="0:0;23:4:0:45cb54ab-1707-4655-87e9-3445a5a41d58" call-id="13" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="b23e2bc1a5d8239bd4a4c58b71e3f413"/>
+            <lrm_rsc_op id="promotable_Stateful-1_stop_0" operation="stop" transition-key="10:6:0:45cb54ab-1707-4655-87e9-3445a5a41d58" transition-magic="0:0;10:6:0:45cb54ab-1707-4655-87e9-3445a5a41d58" call-id="15" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="b23e2bc1a5d8239bd4a4c58b71e3f413"/>
           </lrm_resource>
-          <lrm_resource id="master_slave_procdctl:0" type="procdctl" class="ocf" provider="heartbeat">
-            <lrm_rsc_op id="master_slave_procdctl-0_monitor_0" operation="monitor" transition-key="9:0:7:45cb54ab-1707-4655-87e9-3445a5a41d58" transition-magic="0:7;9:0:7:45cb54ab-1707-4655-87e9-3445a5a41d58" call-id="3" crm_feature_set="2.0" rc-code="7" op-status="0" interval="0" op-digest="607a19b4aed4ea719038c4e0cd4c8e46"/>
-            <lrm_rsc_op id="master_slave_procdctl-0_start_0" operation="start" transition-key="24:6:0:45cb54ab-1707-4655-87e9-3445a5a41d58" transition-magic="0:0;24:6:0:45cb54ab-1707-4655-87e9-3445a5a41d58" call-id="17" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="607a19b4aed4ea719038c4e0cd4c8e46"/>
-            <lrm_rsc_op id="master_slave_procdctl-0_stop_0" operation="stop" transition-key="4:8:0:45cb54ab-1707-4655-87e9-3445a5a41d58" transition-magic="0:0;4:8:0:45cb54ab-1707-4655-87e9-3445a5a41d58" call-id="22" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="607a19b4aed4ea719038c4e0cd4c8e46"/>
+          <lrm_resource id="promotable_procdctl:0" type="procdctl" class="ocf" provider="heartbeat">
+            <lrm_rsc_op id="promotable_procdctl-0_monitor_0" operation="monitor" transition-key="9:0:7:45cb54ab-1707-4655-87e9-3445a5a41d58" transition-magic="0:7;9:0:7:45cb54ab-1707-4655-87e9-3445a5a41d58" call-id="3" crm_feature_set="2.0" rc-code="7" op-status="0" interval="0" op-digest="607a19b4aed4ea719038c4e0cd4c8e46"/>
+            <lrm_rsc_op id="promotable_procdctl-0_start_0" operation="start" transition-key="24:6:0:45cb54ab-1707-4655-87e9-3445a5a41d58" transition-magic="0:0;24:6:0:45cb54ab-1707-4655-87e9-3445a5a41d58" call-id="17" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="607a19b4aed4ea719038c4e0cd4c8e46"/>
+            <lrm_rsc_op id="promotable_procdctl-0_stop_0" operation="stop" transition-key="4:8:0:45cb54ab-1707-4655-87e9-3445a5a41d58" transition-magic="0:0;4:8:0:45cb54ab-1707-4655-87e9-3445a5a41d58" call-id="22" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="607a19b4aed4ea719038c4e0cd4c8e46"/>
           </lrm_resource>
-          <lrm_resource id="master_slave_procdctl:1" type="procdctl" class="ocf" provider="heartbeat">
-            <lrm_rsc_op id="master_slave_procdctl-1_monitor_0" operation="monitor" transition-key="11:0:7:45cb54ab-1707-4655-87e9-3445a5a41d58" transition-magic="0:7;11:0:7:45cb54ab-1707-4655-87e9-3445a5a41d58" call-id="5" crm_feature_set="2.0" rc-code="7" op-status="0" interval="0" op-digest="607a19b4aed4ea719038c4e0cd4c8e46"/>
-            <lrm_rsc_op id="master_slave_procdctl-1_start_0" operation="start" transition-key="15:1:0:45cb54ab-1707-4655-87e9-3445a5a41d58" transition-magic="0:0;15:1:0:45cb54ab-1707-4655-87e9-3445a5a41d58" call-id="7" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="607a19b4aed4ea719038c4e0cd4c8e46"/>
-            <lrm_rsc_op id="master_slave_procdctl-1_stop_0" operation="stop" transition-key="4:4:0:45cb54ab-1707-4655-87e9-3445a5a41d58" transition-magic="0:0;4:4:0:45cb54ab-1707-4655-87e9-3445a5a41d58" call-id="12" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="607a19b4aed4ea719038c4e0cd4c8e46"/>
+          <lrm_resource id="promotable_procdctl:1" type="procdctl" class="ocf" provider="heartbeat">
+            <lrm_rsc_op id="promotable_procdctl-1_monitor_0" operation="monitor" transition-key="11:0:7:45cb54ab-1707-4655-87e9-3445a5a41d58" transition-magic="0:7;11:0:7:45cb54ab-1707-4655-87e9-3445a5a41d58" call-id="5" crm_feature_set="2.0" rc-code="7" op-status="0" interval="0" op-digest="607a19b4aed4ea719038c4e0cd4c8e46"/>
+            <lrm_rsc_op id="promotable_procdctl-1_start_0" operation="start" transition-key="15:1:0:45cb54ab-1707-4655-87e9-3445a5a41d58" transition-magic="0:0;15:1:0:45cb54ab-1707-4655-87e9-3445a5a41d58" call-id="7" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="607a19b4aed4ea719038c4e0cd4c8e46"/>
+            <lrm_rsc_op id="promotable_procdctl-1_stop_0" operation="stop" transition-key="4:4:0:45cb54ab-1707-4655-87e9-3445a5a41d58" transition-magic="0:0;4:4:0:45cb54ab-1707-4655-87e9-3445a5a41d58" call-id="12" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="607a19b4aed4ea719038c4e0cd4c8e46"/>
           </lrm_resource>
         </lrm_resources>
       </lrm>
     </node_state>
   </status>
 </cib>
diff --git a/cts/scheduler/xml/clbz5007-promotable-colocation.xml b/cts/scheduler/xml/clbz5007-promotable-colocation.xml
index 5073af1478..76bb306259 100644
--- a/cts/scheduler/xml/clbz5007-promotable-colocation.xml
+++ b/cts/scheduler/xml/clbz5007-promotable-colocation.xml
@@ -1,88 +1,88 @@
 <cib epoch="146" num_updates="33" 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:00 2012" have-quorum="1" 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.6-3119df0"/>
         <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"/>
       <node id="fc16-builder2" type="member" uname="fc16-builder2"/>
     </nodes>
     <resources>
       <clone id="MS_DUMMY">
         <meta_attributes id="MS_DUMMY-meta_attributes">
           <nvpair id="MS_DUMMY-meta_attributes-promotable" name="promotable" value="true"/>
           <nvpair id="MS_DUMMY-meta_attributes-target-role" name="target-role" value="Promoted"/>
           <nvpair id="MS_DUMMY-meta_attributes-clone-max" name="clone-max" value="2"/>
           <nvpair id="MS_DUMMY-meta_attributes-clone-node-max" name="clone-node-max" value="1"/>
           <nvpair id="MS_DUMMY-meta_attributes-promoted-max" name="promoted-max" value="1"/>
           <nvpair id="MS_DUMMY-meta_attributes-promoted-node-max" name="promoted-node-max" value="1"/>
           <nvpair id="MS_DUMMY-meta_attributes-notify" name="notify" value="true"/>
         </meta_attributes>
         <primitive class="ocf" id="DUMMY" provider="pacemaker" type="Stateful">
           <operations>
             <op id="DUMMY-monitor-15s" interval="15" name="monitor" role="Unpromoted" timeout="60s"/>
             <op id="DUNNY-monitor-30s" interval="30" name="monitor" role="Promoted" timeout="60s"/>
           </operations>
         </primitive>
       </clone>
-      <primitive class="ocf" id="SLAVE_IP" provider="pacemaker" type="Dummy"/>
-      <primitive class="ocf" id="MASTER_IP" provider="pacemaker" type="Dummy"/>
+      <primitive class="ocf" id="UNPROMOTED_IP" provider="pacemaker" type="Dummy"/>
+      <primitive class="ocf" id="PROMOTED_IP" provider="pacemaker" type="Dummy"/>
     </resources>
     <constraints>
-      <rsc_colocation id="promoted_ip_colocation" rsc="MASTER_IP" score="INFINITY" with-rsc="MS_DUMMY" with-rsc-role="Promoted"/>
-      <rsc_colocation id="unpromoted_ip_primary" rsc="SLAVE_IP" score="101" with-rsc="MS_DUMMY" with-rsc-role="Promoted"/>
-      <rsc_colocation id="unpromoted_ip_secondary" rsc="SLAVE_IP" score="1000" with-rsc="MS_DUMMY" with-rsc-role="Unpromoted"/>
+      <rsc_colocation id="promoted_ip_colocation" rsc="PROMOTED_IP" score="INFINITY" with-rsc="MS_DUMMY" with-rsc-role="Promoted"/>
+      <rsc_colocation id="unpromoted_ip_primary" rsc="UNPROMOTED_IP" score="101" with-rsc="MS_DUMMY" with-rsc-role="Promoted"/>
+      <rsc_colocation id="unpromoted_ip_secondary" rsc="UNPROMOTED_IP" score="1000" with-rsc="MS_DUMMY" with-rsc-role="Unpromoted"/>
     </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_update_resource" 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-DUMMY.0" name="master-DUMMY:0" value="10"/>
         </instance_attributes>
       </transient_attributes>
       <lrm id="fc16-builder">
         <lrm_resources>
           <lrm_resource id="DUMMY:0" type="Stateful" class="ocf" provider="pacemaker">
             <lrm_rsc_op id="DUMMY:0_last_0" operation_key="DUMMY:0_promote_0" operation="promote" crm-debug-origin="build_active_RAs" crm_feature_set="3.0.6" transition-key="7:3:0:28b3ec3e-1bd8-4fa4-b026-c4e028a0be52" transition-magic="0:0;7:3:0:28b3ec3e-1bd8-4fa4-b026-c4e028a0be52" call-id="12" rc-code="0" op-status="0" interval="0" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
             <lrm_rsc_op id="DUMMY:0_monitor_30000" operation_key="DUMMY:0_monitor_30000" operation="monitor" crm-debug-origin="build_active_RAs" crm_feature_set="3.0.6" transition-key="8:4:8:28b3ec3e-1bd8-4fa4-b026-c4e028a0be52" transition-magic="0:8;8:4:8:28b3ec3e-1bd8-4fa4-b026-c4e028a0be52" call-id="14" rc-code="8" op-status="0" interval="30000" op-digest="873ed4f07792aa8ff18f3254244675ea"/>
           </lrm_resource>
-          <lrm_resource id="SLAVE_IP" type="Dummy" class="ocf" provider="pacemaker">
-            <lrm_rsc_op id="SLAVE_IP_last_0" operation_key="SLAVE_IP_start_0" operation="start" crm-debug-origin="do_update_resource" crm_feature_set="3.0.6" transition-key="42:7:0:28b3ec3e-1bd8-4fa4-b026-c4e028a0be52" transition-magic="0:0;42:7:0:28b3ec3e-1bd8-4fa4-b026-c4e028a0be52" call-id="19" rc-code="0" op-status="0" interval="0" last-run="1330214959" last-rc-change="1330214959" exec-time="20" queue-time="0" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8" op-force-restart=" state " op-restart-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
+          <lrm_resource id="UNPROMOTED_IP" type="Dummy" class="ocf" provider="pacemaker">
+            <lrm_rsc_op id="UNPROMOTED_IP_last_0" operation_key="UNPROMOTED_IP_start_0" operation="start" crm-debug-origin="do_update_resource" crm_feature_set="3.0.6" transition-key="42:7:0:28b3ec3e-1bd8-4fa4-b026-c4e028a0be52" transition-magic="0:0;42:7:0:28b3ec3e-1bd8-4fa4-b026-c4e028a0be52" call-id="19" rc-code="0" op-status="0" interval="0" last-run="1330214959" last-rc-change="1330214959" exec-time="20" queue-time="0" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8" op-force-restart=" state " op-restart-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
           </lrm_resource>
-          <lrm_resource id="MASTER_IP" type="Dummy" class="ocf" provider="pacemaker">
-            <lrm_rsc_op id="MASTER_IP_last_0" operation_key="MASTER_IP_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.6" transition-key="7:7:7:28b3ec3e-1bd8-4fa4-b026-c4e028a0be52" transition-magic="0:7;7:7:7:28b3ec3e-1bd8-4fa4-b026-c4e028a0be52" call-id="18" rc-code="7" op-status="0" interval="0" last-run="1330214959" last-rc-change="1330214959" exec-time="40" queue-time="0" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8" op-force-restart=" state " op-restart-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
+          <lrm_resource id="PROMOTED_IP" type="Dummy" class="ocf" provider="pacemaker">
+            <lrm_rsc_op id="PROMOTED_IP_last_0" operation_key="PROMOTED_IP_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.6" transition-key="7:7:7:28b3ec3e-1bd8-4fa4-b026-c4e028a0be52" transition-magic="0:7;7:7:7:28b3ec3e-1bd8-4fa4-b026-c4e028a0be52" call-id="18" rc-code="7" op-status="0" interval="0" last-run="1330214959" last-rc-change="1330214959" exec-time="40" queue-time="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" join="member" crm-debug-origin="do_update_resource" expected="member" shutdown="0">
       <transient_attributes id="fc16-builder2">
         <instance_attributes id="status-fc16-builder2">
           <nvpair id="status-fc16-builder2-promoted-DUMMY.1" name="master-DUMMY:1" value="5"/>
           <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="DUMMY:1" type="Stateful" class="ocf" provider="pacemaker">
             <lrm_rsc_op id="DUMMY:1_last_0" operation_key="DUMMY:1_start_0" operation="start" crm-debug-origin="build_active_RAs" crm_feature_set="3.0.6" transition-key="11:5:0:28b3ec3e-1bd8-4fa4-b026-c4e028a0be52" transition-magic="0:0;11:5:0:28b3ec3e-1bd8-4fa4-b026-c4e028a0be52" call-id="3" rc-code="0" op-status="0" interval="0" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
             <lrm_rsc_op id="DUMMY:1_monitor_15000" operation_key="DUMMY:1_monitor_15000" operation="monitor" crm-debug-origin="build_active_RAs" crm_feature_set="3.0.6" transition-key="12:5:0:28b3ec3e-1bd8-4fa4-b026-c4e028a0be52" transition-magic="0:0;12:5:0:28b3ec3e-1bd8-4fa4-b026-c4e028a0be52" call-id="5" rc-code="0" op-status="0" interval="15000" op-digest="873ed4f07792aa8ff18f3254244675ea"/>
           </lrm_resource>
-          <lrm_resource id="SLAVE_IP" type="Dummy" class="ocf" provider="pacemaker">
-            <lrm_rsc_op id="SLAVE_IP_last_0" operation_key="SLAVE_IP_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.6" transition-key="9:7:7:28b3ec3e-1bd8-4fa4-b026-c4e028a0be52" transition-magic="0:7;9:7:7:28b3ec3e-1bd8-4fa4-b026-c4e028a0be52" call-id="6" rc-code="7" op-status="0" interval="0" last-run="1330214959" last-rc-change="1330214959" exec-time="150" queue-time="0" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8" op-force-restart=" state " op-restart-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
+          <lrm_resource id="UNPROMOTED_IP" type="Dummy" class="ocf" provider="pacemaker">
+            <lrm_rsc_op id="UNPROMOTED_IP_last_0" operation_key="UNPROMOTED_IP_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.6" transition-key="9:7:7:28b3ec3e-1bd8-4fa4-b026-c4e028a0be52" transition-magic="0:7;9:7:7:28b3ec3e-1bd8-4fa4-b026-c4e028a0be52" call-id="6" rc-code="7" op-status="0" interval="0" last-run="1330214959" last-rc-change="1330214959" exec-time="150" queue-time="0" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8" op-force-restart=" state " op-restart-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
           </lrm_resource>
-          <lrm_resource id="MASTER_IP" type="Dummy" class="ocf" provider="pacemaker">
-            <lrm_rsc_op id="MASTER_IP_last_0" operation_key="MASTER_IP_start_0" operation="start" crm-debug-origin="do_update_resource" crm_feature_set="3.0.6" transition-key="43:7:0:28b3ec3e-1bd8-4fa4-b026-c4e028a0be52" transition-magic="0:0;43:7:0:28b3ec3e-1bd8-4fa4-b026-c4e028a0be52" call-id="8" rc-code="0" op-status="0" interval="0" last-run="1330214959" last-rc-change="1330214959" exec-time="10" queue-time="0" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8" op-force-restart=" state " op-restart-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
+          <lrm_resource id="PROMOTED_IP" type="Dummy" class="ocf" provider="pacemaker">
+            <lrm_rsc_op id="PROMOTED_IP_last_0" operation_key="PROMOTED_IP_start_0" operation="start" crm-debug-origin="do_update_resource" crm_feature_set="3.0.6" transition-key="43:7:0:28b3ec3e-1bd8-4fa4-b026-c4e028a0be52" transition-magic="0:0;43:7:0:28b3ec3e-1bd8-4fa4-b026-c4e028a0be52" call-id="8" rc-code="0" op-status="0" interval="0" last-run="1330214959" last-rc-change="1330214959" exec-time="10" queue-time="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_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>
diff --git a/cts/scheduler/xml/promoted-group.xml b/cts/scheduler/xml/promoted-group.xml
index e9589121f6..3c9807f84a 100644
--- a/cts/scheduler/xml/promoted-group.xml
+++ b/cts/scheduler/xml/promoted-group.xml
@@ -1,147 +1,147 @@
 <cib admin_epoch="0" epoch="80" num_updates="23" dc-uuid="782b1222-d1b9-4993-8f0d-b8b67801a2c8" have-quorum="true" remote-tls-port="0" validate-with="pacemaker-3.7" cib-last-written="Fri Jul 13 13:51:07 2012">
   <configuration>
     <crm_config>
       <cluster_property_set id="cib-bootstrap-options">
         <nvpair id="nvpair.id21849" name="symmetric-cluster" value="true"/>
         <nvpair id="nvpair.id21858" name="no-quorum-policy" value="ignore"/>
         <nvpair id="nvpair.id21868" name="stonith-enabled" value="false"/>
         <nvpair id="nvpair.id21903" name="stop-orphan-resources" value="true"/>
         <nvpair id="nvpair.id21912" name="stop-orphan-actions" value="true"/>
         <nvpair id="nvpair.id21940" name="stonith-action" value="reboot"/>
         <nvpair id="nvpair.id21957" name="dc-deadtime" value="10s"/>
         <nvpair id="nvpair.id21965" name="cluster-recheck-interval" value="0"/>
         <nvpair id="nvpair.id21974" name="election-timeout" value="2min"/>
         <nvpair id="nvpair.id21983" name="shutdown-escalation" value="20min"/>
         <nvpair id="nvpair.id21992" name="crmd-integration-timeout" value="3min"/>
         <nvpair id="nvpair.id22001" name="crmd-finalization-timeout" value="10min"/>
         <nvpair id="nvpair.id22010" name="cluster-delay" value="180s"/>
         <nvpair id="nvpair.id22019" name="pe-error-series-max" value="-1"/>
         <nvpair id="nvpair.id22028" name="pe-warn-series-max" value="-1"/>
         <nvpair id="nvpair.id22037" name="pe-input-series-max" value="-1"/>
         <nvpair id="nvpair.id22045" name="startup-fencing" value="true"/>
         <nvpair id="nvpair.id22054" name="dc-version" value="2.1.3-node: 176f519910028b93e655fe4d2d376037bf8dd0d4"/>
       </cluster_property_set>
     </crm_config>
     <nodes>
       <node id="782b1222-d1b9-4993-8f0d-b8b67801a2c8" uname="rh44-1" type="member"/>
       <node id="86600d98-4564-433a-8ad7-aca0ca59382a" uname="rh44-2" type="member"/>
     </nodes>
     <rsc_defaults>
       <meta_attributes id="rsc_defaults-meta_attributes">
         <nvpair id="rsc_defaults-resource-stickiness" name="resource-stickiness" value="INFINITY"/>
       </meta_attributes>
     </rsc_defaults>
     <op_defaults>
       <meta_attributes id="op_defaults-meta_attributes">
         <nvpair id="op_defaults-timeout" name="timeout" value="120s"/>
       </meta_attributes>
     </op_defaults>
     <resources>
       <group id="test">
         <primitive id="resource_1" class="ocf" type="IPaddr" provider="heartbeat">
           <instance_attributes id="instance_attributes.id22105">
             <nvpair id="nvpair.id22113" name="ip" value="192.168.40.92"/>
             <nvpair id="nvpair.id22121" name="nic" value="eth0"/>
             <nvpair id="nvpair.id22130" name="cidr_netmask" value="24"/>
           </instance_attributes>
           <operations>
             <op name="start" interval="0" id="ipPostgreSQLDB_start" timeout="60s" on-fail="fence" start-delay="0" enabled="true" role="Started"/>
             <op name="monitor" interval="10s" id="ipPostgreSQLDB_monitor" timeout="60s" on-fail="fence" start-delay="0" enabled="true" role="Started"/>
             <op name="stop" interval="0" id="ipPostgreSQLDB_stop" timeout="60s" on-fail="fence" start-delay="0" enabled="true" role="Started"/>
           </operations>
         </primitive>
         <meta_attributes id="group-test.meta"/>
       </group>
       <clone id="ms-sf">
         <meta_attributes id="meta_attributes.id22211">
           <nvpair id="nvpair.id22216" name="promotable" value="true"/>
           <nvpair id="nvpair.id22217" name="clone-max" value="2"/>
           <nvpair id="nvpair.id22226" name="clone-node-max" value="1"/>
           <nvpair id="nvpair.id22234" name="promoted-max" value="1"/>
           <nvpair id="nvpair.id22243" name="promoted-node-max" value="1"/>
         </meta_attributes>
         <group id="grp_ms_sf">
-          <primitive id="master_slave_Stateful" class="ocf" type="Stateful" provider="heartbeat">
+          <primitive id="promotable_Stateful" class="ocf" type="Stateful" provider="heartbeat">
             <operations>
               <op name="monitor" interval="5s" id="ms-sf_monitor" timeout="30s"/>
               <op name="monitor" interval="6s" id="ms-sf_monitor_promoted" timeout="30s" role="Promoted"/>
             </operations>
           </primitive>
           <meta_attributes id="group-grp_ms_sf.meta"/>
         </group>
         <meta_attributes id="clone-ms-sf.meta">
           <nvpair id="ordered.meta.auto-98" name="ordered" value="false"/>
           <nvpair id="interleave.meta.auto-98" name="interleave" value="false"/>
           <nvpair id="notify.meta.auto-98" name="notify" value="false"/>
           <nvpair id="unique-1" name="globally-unique" value="true"/>
         </meta_attributes>
       </clone>
     </resources>
     <constraints>
       <rsc_location id="rlcPostgreSQLDB" rsc="test">
         <rule id="rulPostgreSQLDB_node01" score="200">
           <expression id="expression.id22323" attribute="#uname" operation="eq" value="rh44-1"/>
         </rule>
         <rule id="rulPostgreSQLDB_node02" score="100">
           <expression id="expression.id22341" attribute="#uname" operation="eq" value="rh44-2"/>
         </rule>
       </rsc_location>
       <rsc_location id="rsc_location_group_0" rsc="ms-sf">
         <rule id="preferred_location_group_0" role="Promoted" score="100">
           <expression id="expression.id22369" attribute="#uname" operation="eq" value="rh44-1"/>
         </rule>
         <rule id="preferred_location_group_1" role="Promoted" score="50">
           <expression id="expression.id22390" attribute="#uname" operation="eq" value="rh44-2"/>
         </rule>
       </rsc_location>
     </constraints>
   </configuration>
   <status>
     <node_state id="782b1222-d1b9-4993-8f0d-b8b67801a2c8" uname="rh44-1" crmd="online" shutdown="0" in_ccm="true" ha="active" join="member" expected="member">
       <lrm id="lrm.auto-1">
         <lrm_resources id="lrm_resources.id22436">
-          <lrm_resource id="master_slave_Stateful:1" type="Stateful" class="ocf" provider="heartbeat">
-            <lrm_rsc_op id="master_slave_Stateful-1_monitor_0" operation="monitor" transition-key="5:0:7:f8daff63-8d0f-4e18-a9b3-6ccd910175bd" transition-magic="0:7;5:0:7:f8daff63-8d0f-4e18-a9b3-6ccd910175bd" call-id="4" crm_feature_set="2.0" rc-code="7" op-status="0" interval="0" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
-            <lrm_rsc_op id="master_slave_Stateful-1_start_0" operation="start" transition-key="17:1:0:f8daff63-8d0f-4e18-a9b3-6ccd910175bd" transition-magic="0:0;17:1:0:f8daff63-8d0f-4e18-a9b3-6ccd910175bd" call-id="6" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
-            <lrm_rsc_op id="master_slave_Stateful-1_monitor_5000" operation="monitor" transition-key="18:1:0:f8daff63-8d0f-4e18-a9b3-6ccd910175bd" transition-magic="0:0;18:1:0:f8daff63-8d0f-4e18-a9b3-6ccd910175bd" call-id="7" crm_feature_set="2.0" rc-code="0" op-status="0" interval="5000" op-digest="02a5bcf940fc8d3239701acb11438d6a"/>
+          <lrm_resource id="promotable_Stateful:1" type="Stateful" class="ocf" provider="heartbeat">
+            <lrm_rsc_op id="promotable_Stateful-1_monitor_0" operation="monitor" transition-key="5:0:7:f8daff63-8d0f-4e18-a9b3-6ccd910175bd" transition-magic="0:7;5:0:7:f8daff63-8d0f-4e18-a9b3-6ccd910175bd" call-id="4" crm_feature_set="2.0" rc-code="7" op-status="0" interval="0" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
+            <lrm_rsc_op id="promotable_Stateful-1_start_0" operation="start" transition-key="17:1:0:f8daff63-8d0f-4e18-a9b3-6ccd910175bd" transition-magic="0:0;17:1:0:f8daff63-8d0f-4e18-a9b3-6ccd910175bd" call-id="6" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
+            <lrm_rsc_op id="promotable_Stateful-1_monitor_5000" operation="monitor" transition-key="18:1:0:f8daff63-8d0f-4e18-a9b3-6ccd910175bd" transition-magic="0:0;18:1:0:f8daff63-8d0f-4e18-a9b3-6ccd910175bd" call-id="7" crm_feature_set="2.0" rc-code="0" op-status="0" interval="5000" op-digest="02a5bcf940fc8d3239701acb11438d6a"/>
           </lrm_resource>
-          <lrm_resource id="master_slave_Stateful:0" type="Stateful" class="ocf" provider="heartbeat">
-            <lrm_rsc_op id="master_slave_Stateful-0_monitor_0" operation="monitor" transition-key="4:0:7:f8daff63-8d0f-4e18-a9b3-6ccd910175bd" transition-magic="0:7;4:0:7:f8daff63-8d0f-4e18-a9b3-6ccd910175bd" call-id="3" crm_feature_set="2.0" rc-code="7" op-status="0" interval="0" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
+          <lrm_resource id="promotable_Stateful:0" type="Stateful" class="ocf" provider="heartbeat">
+            <lrm_rsc_op id="promotable_Stateful-0_monitor_0" operation="monitor" transition-key="4:0:7:f8daff63-8d0f-4e18-a9b3-6ccd910175bd" transition-magic="0:7;4:0:7:f8daff63-8d0f-4e18-a9b3-6ccd910175bd" call-id="3" crm_feature_set="2.0" rc-code="7" op-status="0" interval="0" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
           </lrm_resource>
           <lrm_resource id="resource_1" type="IPaddr" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="resource_1_monitor_0" operation="monitor" transition-key="3:0:7:f8daff63-8d0f-4e18-a9b3-6ccd910175bd" transition-magic="0:7;3:0:7:f8daff63-8d0f-4e18-a9b3-6ccd910175bd" call-id="2" crm_feature_set="2.0" rc-code="7" op-status="0" interval="0" op-digest="cf453c0695bcf0a97aa217bbc913b737"/>
             <lrm_rsc_op id="resource_1_start_0" operation="start" transition-key="5:1:0:f8daff63-8d0f-4e18-a9b3-6ccd910175bd" transition-magic="0:0;5:1:0:f8daff63-8d0f-4e18-a9b3-6ccd910175bd" call-id="5" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="cf453c0695bcf0a97aa217bbc913b737"/>
             <lrm_rsc_op id="resource_1_monitor_10000" operation="monitor" transition-key="8:2:0:f8daff63-8d0f-4e18-a9b3-6ccd910175bd" transition-magic="0:0;8:2:0:f8daff63-8d0f-4e18-a9b3-6ccd910175bd" call-id="8" crm_feature_set="2.0" rc-code="0" op-status="0" interval="10000" op-digest="ab399f581fad689b92f5edad92fd0356"/>
           </lrm_resource>
         </lrm_resources>
       </lrm>
       <transient_attributes id="transient_attributes.auto-1">
         <instance_attributes id="instance_attributes.id22661">
           <nvpair id="nvpair.id22668" name="probe_complete" value="true"/>
         </instance_attributes>
       </transient_attributes>
     </node_state>
     <node_state id="86600d98-4564-433a-8ad7-aca0ca59382a" uname="rh44-2" ha="active" crmd="online" shutdown="0" in_ccm="true" join="member" expected="member">
       <lrm id="lrm.auto-2">
         <lrm_resources id="lrm_resources.id22709">
-          <lrm_resource id="master_slave_Stateful:0" type="Stateful" class="ocf" provider="heartbeat">
-            <lrm_rsc_op id="master_slave_Stateful-0_monitor_0" operation="monitor" transition-key="8:0:7:f8daff63-8d0f-4e18-a9b3-6ccd910175bd" transition-magic="0:7;8:0:7:f8daff63-8d0f-4e18-a9b3-6ccd910175bd" call-id="3" crm_feature_set="2.0" rc-code="7" op-status="0" interval="0" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
-            <lrm_rsc_op id="master_slave_Stateful-0_start_0" operation="start" transition-key="11:1:0:f8daff63-8d0f-4e18-a9b3-6ccd910175bd" transition-magic="0:0;11:1:0:f8daff63-8d0f-4e18-a9b3-6ccd910175bd" call-id="5" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
-            <lrm_rsc_op id="master_slave_Stateful-0_monitor_5000" operation="monitor" transition-key="15:2:0:f8daff63-8d0f-4e18-a9b3-6ccd910175bd" transition-magic="0:0;15:2:0:f8daff63-8d0f-4e18-a9b3-6ccd910175bd" call-id="6" crm_feature_set="2.0" rc-code="0" op-status="0" interval="5000" op-digest="02a5bcf940fc8d3239701acb11438d6a"/>
+          <lrm_resource id="promotable_Stateful:0" type="Stateful" class="ocf" provider="heartbeat">
+            <lrm_rsc_op id="promotable_Stateful-0_monitor_0" operation="monitor" transition-key="8:0:7:f8daff63-8d0f-4e18-a9b3-6ccd910175bd" transition-magic="0:7;8:0:7:f8daff63-8d0f-4e18-a9b3-6ccd910175bd" call-id="3" crm_feature_set="2.0" rc-code="7" op-status="0" interval="0" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
+            <lrm_rsc_op id="promotable_Stateful-0_start_0" operation="start" transition-key="11:1:0:f8daff63-8d0f-4e18-a9b3-6ccd910175bd" transition-magic="0:0;11:1:0:f8daff63-8d0f-4e18-a9b3-6ccd910175bd" call-id="5" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
+            <lrm_rsc_op id="promotable_Stateful-0_monitor_5000" operation="monitor" transition-key="15:2:0:f8daff63-8d0f-4e18-a9b3-6ccd910175bd" transition-magic="0:0;15:2:0:f8daff63-8d0f-4e18-a9b3-6ccd910175bd" call-id="6" crm_feature_set="2.0" rc-code="0" op-status="0" interval="5000" op-digest="02a5bcf940fc8d3239701acb11438d6a"/>
           </lrm_resource>
-          <lrm_resource id="master_slave_Stateful:1" type="Stateful" class="ocf" provider="heartbeat">
-            <lrm_rsc_op id="master_slave_Stateful-1_monitor_0" operation="monitor" transition-key="9:0:7:f8daff63-8d0f-4e18-a9b3-6ccd910175bd" transition-magic="0:7;9:0:7:f8daff63-8d0f-4e18-a9b3-6ccd910175bd" call-id="4" crm_feature_set="2.0" rc-code="7" op-status="0" interval="0" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
+          <lrm_resource id="promotable_Stateful:1" type="Stateful" class="ocf" provider="heartbeat">
+            <lrm_rsc_op id="promotable_Stateful-1_monitor_0" operation="monitor" transition-key="9:0:7:f8daff63-8d0f-4e18-a9b3-6ccd910175bd" transition-magic="0:7;9:0:7:f8daff63-8d0f-4e18-a9b3-6ccd910175bd" call-id="4" crm_feature_set="2.0" rc-code="7" op-status="0" interval="0" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
           </lrm_resource>
           <lrm_resource id="resource_1" type="IPaddr" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="resource_1_monitor_0" operation="monitor" transition-key="7:0:7:f8daff63-8d0f-4e18-a9b3-6ccd910175bd" transition-magic="0:7;7:0:7:f8daff63-8d0f-4e18-a9b3-6ccd910175bd" call-id="2" crm_feature_set="2.0" rc-code="7" op-status="0" interval="0" op-digest="cf453c0695bcf0a97aa217bbc913b737"/>
           </lrm_resource>
         </lrm_resources>
       </lrm>
       <transient_attributes id="transient_attributes.auto-2">
         <instance_attributes id="instance_attributes.id22886">
           <nvpair id="nvpair.id22893" name="probe_complete" value="true"/>
         </instance_attributes>
       </transient_attributes>
     </node_state>
   </status>
 </cib>