diff -ur a/luci/cluster/fence-macros b/luci/cluster/fence-macros
--- a/luci/cluster/fence-macros	2010-10-19 12:11:08.000000000 -0400
+++ b/luci/cluster/fence-macros	2010-10-19 12:11:15.000000000 -0400
@@ -266,8 +266,8 @@
 		<tal:block metal:use-macro="here/fence-macros/macros/fence-form-ifmib" />
 	</tal:block>
 
-	<tal:block tal:condition="python: cur_fence_type == 'fence_ucs'">
-		<tal:block metal:use-macro="here/fence-macros/macros/fence-form-ucs" />
+	<tal:block tal:condition="python: cur_fence_type == 'fence_cisco_ucs'">
+		<tal:block metal:use-macro="here/fence-macros/macros/fence-form-cisco_ucs" />
 	</tal:block>
 
 	<tal:block tal:condition="python: cur_fence_type == 'fence_manual'">
@@ -356,7 +356,7 @@
 	<option name="fence_vmware" value="fence_vmware">VMware Fencing</option>
 	<option name="fence_lpar" value="fence_lpar">LPAR Fencing</option>
 	<option name="fence_cisco_mds" value="fence_cisco_mds">Cisco MDS</option>
-	<option name="fence_ucs" value="fence_ucs">Cisco UCS</option>
+	<option name="fence_cisco_ucs" value="fence_cisco_ucs">Cisco UCS</option>
 	<option name="fence_ifmib" value="fence_ifmib">IF MIB</option>
 </div>
 
@@ -384,7 +384,7 @@
 	<option name="fence_vmware" value="fence_vmware">VMware Fencing</option>
 	<option name="fence_lpar" value="fence_lpar">LPAR Fencing</option>
 	<option name="fence_cisco_mds" value="fence_cisco_mds">Cisco MDS</option>
-	<option name="fence_ucs" value="fence_ucs">Cisco UCS</option>
+	<option name="fence_cisco_ucs" value="fence_cisco_ucs">Cisco UCS</option>
 	<option name="fence_ifmib" value="fence_ifmib">IF MIB</option>
 	<option name="fence_manual" value="fence_manual">Manual Fencing</option>
 </div>
@@ -1844,10 +1844,10 @@
 	</div>
 </div>
 
-<div metal:define-macro="fence-form-ucs"
+<div metal:define-macro="fence-form-cisco_ucs"
 	tal:attributes="id cur_fencedev/name | nothing">
 
-	<div id="fence_ucs" class="fencedev">
+	<div id="fence_cisco_ucs" class="fencedev">
 		<table>
 			<tr>
 				<td><strong class="cluster">Fence Type</strong></td>
@@ -1927,7 +1927,7 @@
 				tal:attributes="value cur_fencedev/name | nothing" />
 		</tal:block>
 
-		<input type="hidden" name="fence_type" value="fence_ucs" />
+		<input type="hidden" name="fence_type" value="fence_cisco_ucs" />
 		<input type="hidden" name="sharable" value="1" />
 	</div>
 </div>
@@ -2362,7 +2362,7 @@
 	<tal:block metal:use-macro="here/fence-macros/macros/fence-form-vmware" />
 	<tal:block metal:use-macro="here/fence-macros/macros/fence-form-ifmib" />
 	<tal:block metal:use-macro="here/fence-macros/macros/fence-form-cisco_mds" />
-	<tal:block metal:use-macro="here/fence-macros/macros/fence-form-ucs" />
+	<tal:block metal:use-macro="here/fence-macros/macros/fence-form-cisco_ucs" />
 	<tal:block metal:use-macro="here/fence-macros/macros/fence-form-manual" />
 </div>
 
@@ -2383,7 +2383,7 @@
 	<tal:block metal:use-macro="here/fence-macros/macros/fence-form-vmware" />
 	<tal:block metal:use-macro="here/fence-macros/macros/fence-form-ifmib" />
 	<tal:block metal:use-macro="here/fence-macros/macros/fence-form-cisco_mds" />
