diff -uNr a/fence/agents/compute/fence_compute.py b/fence/agents/compute/fence_compute.py
--- a/fence/agents/compute/fence_compute.py	2018-07-16 12:34:24.982643862 +0200
+++ b/fence/agents/compute/fence_compute.py	2018-07-16 12:42:16.965667752 +0200
@@ -353,7 +353,7 @@
 		"default" : "",
 		"order": 1,
 	}
-	all_opt["user_domain"] = {
+	all_opt["user-domain"] = {
 		"getopt" : "u:",
 		"longopt" : "user-domain",
 		"help" : "-u, --user-domain=[name]       Keystone v3 User Domain",
@@ -362,7 +362,7 @@
 		"default" : "Default",
 		"order": 2,
 	}
-	all_opt["project_domain"] = {
+	all_opt["project-domain"] = {
 		"getopt" : "P:",
 		"longopt" : "project-domain",
 		"help" : "-d, --project-domain=[name]    Keystone v3 Project Domain",
@@ -433,6 +433,14 @@
 		"default" : "False",
 		"order": 5,
 	}
+	all_opt["compute-domain"] = {
+		"getopt" : ":",
+		"longopt" : "compute-domain",
+		"help" : "--compute-domain=[string]      Replaced by --domain",
+		"required" : "0",
+		"shortdesc" : "Replaced by domain",
+		"order": 6,
+	}
 
 def set_multi_power_fn(connection, options, set_power_fn, get_power_fn, retry_attempts=1):
 	for _ in range(retry_attempts):
@@ -450,9 +458,10 @@
 	global override_status
 	atexit.register(atexit_handler)
 
-	device_opt = ["login", "passwd", "tenant_name", "auth_url", "fabric_fencing",
-		      "no_login", "no_password", "port", "domain", "project_domain", "user_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", "compute-domain", "project-domain",
+			"user-domain", "no_shared_storage", "endpoint_type", "record_only",
+			"instance_filtering", "insecure", "region_name"]
 	define_new_opts()
 	all_opt["shell_timeout"]["default"] = "180"
 
@@ -470,6 +479,11 @@
 
 	run_delay(options)
 
+	# workaround to avoid regressions
+	if "--compute-domain" in options and options["--compute-domain"]:
+		options["--domain"] = options["--compute-domain"]
+		del options["--domain"]
+
 	logging.debug("Running "+options["--action"])
 	connection = create_nova_connection(options)
 
diff -uNr a/fence/agents/compute/fence_evacuate.py b/fence/agents/compute/fence_evacuate.py
--- a/fence/agents/compute/fence_evacuate.py	2018-07-16 12:34:24.982643862 +0200
+++ b/fence/agents/compute/fence_evacuate.py	2018-07-16 12:42:16.966667739 +0200
@@ -290,7 +290,7 @@
 		"default" : "",
 		"order": 1,
 	}
-	all_opt["user_domain"] = {
+	all_opt["user-domain"] = {
 		"getopt" : "u:",
 		"longopt" : "user-domain",
 		"help" : "-u, --user-domain=[name]       Keystone v3 User Domain",
@@ -299,7 +299,7 @@
 		"default" : "Default",
 		"order": 2,
 	}
-	all_opt["project_domain"] = {
+	all_opt["project-domain"] = {
 		"getopt" : "P:",
 		"longopt" : "project-domain",
 		"help" : "-d, --project-domain=[name]    Keystone v3 Project Domain",
@@ -361,14 +361,22 @@
 		"default" : "False",
 		"order": 5,
 	}
+	all_opt["compute-domain"] = {
+		"getopt" : ":",
+		"longopt" : "compute-domain",
+		"help" : "--compute-domain=[string]      Replaced by --domain",
+		"required" : "0",
+		"shortdesc" : "Replaced by domain",
+		"order": 6,
+	}
 
 def main():
 	atexit.register(atexit_handler)
 
 	device_opt = ["login", "passwd", "tenant_name", "auth_url",
-		      "no_login", "no_password", "port", "domain", "project_domain",
-		      "user_domain", "no_shared_storage", "endpoint_type",
-		      "instance_filtering", "insecure", "region_name"]
+		      "no_login", "no_password", "port", "domain", "compute-domain",
+		      "project-domain", "user-domain", "no_shared_storage",
+		      "endpoint_type", "instance_filtering", "insecure", "region_name"]
 	define_new_opts()
 	all_opt["shell_timeout"]["default"] = "180"
 
@@ -383,6 +391,12 @@
 
 	run_delay(options)
 
+	# workaround to avoid regressions
+	if "--compute-domain" in options and options["--compute-domain"]:
+		options["--domain"] = options["--compute-domain"]
+		del options["--domain"]
+
+
 	connection = create_nova_connection(options)
 
 	# Un-evacuating a server doesn't make sense