diff --git a/agents/cisco_mds/fence_cisco_mds.py b/agents/cisco_mds/fence_cisco_mds.py
index 04cd1f84..fbb876a9 100644
--- a/agents/cisco_mds/fence_cisco_mds.py
+++ b/agents/cisco_mds/fence_cisco_mds.py
@@ -1,94 +1,94 @@
 #!@PYTHON@ -tt
 
 # The Following agent has been tested on:
 # - Cisco MDS UROS 9134 FC (1 Slot) Chassis ("1/2/4 10 Gbps FC/Supervisor-2") Motorola, e500v2
 #   with BIOS 1.0.16, kickstart 4.1(1c), system 4.1(1c)
 # - Cisco MDS 9124 (1 Slot) Chassis ("1/2/4 Gbps FC/Supervisor-2") Motorola, e500
 #   with BIOS 1.0.16, kickstart 4.1(1c), system 4.1(1c)
 
 import sys, re
 import atexit
 sys.path.append("@FENCEAGENTSLIBDIR@")
 from fencing import *
 from fencing import fail_usage, array_to_dict
 from fencing_snmp import FencingSnmp
 
 ### CONSTANTS ###
 # Cisco admin status
 PORT_ADMIN_STATUS_OID = ".1.3.6.1.2.1.75.1.2.2.1.1"
 
 # IF-MIB trees for alias, status and port
 ALIASES_OID = ".1.3.6.1.2.1.31.1.1.1.18"
 PORTS_OID = ".1.3.6.1.2.1.2.2.1.2"
 
 ### GLOBAL VARIABLES ###
 # OID converted from fc port name (fc(x)/(y))
 PORT_OID = ""
 
 ### FUNCTIONS ###
 
 # Convert cisco port name (fc(x)/(y)) to OID
 def cisco_port2oid(port):
 	port = port.lower()
 
 	nums = re.match(r'^fc(\d+)/(\d+)$', port)
 
 	if nums and len(nums.groups()) == 2:
 		return "%s.%d.%d"% (PORT_ADMIN_STATUS_OID, int(nums.group(1))+21, int(nums.group(2))-1)
 	else:
 		fail_usage("Mangled port number: %s"%(port))
 
 def get_power_status(conn, options):
 	(_, status) = conn.get(PORT_OID)
 	return status == "1" and "on" or "off"
 
 def set_power_status(conn, options):
 	conn.set(PORT_OID, (options["--action"] == "on" and 1 or 2))
 
 def get_outlets_status(conn, options):
 	result = {}
 
 	res_fc = conn.walk(PORTS_OID, 30)
 	res_aliases = array_to_dict(conn.walk(ALIASES_OID, 30))
 
 	fc_re = re.compile(r'^"fc\d+/\d+"$')
 
 	for x in res_fc:
 		if fc_re.match(x[1]):
 			port_num = x[0].split('.')[-1]
 
 			port_name = x[1].strip('"')
 			port_alias = (port_num in res_aliases and res_aliases[port_num].strip('"') or "")
 			port_status = ""
 			result[port_name] = (port_alias, port_status)
 
 	return result
 
 # Main agent method
 def main():
 	global PORT_OID
 
 	device_opt = ["fabric_fencing", "ipaddr", "login", "passwd", "no_login", "no_password", \
 		       "port", "snmp_version", "snmp"]
 
 	atexit.register(atexit_handler)
 
 	options = check_input(device_opt, process_input(device_opt))
 
 	docs = {}
 	docs["shortdesc"] = "Fence agent for Cisco MDS"
-	docs["longdesc"] = "fence_cisco_mds is a Power Fencing agent \
+	docs["longdesc"] = "fence_cisco_mds is an I/O Fencing agent \
 which can be used with any Cisco MDS 9000 series with SNMP enabled device."
 	docs["vendorurl"] = "http://www.cisco.com"
 	show_docs(options, docs)
 
 	if not options["--action"] in ["list", "monitor"]:
 		PORT_OID = cisco_port2oid(options["--plug"])
 
 	# Operate the fencing device
 	result = fence_action(FencingSnmp(options), options, set_power_status, get_power_status, get_outlets_status)
 
 	sys.exit(result)
 
 if __name__ == "__main__":
 	main()
