diff --git a/src/sacct/options.c b/src/sacct/options.c
index 35d54f3795b4eb183a44ab299f75336bde218e96..f3587586c83c1b8d2df264321361e999d9b97eaf 100644
--- a/src/sacct/options.c
+++ b/src/sacct/options.c
@@ -524,8 +524,7 @@ int get_data(void)
 		return SLURM_SUCCESS;
 	} else {
 
-		jobs = jobacct_storage_g_get_jobs_cond(acct_db_conn, getuid(),
-						       job_cond);
+		jobs = slurmdb_jobs_get(acct_db_conn, job_cond);
 	}
 
 	if (params.opt_fdump)
@@ -920,7 +919,7 @@ void parse_command_line(int argc, char **argv)
 			exit(1);
 		}
 		xfree(acct_type);
-		acct_db_conn = acct_storage_g_get_connection(false, 0, false, NULL);
+		acct_db_conn = slurmdb_connection_get();
 		if(errno != SLURM_SUCCESS) {
 			error("Problem talking to the database: %m");
 			exit(1);
@@ -1422,7 +1421,7 @@ void sacct_fini()
 	if(params.opt_completion)
 		g_slurm_jobcomp_fini();
 	else {
-		acct_storage_g_close_connection(&acct_db_conn);
+		slurmdb_connection_close(&acct_db_conn);
 		slurm_acct_storage_fini();
 	}
 	xfree(params.opt_field_list);
diff --git a/src/sacct/print.c b/src/sacct/print.c
index 973f385e7e09a008a245290e9b970c4616009307..12b76530ce9348ec103ca872127ceda761d28587 100644
--- a/src/sacct/print.c
+++ b/src/sacct/print.c
@@ -909,8 +909,7 @@ void print_fields(type_t type, void *object)
 				break;
 			}
 			if(!qos_list)
-				qos_list = acct_storage_g_get_qos(
-					acct_db_conn, getuid(), NULL);
+				qos_list = slurmdb_qos_get(acct_db_conn, NULL);
 
 			tmp_char = _find_qos_name_from_list(qos_list,
 							    tmp_int);
diff --git a/src/sreport/resv_reports.c b/src/sreport/resv_reports.c
index e0829193b2a93c6ec3a66289a0a1081e503965fb..a200a949c94f2ec27c16f890d63464490d56d8b2 100644
--- a/src/sreport/resv_reports.c
+++ b/src/sreport/resv_reports.c
@@ -323,8 +323,7 @@ static List _get_resv_list(int argc, char *argv[],
 
 	_set_resv_cond(&i, argc, argv, resv_cond, format_list);
 
-	resv_list = acct_storage_g_get_reservations(db_conn, my_uid,
-						    resv_cond);
+	resv_list = slurmdb_reservations_get(db_conn, resv_cond);
 	if(!resv_list) {
 		exit_code=1;
 		fprintf(stderr, " Problem with resv query.\n");
diff --git a/src/sreport/sreport.c b/src/sreport/sreport.c
index b641784c8e1f4f477b9923455ea8cca2a2e5fb84..6ffa83c3d252080241b8a3043e270aa20980c37e 100644
--- a/src/sreport/sreport.c
+++ b/src/sreport/sreport.c
@@ -198,7 +198,7 @@ main (int argc, char *argv[])
 		error_code = _get_command (&input_field_count, input_fields);
 	}
 
-	acct_storage_g_close_connection(&db_conn);
+	slurmdb_connection_close(&db_conn);
 	slurm_acct_storage_fini();
 	exit(exit_code);
 }