diff --git a/mechanisms/generate.sh b/mechanisms/generate.sh
index 8771b55c06877d0df3b021f015dbd5ec9f00fec6..89dfd5e277f9811bd91cdc363a61f41a1e81b706 100755
--- a/mechanisms/generate.sh
+++ b/mechanisms/generate.sh
@@ -1,4 +1,4 @@
-#!/etc/bash
+#!/usr/bin/env bash
 
 #flags="-t cpu -O"
 flags="-t cpu"
diff --git a/nrn/generate_validation.sh b/nrn/generate_validation.sh
index 5f6cbf9513224824bf2577304b33be960b67a544..15149cddc022aa47d2f94149fc4efc6c833e9ecd 100755
--- a/nrn/generate_validation.sh
+++ b/nrn/generate_validation.sh
@@ -1,5 +1,7 @@
-python ./soma.py
-python ./ball_and_stick.py
-python ./ball_and_3stick.py
-python ./simple_synapse.py --synapse exp2
-python ./simple_synapse.py --synapse exp
+#!/usr/bin/env bash
+
+python2 ./soma.py
+python2 ./ball_and_stick.py
+python2 ./ball_and_3stick.py
+python2 ./simple_synapse.py --synapse exp2
+python2 ./simple_synapse.py --synapse exp
diff --git a/src/communication/communicator.hpp b/src/communication/communicator.hpp
index 04baca09cbcbd38e798b4aca4bf9111c06d6c120..d5a82b3d7ad64e450585c383480302605131aebf 100644
--- a/src/communication/communicator.hpp
+++ b/src/communication/communicator.hpp
@@ -92,16 +92,16 @@ public:
     /// events in each queue are all events that must be delivered to targets in that cell
     /// group as a result of the global spike exchange.
     std::vector<event_queue> exchange(const std::vector<spike_type>& local_spikes,
-        std::function<void (const std::vector<spike_type>&)> do_export_local,
-        std::function<void(const std::vector<spike_type>&)> do_export_global)
+        std::function<void (const std::vector<spike_type>&)> local_export_callback,
+        std::function<void(const std::vector<spike_type>&)> global_export_callback)
     {       
-        do_export_local(local_spikes); 
+        local_export_callback(local_spikes);
 
         // global all-to-all to gather a local copy of the global spike list on each node.
         auto global_spikes = communication_policy_.gather_spikes( local_spikes );
         num_spikes_ += global_spikes.size();
 
-        do_export_global(global_spikes);
+        global_export_callback(global_spikes);
 
         // check each global spike in turn to see it generates local events.
         // if so, make the events and insert them into the appropriate event list.
diff --git a/src/communication/export_manager.hpp b/src/communication/export_manager.hpp
index 90d4bacec0e1209e225e78d38327db121abdf038..99354ab6bff8004b3cc6c2a85a3e5fa57571d8a1 100644
--- a/src/communication/export_manager.hpp
+++ b/src/communication/export_manager.hpp
@@ -83,7 +83,7 @@ public:
     // Perform a export of local spikes, typically used for exporting to multi-
     // ple files from each rank individually.
     // spikes are buffer before export
-    void do_export_local(const std::vector<spike_type>& spikes)
+    void local_export_callback(const std::vector<spike_type>& spikes)
     {
         // TODO: No export needed, so exit
         if (!spike_file_output_) {
@@ -104,7 +104,7 @@ public:
     // Perform a export of global spikes, typically used for exporting spikes
     // from a single rank in a simulation
     // spikes are buffer before export
-    void do_export_global(const std::vector<spike_type>& spikes)
+    void global_export_callback(const std::vector<spike_type>& spikes)
     {
         if (!spike_file_output_) {
             return;
diff --git a/src/model.hpp b/src/model.hpp
index 9ad1387f92f8d3d1d3c15fdb0c1c7dfe11566691..35f332d1132dfe03b63e1d6595b433679a49a733 100644
--- a/src/model.hpp
+++ b/src/model.hpp
@@ -169,8 +169,8 @@ public:
                 auto local_spikes = previous_spikes().gather();
                 future_events() = communicator_.exchange(local_spikes,
                     // send the exporter function as pointers to export
-                    [&](const std::vector<spike_type>& spikes) { exporter_->do_export_local(spikes); },
-                    [&] (const std::vector<spike_type>& spikes){ exporter_->do_export_global(spikes); });
+                    [&](const std::vector<spike_type>& spikes) { exporter_->local_export_callback(spikes); },
+                    [&] (const std::vector<spike_type>& spikes){ exporter_->global_export_callback(spikes); });
                 PL(2);
             };
 
diff --git a/tests/performance/io/disk_io.cpp b/tests/performance/io/disk_io.cpp
index f023374f29c8f6f0b89b57cba6d49a5e1ed58a34..791cf07d94f85c209a0e9097fbab136c3f4d19e0 100644
--- a/tests/performance/io/disk_io.cpp
+++ b/tests/performance/io/disk_io.cpp
@@ -106,7 +106,7 @@ int main(int argc, char** argv)
     for (int idx = 0; idx < nr_repeats; ++idx) {
         int time_start = clock();
 
-        manager.do_export_local(spikes);
+        manager.local_export_callback(spikes);
 
         int time_stop = clock();
         int run_time = (time_stop - time_start);