diff --git a/source3/utils/net_ads.c b/source3/utils/net_ads.c
index 8e523e32d70..fae5bc8becb 100644
--- a/source3/utils/net_ads.c
+++ b/source3/utils/net_ads.c
@@ -1125,7 +1125,7 @@ static WERROR check_ads_config( void )
 	if ( lp_security() == SEC_ADS && !*lp_realm()) {
 		d_fprintf(stderr, _("realm must be set in in %s for ADS "
 			  "join to succeed.\n"), get_dyn_CONFIGFILE());
-		return WERR_INVALID_PARAM;
+		return WERR_INVALID_PARAMETER;
 	}
 
 	return WERR_OK;
@@ -1508,35 +1508,35 @@ int net_ads_join(struct net_context *c, int argc, const char **argv)
 		else if ( !strncasecmp_m(argv[i], "createcomputer", strlen("createcomputer")) ) {
 			if ( (create_in_ou = get_string_param(argv[i])) == NULL ) {
 				d_fprintf(stderr, _("Please supply a valid OU path.\n"));
-				werr = WERR_INVALID_PARAM;
+				werr = WERR_INVALID_PARAMETER;
 				goto fail;
 			}
 		}
 		else if ( !strncasecmp_m(argv[i], "osName", strlen("osName")) ) {
 			if ( (os_name = get_string_param(argv[i])) == NULL ) {
 				d_fprintf(stderr, _("Please supply a operating system name.\n"));
-				werr = WERR_INVALID_PARAM;
+				werr = WERR_INVALID_PARAMETER;
 				goto fail;
 			}
 		}
 		else if ( !strncasecmp_m(argv[i], "osVer", strlen("osVer")) ) {
 			if ( (os_version = get_string_param(argv[i])) == NULL ) {
 				d_fprintf(stderr, _("Please supply a valid operating system version.\n"));
-				werr = WERR_INVALID_PARAM;
+				werr = WERR_INVALID_PARAMETER;
 				goto fail;
 			}
 		}
 		else if ( !strncasecmp_m(argv[i], "osServicePack", strlen("osServicePack")) ) {
 			if ( (os_servicepack = get_string_param(argv[i])) == NULL ) {
 				d_fprintf(stderr, _("Please supply a valid servicepack identifier.\n"));
-				werr = WERR_INVALID_PARAM;
+				werr = WERR_INVALID_PARAMETER;
 				goto fail;
 			}
 		}
 		else if ( !strncasecmp_m(argv[i], "machinepass", strlen("machinepass")) ) {
 			if ( (machine_password = get_string_param(argv[i])) == NULL ) {
 				d_fprintf(stderr, _("Please supply a valid password to set as trust account password.\n"));
-				werr = WERR_INVALID_PARAM;
+				werr = WERR_INVALID_PARAMETER;
 				goto fail;
 			}
 		}
@@ -1552,7 +1552,7 @@ int net_ads_join(struct net_context *c, int argc, const char **argv)
 
 	if (!*domain) {
 		d_fprintf(stderr, _("Please supply a valid domain name\n"));
-		werr = WERR_INVALID_PARAM;
+		werr = WERR_INVALID_PARAMETER;
 		goto fail;
 	}
 