-	<tal:block metal:use-macro="here/fence-macros/macros/fence-form-ucs" />
+	<tal:block metal:use-macro="here/fence-macros/macros/fence-form-cisco_ucs" />
 </div>
 
 <div metal:define-macro="shared-fence-device-list">
@@ -2995,9 +2995,9 @@
 	</div>
 </div>
 
-<div metal:define-macro="fence-instance-form-ucs"
+<div metal:define-macro="fence-instance-form-cisco_ucs"
 	tal:omit-tag="exists: cur_fence_dev_id">
-	<div id="fence_ucs_instance" name="fence_ucs" class="fencedev_instance"
+	<div id="fence_cisco_ucs_instance" name="fence_cisco_ucs" class="fencedev_instance"
 		tal:omit-tag="exists: cur_fence_dev_id">
 		<table>
 			<tr>
@@ -3024,7 +3024,7 @@
 
 		<input type="hidden" name="option" tal:condition="exists:cur_instance"
 			tal:attributes="value cur_instance/option |nothing" />
-		<input type="hidden" name="fence_type" value="fence_ucs" />
+		<input type="hidden" name="fence_type" value="fence_cisco_ucs" />
 		<input type="hidden" name="fence_instance" value="1" />
 		<input tal:condition="exists: cur_instance"
 			type="hidden" name="existing_instance" value="1" />
@@ -3144,7 +3144,7 @@
 		metal:use-macro="here/fence-macros/macros/fence-instance-form-ifmib" />
 
 	<tal:block
-		metal:use-macro="here/fence-macros/macros/fence-instance-form-ucs" />
+		metal:use-macro="here/fence-macros/macros/fence-instance-form-cisco_ucs" />
 </div>
 
 <div metal:define-macro="fencedev-instance-cond-ladder"
@@ -3230,9 +3230,9 @@
 			metal:use-macro="here/fence-macros/macros/fence-instance-form-ifmib" />
 	</tal:block>
 
-	<tal:block tal:condition="python: cur_fence_type == 'fence_ucs'">
+	<tal:block tal:condition="python: cur_fence_type == 'fence_cisco_ucs'">
 		<tal:block
-			metal:use-macro="here/fence-macros/macros/fence-instance-form-ucs" />
+			metal:use-macro="here/fence-macros/macros/fence-instance-form-cisco_ucs" />
 	</tal:block>
 </div>
 
diff -ur a/luci/cluster/validate_fence.js b/luci/cluster/validate_fence.js
--- a/luci/cluster/validate_fence.js	2010-10-19 12:11:08.000000000 -0400
+++ b/luci/cluster/validate_fence.js	2010-10-19 12:11:15.000000000 -0400
@@ -24,7 +24,7 @@
 fence_inst_validator['vmware'] = [ 'port' ];
 fence_inst_validator['cisco_mds'] = [ 'port' ];
 fence_inst_validator['ifmib'] = [ 'port' ];
-fence_inst_validator['ucs'] = [ 'port' ];
+fence_inst_validator['cisco_ucs'] = [ 'port' ];
 
 var fence_validator = [];
 fence_validator['apc'] = [ 'ipaddr', 'login', 'passwd', 'passwd_script' ];
@@ -50,7 +50,7 @@
 fence_validator['lpar'] = [ 'ipaddr', 'login', 'passwd', 'passwd_script' ];
 fence_validator['cisco_mds'] = [ 'ipaddr', 'login', 'passwd', 'passwd_script' ];
 fence_validator['ifmib'] = [ 'ipaddr', 'login', 'passwd', 'passwd_script' ];
-fence_validator['ucs'] = [ 'ipaddr', 'login', 'passwd', 'passwd_script' ];
+fence_validator['cisco_ucs'] = [ 'ipaddr', 'login', 'passwd', 'passwd_script' ];
 fence_validator['vmware'] = [ 'ipaddr', 'login', 'passwd', 'passwd_script', 'vmlogin' ];
 fence_validator['xvm'] = [];
 
