diff --git a/pengine/testcases/probe-0.dot b/pengine/testcases/probe-0.dot
index a13b8ca44c..3023569d24 100644
--- a/pengine/testcases/probe-0.dot
+++ b/pengine/testcases/probe-0.dot
@@ -1,35 +1,35 @@
  digraph "g" {
-"configstoreclone:0_monitor_0 32c47" -> "probe_complete 32c47" [ style = bold]
-"configstoreclone:0_monitor_0 32c47" [ style=bold color="green" fontcolor="black" ]
-"configstoreclone:0_monitor_0 32c48" -> "probe_complete 32c48" [ style = bold]
-"configstoreclone:0_monitor_0 32c48" [ style=bold color="green" fontcolor="black" ]
-"configstoreclone:0_post_notify_start_0 32c48" -> "configstorecloneset_confirmed-post_notify_start_0" [ style = bold]
-"configstoreclone:0_post_notify_start_0 32c48" [ style=bold color="green" fontcolor="black" ]
-"configstoreclone:0_start_0 32c48" -> "configstorecloneset_running_0" [ style = bold]
-"configstoreclone:0_start_0 32c48" [ style=bold color="green" fontcolor="black" ]
-"configstoreclone:1_post_notify_start_0 32c47" -> "configstorecloneset_confirmed-post_notify_start_0" [ style = bold]
-"configstoreclone:1_post_notify_start_0 32c47" [ style=bold color="green" fontcolor="black" ]
-"configstoreclone:1_start_0 32c47" -> "configstorecloneset_running_0" [ style = bold]
-"configstoreclone:1_start_0 32c47" [ style=bold color="green" fontcolor="black" ]
+"configstoreclone:0_monitor_0 x32c47" -> "probe_complete x32c47" [ style = bold]
+"configstoreclone:0_monitor_0 x32c47" [ style=bold color="green" fontcolor="black" ]
+"configstoreclone:0_monitor_0 x32c48" -> "probe_complete x32c48" [ style = bold]
+"configstoreclone:0_monitor_0 x32c48" [ style=bold color="green" fontcolor="black" ]
+"configstoreclone:0_post_notify_start_0 x32c48" -> "configstorecloneset_confirmed-post_notify_start_0" [ style = bold]
+"configstoreclone:0_post_notify_start_0 x32c48" [ style=bold color="green" fontcolor="black" ]
+"configstoreclone:0_start_0 x32c48" -> "configstorecloneset_running_0" [ style = bold]
+"configstoreclone:0_start_0 x32c48" [ style=bold color="green" fontcolor="black" ]
+"configstoreclone:1_post_notify_start_0 x32c47" -> "configstorecloneset_confirmed-post_notify_start_0" [ style = bold]
+"configstoreclone:1_post_notify_start_0 x32c47" [ style=bold color="green" fontcolor="black" ]
+"configstoreclone:1_start_0 x32c47" -> "configstorecloneset_running_0" [ style = bold]
+"configstoreclone:1_start_0 x32c47" [ style=bold color="green" fontcolor="black" ]
 "configstorecloneset_confirmed-post_notify_start_0" [ style=bold color="green" fontcolor="orange" ]
 "configstorecloneset_confirmed-pre_notify_start_0" -> "configstorecloneset_start_0" [ style = bold]
 "configstorecloneset_confirmed-pre_notify_start_0" [ style=bold color="green" fontcolor="orange" ]
-"configstorecloneset_post_notify_start_0" -> "configstoreclone:0_post_notify_start_0 32c48" [ style = bold]
-"configstorecloneset_post_notify_start_0" -> "configstoreclone:1_post_notify_start_0 32c47" [ style = bold]
+"configstorecloneset_post_notify_start_0" -> "configstoreclone:0_post_notify_start_0 x32c48" [ style = bold]
+"configstorecloneset_post_notify_start_0" -> "configstoreclone:1_post_notify_start_0 x32c47" [ style = bold]
 "configstorecloneset_post_notify_start_0" -> "configstorecloneset_confirmed-post_notify_start_0" [ style = bold]
 "configstorecloneset_post_notify_start_0" [ style=bold color="green" fontcolor="orange" ]
 "configstorecloneset_pre_notify_start_0" -> "configstorecloneset_confirmed-pre_notify_start_0" [ style = bold]
 "configstorecloneset_pre_notify_start_0" [ style=bold color="green" fontcolor="orange" ]
 "configstorecloneset_running_0" -> "configstorecloneset_post_notify_start_0" [ style = bold]
 "configstorecloneset_running_0" [ style=bold color="green" fontcolor="orange" ]
-"configstorecloneset_start_0" -> "configstoreclone:0_start_0 32c48" [ style = bold]
-"configstorecloneset_start_0" -> "configstoreclone:1_start_0 32c47" [ style = bold]
+"configstorecloneset_start_0" -> "configstoreclone:0_start_0 x32c48" [ style = bold]
+"configstorecloneset_start_0" -> "configstoreclone:1_start_0 x32c47" [ style = bold]
 "configstorecloneset_start_0" -> "configstorecloneset_running_0" [ style = bold]
 "configstorecloneset_start_0" [ style=bold color="green" fontcolor="orange" ]
-"probe_complete 32c47" -> "probe_complete" [ style = bold]
-"probe_complete 32c47" [ style=bold color="green" fontcolor="black" ]
-"probe_complete 32c48" -> "probe_complete" [ style = bold]
-"probe_complete 32c48" [ style=bold color="green" fontcolor="black" ]
+"probe_complete x32c47" -> "probe_complete" [ style = bold]
+"probe_complete x32c47" [ style=bold color="green" fontcolor="black" ]
+"probe_complete x32c48" -> "probe_complete" [ style = bold]
+"probe_complete x32c48" [ style=bold color="green" fontcolor="black" ]
 "probe_complete" -> "configstorecloneset_start_0" [ style = bold]
 "probe_complete" [ style=bold color="green" fontcolor="orange" ]
 }
