diff -r da93d3523e6a modules/ui.py.in
--- a/modules/ui.py.in	Tue Mar 26 11:44:17 2013 +0100
+++ b/modules/ui.py.in	Mon Apr 08 17:49:00 2013 +0900
@@ -924,10 +924,14 @@
         lifetime = None
         opt_l = fetch_opts(argl, ["force"])
         if len(argl) == 1:
-            if not argl[0] in listnodes():
-                lifetime = argl[0]
-            else:
-                node = argl[0]
+	    for i in listnodes():
+		pattern = re.compile(i, re.IGNORECASE)
+		if pattern.match(argl[1]) and len(i) == len(argl[1]):
+		    node = argl[1]
+		    break
+	    if node == None:
+		node = vars.this_node
+		lifetime = argl[1]	
         elif len(argl) == 2:
             node = argl[0]
             lifetime = argl[1]
@@ -1185,11 +1189,14 @@
         if not args:
             node = vars.this_node
         if len(args) == 1:
-            if not args[0] in listnodes():
-                node = vars.this_node
-                lifetime = args[0]
-            else:
-                node = args[0]
+	    for i in listnodes():
+		pattern = re.compile(i, re.IGNORECASE)
+		if pattern.match(args[0]) and len(i) == len(args[0]):
+		    node = args[0]
+		    break
+	    if node == None:
+		node = vars.this_node
+		lifetime = args[0]
         elif len(args) == 2:
             node = args[0]
             lifetime = args[1]
@@ -1248,9 +1255,15 @@
         'usage: delete <node>'
         if not is_name_sane(node):
             return False
-        if not node in listnodes():
-            common_err("node %s not found in the CIB" % node)
-            return False
+	node_name = False	
+	for i in listnodes():
+	    pattern = re.compile(i, re.IGNORECASE)
+	    if pattern.match(node) and len(i) == len(node):
+		node_name = True
+		break
+	if not node_name:
+	    common_err("node %s not found in the CIB" % node)
+	    return False
         rc = True
         if cluster_stack() == "heartbeat":
             rc = ext_cmd(self.hb_delnode%node) == 0