diff --git a/src/slurmctld/controller.c b/src/slurmctld/controller.c
index a095c991a124e8f5f5f8c160a336c7ec62d6d84f..ac3577855158c940addbbfadafe9bac9f03b5e5b 100644
--- a/src/slurmctld/controller.c
+++ b/src/slurmctld/controller.c
@@ -470,9 +470,9 @@ int main(int argc, char *argv[])
 	 * unplug after other data structures are purged */
 	g_slurm_jobcomp_fini();
 	jobacct_storage_g_fini();
-	slurm_clusteracct_storage_fini();
+	slurm_acct_storage_fini();
 	slurm_jobacct_gather_fini();
-	slurm_accounting_storage_fini();
+	slurm_jobacct_storage_fini();
 	slurm_sched_fini();
 	slurm_select_fini();
 	checkpoint_fini();