diff --git a/source3/registry/reg_api.c b/source3/registry/reg_api.c
index 35d1c83141b..4a68469a54b 100644
--- a/source3/registry/reg_api.c
+++ b/source3/registry/reg_api.c
@@ -804,7 +804,7 @@ WERROR reg_setvalue(struct registry_key *key, const char *name,
 	if (!store_reg_values(key->key, key->values)) {
 		TALLOC_FREE(key->values);
 		DEBUG(0, ("reg_setvalue: store_reg_values failed\n"));
-		err = WERR_REG_IO_FAILURE;
+		err = WERR_REGISTRY_IO_FAILED;
 		goto done;
 	}
 
@@ -870,7 +870,7 @@ WERROR reg_deletevalue(struct registry_key *key, const char *name)
 
 	if (!store_reg_values(key->key, key->values)) {
 		TALLOC_FREE(key->values);
-		err = WERR_REG_IO_FAILURE;
+		err = WERR_REGISTRY_IO_FAILED;
 		DEBUG(0, ("reg_deletevalue: store_reg_values failed\n"));
 		goto done;
 	}
@@ -940,7 +940,7 @@ WERROR reg_deleteallvalues(struct registry_key *key)
 
 	if (!store_reg_values(key->key, key->values)) {
 		TALLOC_FREE(key->values);
-		return WERR_REG_IO_FAILURE;
+		return WERR_REGISTRY_IO_FAILED;
 	}
 
 	return WERR_OK;
diff --git a/source3/registry/reg_api_regf.c b/source3/registry/reg_api_regf.c
index 3bf8b1296fd..ea6371f452d 100644
--- a/source3/registry/reg_api_regf.c
+++ b/source3/registry/reg_api_regf.c
@@ -95,7 +95,7 @@ static WERROR reg_load_tree(REGF_FILE *regfile, const char *topkeypath,
 	    || !store_reg_keys(&registry_key, subkeys))
 	{
 		DEBUG(0,("reg_load_tree: Failed to load %s!\n", topkeypath));
-		result = WERR_REG_IO_FAILURE;
+		result = WERR_REGISTRY_IO_FAILED;
 	}
 
 	TALLOC_FREE(subkeys);
diff --git a/source3/registry/reg_backend_db.c b/source3/registry/reg_backend_db.c
index 4aaa9a7e8d9..9d511b4f2ac 100644
--- a/source3/registry/reg_backend_db.c
+++ b/source3/registry/reg_backend_db.c
@@ -509,7 +509,7 @@ static WERROR regdb_upgrade_v1_to_v2(struct db_context *db)
 
 	status = dbwrap_traverse(db, regdb_normalize_keynames_fn, db, NULL);
 	if (!NT_STATUS_IS_OK(status)) {
-		werr = WERR_REG_IO_FAILURE;
+		werr = WERR_REGISTRY_IO_FAILED;
 		goto done;
 	}
 
@@ -704,7 +704,7 @@ static WERROR regdb_upgrade_v2_to_v3(struct db_context *db)
 
 	status = dbwrap_traverse(db, regdb_upgrade_v2_to_v3_fn, db, NULL);
 	if (!NT_STATUS_IS_OK(status)) {
-		werr = WERR_REG_IO_FAILURE;
+		werr = WERR_REGISTRY_IO_FAILED;
 		goto done;
 	}
 
@@ -805,7 +805,7 @@ WERROR regdb_init(void)
 	}
 
 	if (dbwrap_transaction_start(regdb) != 0) {
-		return WERR_REG_IO_FAILURE;
+		return WERR_REGISTRY_IO_FAILED;
 	}
 
 	if (vers_id == REGDB_VERSION_V1) {
@@ -837,7 +837,7 @@ WERROR regdb_init(void)
 	/* future upgrade code should go here */
 
 	if (dbwrap_transaction_commit(regdb) != 0) {
-		return WERR_REG_IO_FAILURE;
+		return WERR_REGISTRY_IO_FAILED;
 	}
 
 	return WERR_OK;
@@ -914,19 +914,19 @@ int regdb_close( void )
 WERROR regdb_transaction_start(void)
 {
 	return (dbwrap_transaction_start(regdb) == 0) ?
-		WERR_OK : WERR_REG_IO_FAILURE;
+		WERR_OK : WERR_REGISTRY_IO_FAILED;
 }
 
 WERROR regdb_transaction_commit(void)
 {
 	return (dbwrap_transaction_commit(regdb) == 0) ?
-		WERR_OK : WERR_REG_IO_FAILURE;
+		WERR_OK : WERR_REGISTRY_IO_FAILED;
 }
 
 WERROR regdb_transaction_cancel(void)
 {
 	return (dbwrap_transaction_cancel(regdb) == 0) ?
-		WERR_OK : WERR_REG_IO_FAILURE;
+		WERR_OK : WERR_REGISTRY_IO_FAILED;
 }
 
 /***********************************************************************