diff --git a/tests/data/metadata/fence_cisco_mds.xml b/tests/data/metadata/fence_cisco_mds.xml
index 2105eccc..829c9dcb 100644
--- a/tests/data/metadata/fence_cisco_mds.xml
+++ b/tests/data/metadata/fence_cisco_mds.xml
@@ -1,223 +1,223 @@
 <?xml version="1.0" ?>
 <resource-agent name="fence_cisco_mds" shortdesc="Fence agent for Cisco MDS" >
-<longdesc>fence_cisco_mds is a Power Fencing agent which can be used with any Cisco MDS 9000 series with SNMP enabled device.</longdesc>
+<longdesc>fence_cisco_mds is an I/O Fencing agent which can be used with any Cisco MDS 9000 series with SNMP enabled device.</longdesc>
 <vendor-url>http://www.cisco.com</vendor-url>
 <parameters>
 	<parameter name="action" unique="0" required="1">
 		<getopt mixed="-o, --action=[action]" />
 		<content type="string" default="off"  />
 		<shortdesc lang="en">Fencing action</shortdesc>
 	</parameter>
 	<parameter name="community" unique="0" required="0">
 		<getopt mixed="-c, --community=[community]" />
 		<content type="string"  />
 		<shortdesc lang="en">Set the community string</shortdesc>
 	</parameter>
 	<parameter name="ip" unique="0" required="1" obsoletes="ipaddr">
 		<getopt mixed="-a, --ip=[ip]" />
 		<content type="string"  />
 		<shortdesc lang="en">IP address or hostname of fencing device</shortdesc>
 	</parameter>
 	<parameter name="ipaddr" unique="0" required="1" deprecated="1">
 		<getopt mixed="-a, --ip=[ip]" />
 		<content type="string"  />
 		<shortdesc lang="en">IP address or hostname of fencing device</shortdesc>
 	</parameter>
 	<parameter name="ipport" unique="0" required="0">
 		<getopt mixed="-u, --ipport=[port]" />
 		<content type="integer" default="161"  />
 		<shortdesc lang="en">TCP/UDP port to use for connection with device</shortdesc>
 	</parameter>
 	<parameter name="login" unique="0" required="0" deprecated="1">
 		<getopt mixed="-l, --username=[name]" />
 		<content type="string"  />
 		<shortdesc lang="en">Login name</shortdesc>
 	</parameter>
 	<parameter name="passwd" unique="0" required="0" deprecated="1">
 		<getopt mixed="-p, --password=[password]" />
 		<content type="string"  />
 		<shortdesc lang="en">Login password or passphrase</shortdesc>
 	</parameter>
 	<parameter name="passwd_script" unique="0" required="0" deprecated="1">
 		<getopt mixed="-S, --password-script=[script]" />
 		<content type="string"  />
 		<shortdesc lang="en">Script to run to retrieve password</shortdesc>
 	</parameter>
 	<parameter name="password" unique="0" required="0" obsoletes="passwd">
 		<getopt mixed="-p, --password=[password]" />
 		<content type="string"  />
 		<shortdesc lang="en">Login password or passphrase</shortdesc>
 	</parameter>
 	<parameter name="password_script" unique="0" required="0" obsoletes="passwd_script">
 		<getopt mixed="-S, --password-script=[script]" />
 		<content type="string"  />
 		<shortdesc lang="en">Script to run to retrieve password</shortdesc>
 	</parameter>
 	<parameter name="plug" unique="0" required="1" obsoletes="port">
 		<getopt mixed="-n, --plug=[id]" />
 		<content type="string"  />
 		<shortdesc lang="en">Physical plug number on device, UUID or identification of machine</shortdesc>
 	</parameter>
 	<parameter name="port" unique="0" required="1" deprecated="1">
 		<getopt mixed="-n, --plug=[id]" />
 		<content type="string"  />
 		<shortdesc lang="en">Physical plug number on device, UUID or identification of machine</shortdesc>
 	</parameter>
 	<parameter name="snmp_auth_prot" unique="0" required="0">
 		<getopt mixed="-b, --snmp-auth-prot=[prot]" />
 		<content type="select"  >
 			<option value="MD5" />
 			<option value="SHA" />
 		</content>
 		<shortdesc lang="en">Set authentication protocol</shortdesc>
 	</parameter>
 	<parameter name="snmp_priv_passwd" unique="0" required="0">
 		<getopt mixed="-P, --snmp-priv-passwd=[pass]" />
 		<content type="string"  />
 		<shortdesc lang="en">Set privacy protocol password</shortdesc>
 	</parameter>
 	<parameter name="snmp_priv_passwd_script" unique="0" required="0">
 		<getopt mixed="-R, --snmp-priv-passwd-script" />
 		<content type="string"  />
 		<shortdesc lang="en">Script to run to retrieve privacy password</shortdesc>
 	</parameter>
 	<parameter name="snmp_priv_prot" unique="0" required="0">
 		<getopt mixed="-B, --snmp-priv-prot=[prot]" />
 		<content type="select"  >
 			<option value="DES" />
 			<option value="AES" />
 		</content>
 		<shortdesc lang="en">Set privacy protocol</shortdesc>
 	</parameter>
 	<parameter name="snmp_sec_level" unique="0" required="0">
 		<getopt mixed="-E, --snmp-sec-level=[level]" />
 		<content type="select"  >
 			<option value="noAuthNoPriv" />
 			<option value="authNoPriv" />
 			<option value="authPriv" />
 		</content>
 		<shortdesc lang="en">Set security level</shortdesc>
 	</parameter>
 	<parameter name="snmp_version" unique="0" required="0">
 		<getopt mixed="-d, --snmp-version=[version]" />
 		<content type="select"  >
 			<option value="1" />
 			<option value="2c" />
 			<option value="3" />
 		</content>
 		<shortdesc lang="en">Specifies SNMP version to use</shortdesc>
 	</parameter>
 	<parameter name="username" unique="0" required="0" obsoletes="login">
 		<getopt mixed="-l, --username=[name]" />
 		<content type="string"  />
 		<shortdesc lang="en">Login name</shortdesc>
 	</parameter>
 	<parameter name="quiet" unique="0" required="0">
 		<getopt mixed="-q, --quiet" />
 		<content type="boolean"  />
 		<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug-file or logging to syslog.</shortdesc>
 	</parameter>
 	<parameter name="verbose" unique="0" required="0">
 		<getopt mixed="-v, --verbose" />
 		<content type="boolean"  />
 		<shortdesc lang="en">Verbose mode. Multiple -v flags can be stacked on the command line (e.g., -vvv) to increase verbosity.</shortdesc>
 	</parameter>
 	<parameter name="verbose_level" unique="0" required="0">
 		<getopt mixed="--verbose-level" />
 		<content type="integer"  />
 		<shortdesc lang="en">Level of debugging detail in output. Defaults to the number of --verbose flags specified on the command line, or to 1 if verbose=1 in a stonith device configuration (i.e., on stdin).</shortdesc>
 	</parameter>
 	<parameter name="debug" unique="0" required="0" deprecated="1">
 		<getopt mixed="-D, --debug-file=[debugfile]" />
 		<content type="string"  />
 		<shortdesc lang="en">Write debug information to given file</shortdesc>
 	</parameter>
 	<parameter name="debug_file" unique="0" required="0" obsoletes="debug">
 		<getopt mixed="-D, --debug-file=[debugfile]" />
 		<shortdesc lang="en">Write debug information to given file</shortdesc>
 	</parameter>
 	<parameter name="version" unique="0" required="0">
 		<getopt mixed="-V, --version" />
 		<content type="boolean"  />
 		<shortdesc lang="en">Display version information and exit</shortdesc>
 	</parameter>
 	<parameter name="help" unique="0" required="0">
 		<getopt mixed="-h, --help" />
 		<content type="boolean"  />
 		<shortdesc lang="en">Display help and exit</shortdesc>
 	</parameter>
 	<parameter name="plug_separator" unique="0" required="0">
 		<getopt mixed="--plug-separator=[char]" />
 		<content type="string" default=","  />
 		<shortdesc lang="en">Separator for plug parameter when specifying more than 1 plug</shortdesc>
 	</parameter>
 	<parameter name="separator" unique="0" required="0">
 		<getopt mixed="-C, --separator=[char]" />
 		<content type="string" default=","  />
 		<shortdesc lang="en">Separator for CSV created by 'list' operation</shortdesc>
 	</parameter>
 	<parameter name="delay" unique="0" required="0">
 		<getopt mixed="--delay=[seconds]" />
 		<content type="second" default="0"  />
 		<shortdesc lang="en">Wait X seconds before fencing is started</shortdesc>
 	</parameter>
 	<parameter name="disable_timeout" unique="0" required="0">
 		<getopt mixed="--disable-timeout=[true/false]" />
 		<content type="string"  />
 		<shortdesc lang="en">Disable timeout (true/false) (default: true when run from Pacemaker 2.0+)</shortdesc>
 	</parameter>
 	<parameter name="login_timeout" unique="0" required="0">
 		<getopt mixed="--login-timeout=[seconds]" />
 		<content type="second" default="5"  />
 		<shortdesc lang="en">Wait X seconds for cmd prompt after login</shortdesc>
 	</parameter>
 	<parameter name="power_timeout" unique="0" required="0">
 		<getopt mixed="--power-timeout=[seconds]" />
 		<content type="second" default="20"  />
 		<shortdesc lang="en">Test X seconds for status change after ON/OFF</shortdesc>
 	</parameter>
 	<parameter name="power_wait" unique="0" required="0">
 		<getopt mixed="--power-wait=[seconds]" />
 		<content type="second" default="0"  />
 		<shortdesc lang="en">Wait X seconds after issuing ON/OFF</shortdesc>
 	</parameter>
 	<parameter name="shell_timeout" unique="0" required="0">
 		<getopt mixed="--shell-timeout=[seconds]" />
 		<content type="second" default="3"  />
 		<shortdesc lang="en">Wait X seconds for cmd prompt after issuing command</shortdesc>
 	</parameter>
 	<parameter name="stonith_status_sleep" unique="0" required="0">
 		<getopt mixed="--stonith-status-sleep=[seconds]" />
 		<content type="second" default="1"  />
 		<shortdesc lang="en">Sleep X seconds between status calls during a STONITH action</shortdesc>
 	</parameter>
 	<parameter name="retry_on" unique="0" required="0">
 		<getopt mixed="--retry-on=[attempts]" />
 		<content type="integer" default="1"  />
 		<shortdesc lang="en">Count of attempts to retry power on</shortdesc>
 	</parameter>
 	<parameter name="snmpget_path" unique="0" required="0">
 		<getopt mixed="--snmpget-path=[path]" />
 		<shortdesc lang="en">Path to snmpget binary</shortdesc>
 	</parameter>
 	<parameter name="snmpset_path" unique="0" required="0">
 		<getopt mixed="--snmpset-path=[path]" />
 		<shortdesc lang="en">Path to snmpset binary</shortdesc>
 	</parameter>
 	<parameter name="snmpwalk_path" unique="0" required="0">
 		<getopt mixed="--snmpwalk-path=[path]" />
 		<shortdesc lang="en">Path to snmpwalk binary</shortdesc>
 	</parameter>
 </parameters>
 <actions>
 	<action name="on" automatic="1"/>
 	<action name="off" />
 	<action name="status" />
 	<action name="list" />
 	<action name="list-status" />
 	<action name="monitor" />
 	<action name="metadata" />
 	<action name="manpage" />
 	<action name="validate-all" />
 </actions>
 </resource-agent>