diff --git a/source3/utils/net_registry.c b/source3/utils/net_registry.c
index 5f5829de3b6..afc99d58873 100644
--- a/source3/utils/net_registry.c
+++ b/source3/utils/net_registry.c
@@ -59,7 +59,7 @@ static WERROR open_hive(TALLOC_CTX *ctx, const char *path,
 	TALLOC_CTX *tmp_ctx = talloc_stackframe();
 
 	if ((hive == NULL) || (subkeyname == NULL)) {
-		werr = WERR_INVALID_PARAM;
+		werr = WERR_INVALID_PARAMETER;
 		goto done;
 	}
 
@@ -100,7 +100,7 @@ static WERROR open_key(TALLOC_CTX *ctx, const char *path,
 	TALLOC_CTX *tmp_ctx = talloc_stackframe();
 
 	if ((path == NULL) || (key == NULL)) {
-		return WERR_INVALID_PARAM;
+		return WERR_INVALID_PARAMETER;
 	}
 
 	werr = open_hive(tmp_ctx, path, desired_access, &hive, &subkey_name);
@@ -720,13 +720,13 @@ static WERROR net_registry_getsd_internal(struct net_context *c,
 
 	if (sd == NULL) {
 		d_fprintf(stderr, _("internal error: invalid argument\n"));
-		werr = WERR_INVALID_PARAM;
+		werr = WERR_INVALID_PARAMETER;
 		goto done;
 	}
 
 	if (strlen(keyname) == 0) {
 		d_fprintf(stderr, _("error: zero length key name given\n"));
-		werr = WERR_INVALID_PARAM;
+		werr = WERR_INVALID_PARAMETER;
 		goto done;
 	}
 
@@ -835,7 +835,7 @@ static WERROR net_registry_setsd_internal(struct net_context *c,
 
 	if (strlen(keyname) == 0) {
 		d_fprintf(stderr, _("error: zero length key name given\n"));
-		werr = WERR_INVALID_PARAM;
+		werr = WERR_INVALID_PARAMETER;
 		goto done;
 	}
 
@@ -1004,7 +1004,7 @@ static WERROR import_create_val (struct import_ctx *ctx,
 	WERROR werr;
 
 	if (parent == NULL) {
-		return WERR_INVALID_PARAM;
+		return WERR_INVALID_PARAMETER;
 	}
 
 	werr = reg_setvalue(parent, name, value);
@@ -1021,7 +1021,7 @@ static WERROR import_delete_val (struct import_ctx *ctx,
 	WERROR werr;
 
 	if (parent == NULL) {
-		return WERR_INVALID_PARAM;
+		return WERR_INVALID_PARAMETER;
 	}
 
 	werr = reg_deletevalue(parent, name);
diff --git a/source3/utils/net_registry_util.c b/source3/utils/net_registry_util.c
index 77ed395c23a..50b8a8af8b9 100644
--- a/source3/utils/net_registry_util.c
+++ b/source3/utils/net_registry_util.c
@@ -135,11 +135,11 @@ WERROR split_hive_key(TALLOC_CTX *ctx, const char *path, char **hivename,
 	const char *tmp_subkeyname;
 
 	if ((path == NULL) || (hivename == NULL) || (subkeyname == NULL)) {
-		return WERR_INVALID_PARAM;
+		return WERR_INVALID_PARAMETER;
 	}
 
 	if (strlen(path) == 0) {
-		return WERR_INVALID_PARAM;
+		return WERR_INVALID_PARAMETER;
 	}
 
 	if (strchr(path, '\\') == NULL) {
diff --git a/source3/utils/net_rpc_conf.c b/source3/utils/net_rpc_conf.c
index d60d5e1e8a5..0b1b59e3b45 100644
--- a/source3/utils/net_rpc_conf.c
+++ b/source3/utils/net_rpc_conf.c
@@ -1832,7 +1832,7 @@ static NTSTATUS rpc_conf_setparm_internal(struct net_context *c,
 	 */
 
 	if (!net_conf_param_valid(service_name, param_name, valstr)) {
-		werr = WERR_INVALID_PARAM;
+		werr = WERR_INVALID_PARAMETER;
 		goto error;
 	}
 
diff --git a/source3/utils/net_rpc_registry.c b/source3/utils/net_rpc_registry.c
index de0db1cf917..5e170538d81 100644
--- a/source3/utils/net_rpc_registry.c
+++ b/source3/utils/net_rpc_registry.c
@@ -1881,7 +1881,7 @@ static WERROR import_create_val(struct import_ctx* ctx,
 	struct dcerpc_binding_handle *b = ctx->pipe_hnd->binding_handle;
 
 	if (parent == NULL) {
-		return WERR_INVALID_PARAM;
+		return WERR_INVALID_PARAMETER;
 	}
 
 	ZERO_STRUCT(valuename);
@@ -1917,7 +1917,7 @@ static WERROR import_delete_val(struct import_ctx* ctx,
 	struct dcerpc_binding_handle *b = ctx->pipe_hnd->binding_handle;
 
 	if (parent == NULL) {
-		return WERR_INVALID_PARAM;
+		return WERR_INVALID_PARAMETER;
 	}
 
 	ZERO_STRUCT(valuename);