diff -uNr a/fence/agents/compute/fence_compute.py b/fence/agents/compute/fence_compute.py
--- a/fence/agents/compute/fence_compute.py	2017-07-24 12:16:11.193996848 +0200
+++ b/fence/agents/compute/fence_compute.py	2017-07-24 12:18:18.012271280 +0200
@@ -367,7 +367,7 @@
 	logging.warning("Couldn't obtain a supported connection to nova, tried: %s\n" % repr(versions))
 
 def define_new_opts():
-	all_opt["endpoint-type"] = {
+	all_opt["endpoint_type"] = {
 		"getopt" : "e:",
 		"longopt" : "endpoint-type",
 		"help" : "-e, --endpoint-type=[endpoint] Nova Endpoint type (publicURL, internalURL, adminURL)",
@@ -376,7 +376,7 @@
 		"default" : "internalURL",
 		"order": 1,
 	}
-	all_opt["tenant-name"] = {
+	all_opt["tenant_name"] = {
 		"getopt" : "t:",
 		"longopt" : "tenant-name",
 		"help" : "-t, --tenant-name=[tenant]     Keystone Admin Tenant",
@@ -385,7 +385,7 @@
 		"default" : "",
 		"order": 1,
 	}
-	all_opt["auth-url"] = {
+	all_opt["auth_url"] = {
 		"getopt" : "k:",
 		"longopt" : "auth-url",
 		"help" : "-k, --auth-url=[url]           Keystone Admin Auth URL",
@@ -394,7 +394,7 @@
 		"default" : "",
 		"order": 1,
 	}
-	all_opt["region-name"] = {
+	all_opt["region_name"] = {
 		"getopt" : "",
 		"longopt" : "region-name",
 		"help" : "--region-name=[region]         Region Name",
@@ -420,7 +420,7 @@
 		"shortdesc" : "DNS domain in which hosts live",
 		"order": 5,
 	}
-	all_opt["record-only"] = {
+	all_opt["record_only"] = {
 		"getopt" : "r:",
 		"longopt" : "record-only",
 		"help" : "--record-only                  Record the target as needing evacuation but as yet do not intiate it",
@@ -429,7 +429,7 @@
 		"default" : "False",
 		"order": 5,
 	}
-	all_opt["instance-filtering"] = {
+	all_opt["instance_filtering"] = {
 		"getopt" : "",
 		"longopt" : "instance-filtering",
 		"help" : "--instance-filtering           Allow instances created from images and flavors with evacuable=true to be evacuated (or all if no images/flavors have been tagged)",
@@ -438,7 +438,7 @@
 		"default" : "True",
 		"order": 5,
 	}
-	all_opt["no-shared-storage"] = {
+	all_opt["no_shared_storage"] = {
 		"getopt" : "",
 		"longopt" : "no-shared-storage",
 		"help" : "--no-shared-storage            Disable functionality for shared storage",
@@ -452,9 +452,9 @@
 	global override_status
 	atexit.register(atexit_handler)
 
-	device_opt = ["login", "passwd", "tenant-name", "auth-url", "fabric_fencing", 
-		"no_login", "no_password", "port", "domain", "no-shared-storage", "endpoint-type",
-		"record-only", "instance-filtering", "insecure", "region-name"]
+	device_opt = ["login", "passwd", "tenant_name", "auth_url", "fabric_fencing", 
+		"no_login", "no_password", "port", "domain", "no_shared_storage", "endpoint_type",
+		"record_only", "instance_filtering", "insecure", "region_name"]
 	define_new_opts()
 	all_opt["shell_timeout"]["default"] = "180"
 
diff -uNr a/fence/agents/scsi/fence_scsi.py b/fence/agents/scsi/fence_scsi.py
--- a/fence/agents/scsi/fence_scsi.py	2017-07-24 12:16:11.135997637 +0200
+++ b/fence/agents/scsi/fence_scsi.py	2017-07-24 12:20:21.987584397 +0200
@@ -332,7 +332,7 @@
 		"shortdesc" : "Log output (stdout and stderr) to file",
 		"order": 5
 	}
-	all_opt["corosync-cmap_path"] = {
+	all_opt["corosync_cmap_path"] = {
 		"getopt" : "Z:",
 		"longopt" : "corosync-cmap-path",
 		"help" : "--corosync-cmap-path=[path]    Path to corosync-cmapctl binary",
@@ -416,7 +416,7 @@
 	atexit.register(atexit_handler)
 
 	device_opt = ["no_login", "no_password", "devices", "nodename", "key",\
-	"aptpl", "fabric_fencing", "on_target", "corosync-cmap_path",\
+	"aptpl", "fabric_fencing", "on_target", "corosync_cmap_path",\
 	"sg_persist_path", "sg_turs_path", "logfile", "vgs_path", "force_on"]
 
 	define_new_opts()