diff --git a/pengine/testcases/probe-0.exp b/pengine/testcases/probe-0.exp
index 001360e579..5c7f230a6b 100644
--- a/pengine/testcases/probe-0.exp
+++ b/pengine/testcases/probe-0.exp
@@ -1,195 +1,195 @@
  
    
      
-       
+       
          
          
        
      
      
    
    
      
-       
+       
          
          
        
      
      
    
    
      
-       
+       
          
-         
+         
        
      
      
        
          
        
      
    
    
      
-       
+       
          
-         
+         
        
      
      
        
          
        
      
    
    
      
-       
+       
          
-         
+         
        
      
      
        
          
        
      
    
    
      
-       
+       
          
-         
+         
        
      
      
        
          
        
      
    
    
      
        
          
        
      
      
        
          
        
        
          
        
      
    
    
      
        
          
        
      
      
        
-         
+         
        
        
-         
+         
        
        
          
        
      
    
    
      
        
          
        
      
      
    
    
      
        
          
        
      
      
        
          
        
      
    
    
      
        
          
        
      
      
        
          
        
      
    
    
      
        
          
        
      
      
        
          
        
        
-         
+         
        
        
-         
+         
        
      
    
    
      
        
          
        
      
      
        
-         
+         
        
        
-         
+         
        
      
    
    
      
-       
+       
          
        
      
      
        
-         
+         
        
      
    
    
      
-       
+       
          
        
      
      
        
-         
+         
        
      
    
  
 
diff --git a/pengine/testcases/probe-0.xml b/pengine/testcases/probe-0.xml
index c5c6984484..d660b73eed 100644
--- a/pengine/testcases/probe-0.xml
+++ b/pengine/testcases/probe-0.xml
@@ -1,131 +1,131 @@
  
    
      
        
          
            
            
            
            
            
            
            
            
            
            
          
        
      
      
        
        
      
      
        
          
            
              
            
          
          
            
              
              
            
            
              
-               
+