diff --git a/architectures/linux-rhel_6-ppc64/tp_network.hpp b/architectures/linux-rhel_6-ppc64/tp_network.hpp
index 4403fc08a1fb1e21baad000103b529733ec7d844..5479987443b96bc1a9fcfe85fe322153a5a2795a 100644
--- a/architectures/linux-rhel_6-ppc64/tp_network.hpp
+++ b/architectures/linux-rhel_6-ppc64/tp_network.hpp
@@ -4,7 +4,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <algorithm>
-#include "../topology.hpp"
+#include "tp_network_interface.hpp"
 
 #include <spi/include/kernel/location.h>
 #include <spi/include/kernel/process.h>
diff --git a/architectures/linux-sles_12-x86_64/tp_network.hpp b/architectures/linux-sles_12-x86_64/tp_network.hpp
index 6d33fe70ad6bf8498dab06cac03e460ccd9a0d3b..9272acbb4181fb7b62c48084de05bf7bf3366dff 100644
--- a/architectures/linux-sles_12-x86_64/tp_network.hpp
+++ b/architectures/linux-sles_12-x86_64/tp_network.hpp
@@ -3,7 +3,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include "../topology.hpp"
+#include "tp_network_interface.hpp"
 
 #include <pmi.h>
 
diff --git a/architectures/tp_memory_interface.hpp b/architectures/tp_memory_interface.hpp
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/architectures/topology.hpp b/architectures/tp_network_interface.hpp
similarity index 100%
rename from architectures/topology.hpp
rename to architectures/tp_network_interface.hpp
diff --git a/examples/HACC-IO/run_check_xc40.sh b/examples/HACC-IO/run_check_xc40.sh
index 0fbb321f7d26f53c7f4eec2266e9ab3ef631a00f..be83be38f1a52a42dee07b710c37f1e52bc5ee02 100755
--- a/examples/HACC-IO/run_check_xc40.sh
+++ b/examples/HACC-IO/run_check_xc40.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-NODES=512
+NODES=256
 PPN=16
 NPROCS=$((NODES*PPN))
 TARGET="/lus/theta-fs0/projects/Performance/ftessier/HACC"
@@ -13,7 +13,7 @@ cd $HOME/install/$ARCHI/bin/
 export TAPIOCA_DEVNULL=false
 export TAPIOCA_COMMSPLIT=true
 export TAPIOCA_STRATEGY=TOPOLOGY_AWARE
-export TAPIOCA_NBAGGR=96
+export TAPIOCA_NBAGGR=48
 export TAPIOCA_BUFFERSIZE=16777216
 
 function setLustreFS ()
@@ -35,7 +35,7 @@ function updateSettings()
     SETTINGS="$SETTINGS -e MPICH_RMA_OVER_DMAPP=1"
     
     SETTINGS="$SETTINGS -e MPICH_MPIIO_AGGREGATOR_PLACEMENT_DISPLAY=1"
-    SETTINGS="$SETTINGS -e MPICH_MPIIO_HINTS=*:cray_cb_nodes_multiplier=2"
+    SETTINGS="$SETTINGS -e MPICH_MPIIO_HINTS=*:cray_cb_nodes_multiplier=1"
 }
 
 function outputFile ()
diff --git a/make.inc/Makefile.linux-rhel_6-ppc64 b/make.inc/Makefile.linux-rhel_6-ppc64
index 70e5102dde0d29ff5fe88d6b5a152d8ececafe29..b548c55cad2b53ab07ab09189297f7dbc5cb3ede 100644
--- a/make.inc/Makefile.linux-rhel_6-ppc64
+++ b/make.inc/Makefile.linux-rhel_6-ppc64
@@ -3,6 +3,8 @@ MPICXX = mpixlcxx
 MPI_CFLAGS   = -g -O3 -I./architectures/$(ARCHI)
 MPI_CFLAGS  += -DDEBUG #-DTIMING
 
-TP_INCLUDE   = architectures/$(ARCHI)/* 
+TP_INCLUDE   = architectures/tp_network_interface.hpp \
+	       architectures/tp_memory_interface.hpp \
+	       architectures/$(ARCHI)/* 
 
 INSTALL_PATH = $(HOME)/install/$(ARCHI)
diff --git a/make.inc/Makefile.linux-sles_12-x86_64 b/make.inc/Makefile.linux-sles_12-x86_64
index 2f7729f02f65fcef6f31afb6a04570d2621c2124..6ffbfc6c0c9eb7890dfedaa2ac28a39912086403 100644
--- a/make.inc/Makefile.linux-sles_12-x86_64
+++ b/make.inc/Makefile.linux-sles_12-x86_64
@@ -1,10 +1,13 @@
 MPICXX = CC
 
-MPI_CFLAGS   = -g -I./architectures/$(ARCHI) -I./architectures/$(ARCHI)/include/
-MPI_CFLAGS  += -DXC40 -DDEBUG #-DTIMING
+MPI_CFLAGS   = -g -I./architectures -I./architectures/$(ARCHI) -I./architectures/$(ARCHI)/include/
+MPI_CFLAGS  += -DDEBUG #-DTIMING
 
 MPI_LDFLAGS = -llustreapi -Wl,--whole-archive,-ldmapp,--no-whole-archive
 
-TP_INCLUDE   = architectures/$(ARCHI)/* architectures/$(ARCHI)/include/*
+TP_INCLUDE   = architectures/tp_network_interface.hpp \
+               architectures/tp_memory_interface.hpp \
+	       architectures/$(ARCHI)/* \
+	       architectures/$(ARCHI)/include/*
 
 INSTALL_PATH  = $(HOME)/install/$(ARCHI)