diff -ur a/luci/site/luci/Extensions/ClusterModel/FenceDeviceAttr.py b/luci/site/luci/Extensions/ClusterModel/FenceDeviceAttr.py
--- a/luci/site/luci/Extensions/ClusterModel/FenceDeviceAttr.py	2010-10-19 12:11:08.000000000 -0400
+++ b/luci/site/luci/Extensions/ClusterModel/FenceDeviceAttr.py	2010-10-19 12:11:15.000000000 -0400
@@ -33,7 +33,7 @@
 	'fence_lpar':			'LPAR Fencing',
 	'fence_vmware':			'VMware Fencing',
 	'fence_cisco_mds':		'Cisco MDS',
-	'fence_ucs':			'Cisco UCS',
+	'fence_cisco_ucs':		'Cisco UCS',
 	'fence_ifmib':			'IF MIB',
 	'fence_manual':			'Manual Fencing'
 }
@@ -54,7 +54,7 @@
 	'fence_lpar':			True,
 	'fence_vmware':			True,
 	'fence_cisco_mds':		True,
-	'fence_ucs':			True,
+	'fence_cisco_ucs':		True,
 	'fence_ifmib':			True,
 	'fence_ilo':			False,
 	'fence_ilo_mp':			False,
@@ -101,7 +101,7 @@
 	'fence_lpar':			( 'partition' ),
 	'fence_vmware':			( 'port' ),
 	'fence_cisco_mds':		( 'port' ),
-	'fence_ucs':			( 'port' ),
+	'fence_cisco_ucs':		( 'port' ),
 	'fence_ifmib':			( 'port' ),
 	'fence_ilo':			( ),
 	'fence_ipmilan':		( ),
@@ -140,7 +140,7 @@
 		( 'name', 'ipaddr', 'login', 'passwd', 'vmlogin', 'vmpasswd' ),
 	'fence_cisco_mds':
 		( 'name', 'ipaddr', 'login', 'passwd' ),
-	'fence_ucs':
+	'fence_cisco_ucs':
 		( 'name', 'ipaddr', 'login', 'passwd' ),
 	'fence_ifmib':
 		( 'name', 'ipaddr', 'login', 'passwd' ),
diff -ur a/luci/site/luci/Extensions/FenceHandler.py b/luci/site/luci/Extensions/FenceHandler.py
--- a/luci/site/luci/Extensions/FenceHandler.py	2010-10-19 12:11:08.000000000 -0400
+++ b/luci/site/luci/Extensions/FenceHandler.py	2010-10-19 12:11:15.000000000 -0400
@@ -776,7 +776,7 @@
 
 	return errors
 
-def val_ucs_fd(form, fencedev):
+def val_cisco_ucs_fd(form, fencedev):
 	errors = list()
 
 	try:
@@ -1476,7 +1476,7 @@
 	'fence_egenera':		val_egenera_fd,
 	'fence_bullpap':		val_bullpap_fd,
 	'fence_lpar':			val_lpar_fd,
-	'fence_ucs':			val_ucs_fd,
+	'fence_cisco_ucs':		val_cisco_ucs_fd,
 	'fence_cisco_mds':		val_cisco_mds_fd,
 	'fence_ifmib':			val_cisco_mds_fd,
 	'fence_vmware':			val_vmware_fd,
@@ -1795,7 +1795,7 @@
 
 	return errors
 
-def val_ucs_fi(form, fenceinst):
+def val_cisco_ucs_fi(form, fenceinst):
 	errors = list()
 
 	try:
@@ -1832,7 +1832,7 @@
 	'fence_xvm':			val_xvm_fi,
 	'fence_scsi':			val_scsi_fi,
 	'fence_lpar':			val_lpar_fi,
-	'fence_ucs':			val_ucs_fi,
+	'fence_cisco_ucs':		val_cisco_ucs_fi,
 	'fence_cisco_mds':		val_cisco_mds_fi,
 	'fence_ifmib':			val_cisco_mds_fi,
 	'fence_vmware':			val_vmware_fi,