diff --git a/configure b/configure
index 765118c42791e9e9685d8593b1cccad61fb85b55..9c75592fe6b833d612c169651cb41a4c02b0f469 100755
--- a/configure
+++ b/configure
@@ -21130,7 +21130,7 @@ fi
-ac_config_files="$ac_config_files Makefile config.xml auxdir/Makefile contribs/Makefile contribs/cray/Makefile contribs/pam/Makefile contribs/perlapi/Makefile contribs/perlapi/libslurm/Makefile contribs/perlapi/libslurm/perl/Makefile.PL contribs/perlapi/libslurmdb/Makefile contribs/perlapi/libslurmdb/perl/Makefile.PL contribs/torque/Makefile contribs/phpext/Makefile contribs/phpext/slurm_php/config.m4 contribs/sjobexit/Makefile contribs/slurmdb-direct/Makefile src/Makefile src/api/Makefile src/common/Makefile src/db_api/Makefile src/database/Makefile src/sacct/Makefile src/sacctmgr/Makefile src/sreport/Makefile src/sstat/Makefile src/sshare/Makefile src/salloc/Makefile src/sbatch/Makefile src/sattach/Makefile src/sprio/Makefile src/srun/Makefile src/srun_cr/Makefile src/slurmd/Makefile src/slurmd/common/Makefile src/slurmd/slurmd/Makefile src/slurmd/slurmstepd/Makefile src/slurmdbd/Makefile src/slurmctld/Makefile src/sbcast/Makefile src/scontrol/Makefile src/scancel/Makefile src/squeue/Makefile src/sinfo/Makefile src/smap/Makefile src/strigger/Makefile src/sview/Makefile src/plugins/Makefile src/plugins/accounting_storage/Makefile src/plugins/accounting_storage/common/Makefile src/plugins/accounting_storage/filetxt/Makefile src/plugins/accounting_storage/mysql/Makefile src/plugins/accounting_storage/pgsql/Makefile src/plugins/accounting_storage/none/Makefile src/plugins/accounting_storage/slurmdbd/Makefile src/plugins/auth/Makefile src/plugins/auth/authd/Makefile src/plugins/auth/munge/Makefile src/plugins/auth/none/Makefile src/plugins/checkpoint/Makefile src/plugins/checkpoint/aix/Makefile src/plugins/checkpoint/none/Makefile src/plugins/checkpoint/ompi/Makefile src/plugins/checkpoint/blcr/Makefile src/plugins/checkpoint/blcr/cr_checkpoint.sh src/plugins/checkpoint/blcr/cr_restart.sh src/plugins/crypto/Makefile src/plugins/crypto/munge/Makefile src/plugins/crypto/openssl/Makefile src/plugins/gres/Makefile src/plugins/gres/gpu/Makefile src/plugins/gres/nic/Makefile src/plugins/jobacct_gather/Makefile src/plugins/jobacct_gather/linux/Makefile src/plugins/jobacct_gather/aix/Makefile src/plugins/jobacct_gather/none/Makefile src/plugins/jobcomp/Makefile src/plugins/jobcomp/filetxt/Makefile src/plugins/jobcomp/none/Makefile src/plugins/jobcomp/script/Makefile src/plugins/jobcomp/mysql/Makefile src/plugins/jobcomp/pgsql/Makefile src/plugins/job_submit/Makefile src/plugins/job_submit/defaults/Makefile src/plugins/job_submit/logging/Makefile src/plugins/job_submit/lua/Makefile src/plugins/job_submit/partition/Makefile src/plugins/preempt/Makefile src/plugins/preempt/none/Makefile src/plugins/preempt/partition_prio/Makefile src/plugins/preempt/qos/Makefile src/plugins/priority/Makefile src/plugins/priority/basic/Makefile src/plugins/priority/multifactor/Makefile src/plugins/proctrack/Makefile src/plugins/proctrack/aix/Makefile src/plugins/proctrack/pgid/Makefile src/plugins/proctrack/linuxproc/Makefile src/plugins/proctrack/rms/Makefile src/plugins/proctrack/sgi_job/Makefile src/plugins/proctrack/cgroup/Makefile src/plugins/proctrack/lua/Makefile src/plugins/sched/Makefile src/plugins/sched/backfill/Makefile src/plugins/sched/builtin/Makefile src/plugins/sched/hold/Makefile src/plugins/sched/wiki/Makefile src/plugins/sched/wiki2/Makefile src/plugins/select/Makefile src/plugins/select/bluegene/Makefile src/plugins/select/bluegene/ba/Makefile src/plugins/select/bluegene/bl/Makefile src/plugins/select/bluegene/bgq_ba/Makefile src/plugins/select/bluegene/bgq_bl/Makefile src/plugins/select/bluegene/sfree/Makefile src/plugins/select/cons_res/Makefile src/plugins/select/cray/Makefile src/plugins/select/cray/libalps/Makefile src/plugins/select/cray/libemulate/Makefile src/plugins/select/linear/Makefile src/plugins/switch/Makefile src/plugins/switch/elan/Makefile src/plugins/switch/none/Makefile src/plugins/switch/federation/Makefile src/plugins/mpi/Makefile src/plugins/mpi/mpich1_p4/Makefile src/plugins/mpi/mpich1_shmem/Makefile src/plugins/mpi/mpichgm/Makefile src/plugins/mpi/mpichmx/Makefile src/plugins/mpi/mvapich/Makefile src/plugins/mpi/lam/Makefile src/plugins/mpi/none/Makefile src/plugins/mpi/openmpi/Makefile src/plugins/task/Makefile src/plugins/task/affinity/Makefile src/plugins/task/none/Makefile src/plugins/topology/Makefile src/plugins/topology/3d_torus/Makefile src/plugins/topology/node_rank/Makefile src/plugins/topology/none/Makefile src/plugins/topology/tree/Makefile doc/Makefile doc/man/Makefile doc/html/Makefile doc/html/configurator.html testsuite/Makefile testsuite/expect/Makefile testsuite/slurm_unit/Makefile testsuite/slurm_unit/api/Makefile testsuite/slurm_unit/api/manual/Makefile testsuite/slurm_unit/common/Makefile"
+ac_config_files="$ac_config_files Makefile config.xml auxdir/Makefile contribs/Makefile contribs/cray/Makefile contribs/pam/Makefile contribs/perlapi/Makefile contribs/perlapi/libslurm/Makefile contribs/perlapi/libslurm/perl/Makefile.PL contribs/perlapi/libslurmdb/Makefile contribs/perlapi/libslurmdb/perl/Makefile.PL contribs/torque/Makefile contribs/phpext/Makefile contribs/phpext/slurm_php/config.m4 contribs/sjobexit/Makefile contribs/slurmdb-direct/Makefile src/Makefile src/api/Makefile src/common/Makefile src/db_api/Makefile src/database/Makefile src/sacct/Makefile src/sacctmgr/Makefile src/sreport/Makefile src/sstat/Makefile src/sshare/Makefile src/salloc/Makefile src/sbatch/Makefile src/sattach/Makefile src/sprio/Makefile src/srun/Makefile src/srun_cr/Makefile src/slurmd/Makefile src/slurmd/common/Makefile src/slurmd/slurmd/Makefile src/slurmd/slurmstepd/Makefile src/slurmdbd/Makefile src/slurmctld/Makefile src/sbcast/Makefile src/scontrol/Makefile src/scancel/Makefile src/squeue/Makefile src/sinfo/Makefile src/smap/Makefile src/strigger/Makefile src/sview/Makefile src/plugins/Makefile src/plugins/accounting_storage/Makefile src/plugins/accounting_storage/common/Makefile src/plugins/accounting_storage/filetxt/Makefile src/plugins/accounting_storage/mysql/Makefile src/plugins/accounting_storage/pgsql/Makefile src/plugins/accounting_storage/none/Makefile src/plugins/accounting_storage/slurmdbd/Makefile src/plugins/auth/Makefile src/plugins/auth/authd/Makefile src/plugins/auth/munge/Makefile src/plugins/auth/none/Makefile src/plugins/checkpoint/Makefile src/plugins/checkpoint/aix/Makefile src/plugins/checkpoint/none/Makefile src/plugins/checkpoint/ompi/Makefile src/plugins/checkpoint/blcr/Makefile src/plugins/checkpoint/blcr/cr_checkpoint.sh src/plugins/checkpoint/blcr/cr_restart.sh src/plugins/crypto/Makefile src/plugins/crypto/munge/Makefile src/plugins/crypto/openssl/Makefile src/plugins/gres/Makefile src/plugins/gres/gpu/Makefile src/plugins/gres/nic/Makefile src/plugins/jobacct_gather/Makefile src/plugins/jobacct_gather/linux/Makefile src/plugins/jobacct_gather/aix/Makefile src/plugins/jobacct_gather/none/Makefile src/plugins/jobcomp/Makefile src/plugins/jobcomp/filetxt/Makefile src/plugins/jobcomp/none/Makefile src/plugins/jobcomp/script/Makefile src/plugins/jobcomp/mysql/Makefile src/plugins/jobcomp/pgsql/Makefile src/plugins/job_submit/Makefile src/plugins/job_submit/defaults/Makefile src/plugins/job_submit/logging/Makefile src/plugins/job_submit/lua/Makefile src/plugins/job_submit/partition/Makefile src/plugins/preempt/Makefile src/plugins/preempt/none/Makefile src/plugins/preempt/partition_prio/Makefile src/plugins/preempt/qos/Makefile src/plugins/priority/Makefile src/plugins/priority/basic/Makefile src/plugins/priority/multifactor/Makefile src/plugins/proctrack/Makefile src/plugins/proctrack/aix/Makefile src/plugins/proctrack/pgid/Makefile src/plugins/proctrack/linuxproc/Makefile src/plugins/proctrack/rms/Makefile src/plugins/proctrack/sgi_job/Makefile src/plugins/proctrack/cgroup/Makefile src/plugins/proctrack/lua/Makefile src/plugins/sched/Makefile src/plugins/sched/backfill/Makefile src/plugins/sched/builtin/Makefile src/plugins/sched/hold/Makefile src/plugins/sched/wiki/Makefile src/plugins/sched/wiki2/Makefile src/plugins/select/Makefile src/plugins/select/bluegene/Makefile src/plugins/select/bluegene/ba/Makefile src/plugins/select/bluegene/ba_bgq/Makefile src/plugins/select/bluegene/bl/Makefile src/plugins/select/bluegene/bl_bgq/Makefile src/plugins/select/bluegene/sfree/Makefile src/plugins/select/cons_res/Makefile src/plugins/select/cray/Makefile src/plugins/select/cray/libalps/Makefile src/plugins/select/cray/libemulate/Makefile src/plugins/select/linear/Makefile src/plugins/switch/Makefile src/plugins/switch/elan/Makefile src/plugins/switch/none/Makefile src/plugins/switch/federation/Makefile src/plugins/mpi/Makefile src/plugins/mpi/mpich1_p4/Makefile src/plugins/mpi/mpich1_shmem/Makefile src/plugins/mpi/mpichgm/Makefile src/plugins/mpi/mpichmx/Makefile src/plugins/mpi/mvapich/Makefile src/plugins/mpi/lam/Makefile src/plugins/mpi/none/Makefile src/plugins/mpi/openmpi/Makefile src/plugins/task/Makefile src/plugins/task/affinity/Makefile src/plugins/task/none/Makefile src/plugins/topology/Makefile src/plugins/topology/3d_torus/Makefile src/plugins/topology/node_rank/Makefile src/plugins/topology/none/Makefile src/plugins/topology/tree/Makefile doc/Makefile doc/man/Makefile doc/html/Makefile doc/html/configurator.html testsuite/Makefile testsuite/expect/Makefile testsuite/slurm_unit/Makefile testsuite/slurm_unit/api/Makefile testsuite/slurm_unit/api/manual/Makefile testsuite/slurm_unit/common/Makefile"
cat >confcache <<\_ACEOF
@@ -22444,9 +22444,9 @@ do
"src/plugins/select/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/select/Makefile" ;;
"src/plugins/select/bluegene/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/select/bluegene/Makefile" ;;
"src/plugins/select/bluegene/ba/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/select/bluegene/ba/Makefile" ;;
+ "src/plugins/select/bluegene/ba_bgq/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/select/bluegene/ba_bgq/Makefile" ;;
"src/plugins/select/bluegene/bl/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/select/bluegene/bl/Makefile" ;;
- "src/plugins/select/bluegene/bgq_ba/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/select/bluegene/bgq_ba/Makefile" ;;
- "src/plugins/select/bluegene/bgq_bl/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/select/bluegene/bgq_bl/Makefile" ;;
+ "src/plugins/select/bluegene/bl_bgq/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/select/bluegene/bl_bgq/Makefile" ;;
"src/plugins/select/bluegene/sfree/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/select/bluegene/sfree/Makefile" ;;
"src/plugins/select/cons_res/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/select/cons_res/Makefile" ;;
"src/plugins/select/cray/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/select/cray/Makefile" ;;
diff --git a/configure.ac b/configure.ac
index cbc43d9b0181dbe462790280a0f3b32857d7fe71..516dc112af7f9e72d41e79fee7833e4bb338dbca 100644
--- a/configure.ac
+++ b/configure.ac
@@ -469,9 +469,9 @@ AC_CONFIG_FILES([Makefile
src/plugins/select/Makefile
src/plugins/select/bluegene/Makefile
src/plugins/select/bluegene/ba/Makefile
+ src/plugins/select/bluegene/ba_bgq/Makefile
src/plugins/select/bluegene/bl/Makefile
- src/plugins/select/bluegene/bgq_ba/Makefile
- src/plugins/select/bluegene/bgq_bl/Makefile
+ src/plugins/select/bluegene/bl_bgq/Makefile
src/plugins/select/bluegene/sfree/Makefile
src/plugins/select/cons_res/Makefile
src/plugins/select/cray/Makefile
diff --git a/src/plugins/select/bluegene/Makefile.am b/src/plugins/select/bluegene/Makefile.am
index 59b8d92f087b3232d9d9315a99305cfac241ec50..507a044d91028cd1fe9a30eb75e91a13e84914ef 100644
--- a/src/plugins/select/bluegene/Makefile.am
+++ b/src/plugins/select/bluegene/Makefile.am
@@ -44,9 +44,9 @@ block_allocator_lib = ba/libblock_allocator.la
endif
if BGQ_LOADED
-SUBDIRS += bgq_bl bgq_ba
+SUBDIRS += bl_bgq ba_bgq
-block_allocator_lib = bgq_ba/libblock_allocator.la
+block_allocator_lib = ba_bgq/libblock_allocator.la
# force link with g++
nodist_EXTRA_select_bluegene_la_SOURCES = dummy.cxx
diff --git a/src/plugins/select/bluegene/Makefile.in b/src/plugins/select/bluegene/Makefile.in
index 6865e1ebeeed008dffd3cdd313255c20ab0bb5a9..9c153d0790da3f8298c66f64688177a0803968ca 100644
--- a/src/plugins/select/bluegene/Makefile.in
+++ b/src/plugins/select/bluegene/Makefile.in
@@ -41,7 +41,7 @@ target_triplet = @target@
@BG_L_P_LOADED_TRUE@@BLUEGENE_LOADED_TRUE@am__append_1 = bl ba
@BGL_LOADED_TRUE@@BG_L_P_LOADED_TRUE@@BLUEGENE_LOADED_TRUE@am__append_2 = libsched_if64.la
@BGL_LOADED_FALSE@@BG_L_P_LOADED_TRUE@@BLUEGENE_LOADED_TRUE@am__append_3 = libsched_if.la
-@BGQ_LOADED_TRUE@@BLUEGENE_LOADED_TRUE@am__append_4 = bgq_bl bgq_ba
+@BGQ_LOADED_TRUE@@BLUEGENE_LOADED_TRUE@am__append_4 = bl_bgq ba_bgq
@BLUEGENE_LOADED_TRUE@am__append_5 = bg_core.c bg_defined_block.c \
@BLUEGENE_LOADED_TRUE@ bg_dynamic_block.c bg_job_place.c \
@BLUEGENE_LOADED_TRUE@ bg_job_run.c bg_list_functions.c \
@@ -223,7 +223,7 @@ AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
distdir
ETAGS = etags
CTAGS = ctags
-DIST_SUBDIRS = sfree bl ba bgq_bl bgq_ba
+DIST_SUBDIRS = sfree bl ba bl_bgq ba_bgq
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
am__relativize = \
dir0=`pwd`; \
@@ -462,7 +462,7 @@ select_bluegene_la_LDFLAGS = $(SO_LDFLAGS) $(PLUGIN_FLAGS)
@BGL_LOADED_TRUE@@BG_L_P_LOADED_TRUE@@BLUEGENE_LOADED_TRUE@libsched_if64_la_LDFLAGS = $(SO_LDFLAGS) $(PLUGIN_FLAGS)
@BGL_LOADED_FALSE@@BG_L_P_LOADED_TRUE@@BLUEGENE_LOADED_TRUE@libsched_if_la_SOURCES = libsched_if64.c
@BGL_LOADED_FALSE@@BG_L_P_LOADED_TRUE@@BLUEGENE_LOADED_TRUE@libsched_if_la_LDFLAGS = $(SO_LDFLAGS) $(PLUGIN_FLAGS)
-@BGQ_LOADED_TRUE@@BLUEGENE_LOADED_TRUE@block_allocator_lib = bgq_ba/libblock_allocator.la
+@BGQ_LOADED_TRUE@@BLUEGENE_LOADED_TRUE@block_allocator_lib = ba_bgq/libblock_allocator.la
@BG_L_P_LOADED_TRUE@@BLUEGENE_LOADED_TRUE@block_allocator_lib = ba/libblock_allocator.la
# force link with g++
diff --git a/src/plugins/select/bluegene/bgq_ba/Makefile.am b/src/plugins/select/bluegene/ba_bgq/Makefile.am
similarity index 92%
rename from src/plugins/select/bluegene/bgq_ba/Makefile.am
rename to src/plugins/select/bluegene/ba_bgq/Makefile.am
index cd45526e3feac38a0aa312e0b6d2369a3cdf5ac4..b7d97a36419d14e676a179dcea51e927e28043b0 100644
--- a/src/plugins/select/bluegene/bgq_ba/Makefile.am
+++ b/src/plugins/select/bluegene/ba_bgq/Makefile.am
@@ -10,7 +10,7 @@ INCLUDES = -I$(top_srcdir) $(BG_INCLUDES)
noinst_LTLIBRARIES = libblock_allocator.la
libblock_allocator_la_SOURCES = block_allocator.c block_allocator.h
-libblock_allocator_la_LIBADD = ../bgq_bl/libbridge_linker.la
+libblock_allocator_la_LIBADD = ../bl_bgq/libbridge_linker.la
libblock_allocator_la_LDFLAGS = $(LIB_LDFLAGS) -lm
diff --git a/src/plugins/select/bluegene/bgq_ba/Makefile.in b/src/plugins/select/bluegene/ba_bgq/Makefile.in
similarity index 98%
rename from src/plugins/select/bluegene/bgq_ba/Makefile.in
rename to src/plugins/select/bluegene/ba_bgq/Makefile.in
index cd9a41f20f2e984288cb045bcf2fd4819d98d038..f7dad4d637de02425d0df0c682a33154a22942f5 100644
--- a/src/plugins/select/bluegene/bgq_ba/Makefile.in
+++ b/src/plugins/select/bluegene/ba_bgq/Makefile.in
@@ -39,7 +39,7 @@ build_triplet = @build@
host_triplet = @host@
target_triplet = @target@
noinst_PROGRAMS = wire_test$(EXEEXT)
-subdir = src/plugins/select/bluegene/bgq_ba
+subdir = src/plugins/select/bluegene/ba_bgq
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
@@ -84,7 +84,7 @@ CONFIG_HEADER = $(top_builddir)/config.h $(top_builddir)/slurm/slurm.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
LTLIBRARIES = $(noinst_LTLIBRARIES)
-libblock_allocator_la_DEPENDENCIES = ../bgq_bl/libbridge_linker.la
+libblock_allocator_la_DEPENDENCIES = ../bl_bgq/libbridge_linker.la
am_libblock_allocator_la_OBJECTS = block_allocator.lo
libblock_allocator_la_OBJECTS = $(am_libblock_allocator_la_OBJECTS)
libblock_allocator_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
@@ -327,7 +327,7 @@ INCLUDES = -I$(top_srcdir) $(BG_INCLUDES)
# making a .la
noinst_LTLIBRARIES = libblock_allocator.la
libblock_allocator_la_SOURCES = block_allocator.c block_allocator.h
-libblock_allocator_la_LIBADD = ../bgq_bl/libbridge_linker.la
+libblock_allocator_la_LIBADD = ../bl_bgq/libbridge_linker.la
libblock_allocator_la_LDFLAGS = $(LIB_LDFLAGS) -lm
total = $(libblock_allocator_la_LDADD) ../libba_common.la \
$(top_builddir)/src/api/libslurm.o
@@ -352,9 +352,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/plugins/select/bluegene/bgq_ba/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/plugins/select/bluegene/ba_bgq/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --foreign src/plugins/select/bluegene/bgq_ba/Makefile
+ $(AUTOMAKE) --foreign src/plugins/select/bluegene/ba_bgq/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
diff --git a/src/plugins/select/bluegene/bgq_ba/block_allocator.c b/src/plugins/select/bluegene/ba_bgq/block_allocator.c
similarity index 100%
rename from src/plugins/select/bluegene/bgq_ba/block_allocator.c
rename to src/plugins/select/bluegene/ba_bgq/block_allocator.c
diff --git a/src/plugins/select/bluegene/bgq_ba/block_allocator.h b/src/plugins/select/bluegene/ba_bgq/block_allocator.h
similarity index 100%
rename from src/plugins/select/bluegene/bgq_ba/block_allocator.h
rename to src/plugins/select/bluegene/ba_bgq/block_allocator.h
diff --git a/src/plugins/select/bluegene/bgq_ba/wire_test.c b/src/plugins/select/bluegene/ba_bgq/wire_test.c
similarity index 100%
rename from src/plugins/select/bluegene/bgq_ba/wire_test.c
rename to src/plugins/select/bluegene/ba_bgq/wire_test.c
diff --git a/src/plugins/select/bluegene/bgq_bl/Makefile.am b/src/plugins/select/bluegene/bl_bgq/Makefile.am
similarity index 100%
rename from src/plugins/select/bluegene/bgq_bl/Makefile.am
rename to src/plugins/select/bluegene/bl_bgq/Makefile.am
diff --git a/src/plugins/select/bluegene/bgq_bl/Makefile.in b/src/plugins/select/bluegene/bl_bgq/Makefile.in
similarity index 99%
rename from src/plugins/select/bluegene/bgq_bl/Makefile.in
rename to src/plugins/select/bluegene/bl_bgq/Makefile.in
index dbbe71a28cb13242b2bc7854de3a071936ca9b6c..aefeac885f34585f331181efd62cb716b95a1bdd 100644
--- a/src/plugins/select/bluegene/bgq_bl/Makefile.in
+++ b/src/plugins/select/bluegene/bl_bgq/Makefile.in
@@ -37,7 +37,7 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
target_triplet = @target@
-subdir = src/plugins/select/bluegene/bgq_bl
+subdir = src/plugins/select/bluegene/bl_bgq
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
@@ -332,9 +332,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/plugins/select/bluegene/bgq_bl/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/plugins/select/bluegene/bl_bgq/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --foreign src/plugins/select/bluegene/bgq_bl/Makefile
+ $(AUTOMAKE) --foreign src/plugins/select/bluegene/bl_bgq/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
diff --git a/src/plugins/select/bluegene/bgq_bl/bridge_linker.cc b/src/plugins/select/bluegene/bl_bgq/bridge_linker.cc
similarity index 99%
rename from src/plugins/select/bluegene/bgq_bl/bridge_linker.cc
rename to src/plugins/select/bluegene/bl_bgq/bridge_linker.cc
index 58774de4262165d9b97b15ddd05c744c12f40238..fcf96fc51c90475d8379b93cc053e0c7992374dc 100644
--- a/src/plugins/select/bluegene/bgq_bl/bridge_linker.cc
+++ b/src/plugins/select/bluegene/bl_bgq/bridge_linker.cc
@@ -37,7 +37,7 @@
\*****************************************************************************/
extern "C" {
-#include "../bgq_ba/block_allocator.h"
+#include "../ba_bgq/block_allocator.h"
#include "../bg_record_functions.h"
#include "src/common/parse_time.h"
}
diff --git a/src/plugins/select/bluegene/bgq_bl/bridge_status.cc b/src/plugins/select/bluegene/bl_bgq/bridge_status.cc
similarity index 99%
rename from src/plugins/select/bluegene/bgq_bl/bridge_status.cc
rename to src/plugins/select/bluegene/bl_bgq/bridge_status.cc
index 3361417609ee33f507e70f93891909c4d9ceb6c4..8d8a99f02807cdea2f6c2489976733877f6404fe 100644
--- a/src/plugins/select/bluegene/bgq_bl/bridge_status.cc
+++ b/src/plugins/select/bluegene/bl_bgq/bridge_status.cc
@@ -37,7 +37,7 @@
\*****************************************************************************/
extern "C" {
-#include "../bgq_ba/block_allocator.h"
+#include "../ba_bgq/block_allocator.h"
#include "../bg_core.h"
#include "../bg_status.h"
#include "src/slurmctld/proc_req.h"
diff --git a/src/plugins/select/bluegene/bgq_bl/bridge_status.h b/src/plugins/select/bluegene/bl_bgq/bridge_status.h
similarity index 100%
rename from src/plugins/select/bluegene/bgq_bl/bridge_status.h
rename to src/plugins/select/bluegene/bl_bgq/bridge_status.h
diff --git a/src/plugins/select/bluegene/select_bluegene.c b/src/plugins/select/bluegene/select_bluegene.c
index b5fa4f75c9720a5bb6c41f6c5971b81d09512c2f..4a1138680ee32fe46bea9636a710294025fc4a3e 100644
--- a/src/plugins/select/bluegene/select_bluegene.c
+++ b/src/plugins/select/bluegene/select_bluegene.c
@@ -43,7 +43,7 @@
#include "bg_defined_block.h"
#ifdef HAVE_BGQ
-# include "bgq_ba/block_allocator.h"
+# include "ba_bgq/block_allocator.h"
#else
# include "ba/block_allocator.h"
#endif