diff --git a/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/TypedPortsActive/check b/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/TypedPortsActive/check
deleted file mode 100755
index bc12a7f09..000000000
--- a/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/TypedPortsActive/check
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/sh -e
-
-fpp_to_cpp=../../../../../../bin/fpp-to-cpp
-fprime_gcc=../../../../../../scripts/fprime-gcc
-
-echo '  removing old files'
-./clean
-
-base_dir=`cd ../..; echo $PWD`
-src_dir=$base_dir/typed_ports_active
-
-echo '  generating C++'
-$fpp_to_cpp -p $base_dir,$src_dir $src_dir/components.fpp \
-  $src_dir/topology.fpp
-
-for suffix in hpp cpp
-do
-  cp $src_dir/TypedPortsActiveTopologyAc.ref.$suffix TypedPortsActiveTopologyAc.$suffix
-done
-
-flags="-I.. -I../../../fprime -I../../../fprime/config -Wno-unused-parameter -c"
-echo '  compiling C++'
-for variable_flags in '' '-DFW_DIRECT_PORT_CALLS'
-do
-  echo "    variable_flags=$variable_flags"
-  $fprime_gcc $variable_flags $flags TypedPortsActiveTopologyAc.cpp
-done
diff --git a/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/TypedPortsQueued/check b/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/TypedPortsQueued/check
deleted file mode 100755
index 1d59bd6d4..000000000
--- a/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/TypedPortsQueued/check
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/sh -e
-
-fpp_to_cpp=../../../../../../bin/fpp-to-cpp
-fprime_gcc=../../../../../../scripts/fprime-gcc
-
-echo '  removing old files'
-./clean
-
-base_dir=`cd ../..; echo $PWD`
-src_dir=$base_dir/typed_ports_queued
-
-echo '  generating C++'
-$fpp_to_cpp -p $base_dir,$src_dir $src_dir/components.fpp \
-  $src_dir/topology.fpp
-
-for suffix in hpp cpp
-do
-  cp $src_dir/TypedPortsQueuedTopologyAc.ref.$suffix TypedPortsQueuedTopologyAc.$suffix
-done
-
-flags="-I.. -I../../../fprime -I../../../fprime/config -Wno-unused-parameter -c"
-echo '  compiling C++'
-for variable_flags in '' '-DFW_DIRECT_PORT_CALLS'
-do
-  echo "    variable_flags=$variable_flags"
-  $fprime_gcc $variable_flags $flags TypedPortsQueuedTopologyAc.cpp
-done
diff --git a/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/subdirs.txt b/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/subdirs.txt
index b45f8bd83..9f6d8a232 100644
--- a/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/subdirs.txt
+++ b/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/subdirs.txt
@@ -3,6 +3,6 @@ commands
 health
 params
 tlm_packets
-TypedPortsActive
-TypedPortsPassive
-TypedPortsQueued
+typed_ports_active
+typed_ports_passive
+typed_ports_queued
diff --git a/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/TypedPortsActive/.gitignore b/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/typed_ports_active/.gitignore
similarity index 100%
rename from compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/TypedPortsActive/.gitignore
rename to compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/typed_ports_active/.gitignore
diff --git a/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/TypedPortsActive/Receiver.hpp b/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/typed_ports_active/Receiver.hpp
similarity index 100%
rename from compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/TypedPortsActive/Receiver.hpp
rename to compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/typed_ports_active/Receiver.hpp
diff --git a/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/TypedPortsActive/Sender.hpp b/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/typed_ports_active/Sender.hpp
similarity index 100%
rename from compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/TypedPortsActive/Sender.hpp
rename to compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/typed_ports_active/Sender.hpp
diff --git a/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/TypedPortsActive/TypedPortsActiveTopologyDefs.hpp b/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/typed_ports_active/TypedPortsActiveTopologyDefs.hpp
similarity index 100%
rename from compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/TypedPortsActive/TypedPortsActiveTopologyDefs.hpp
rename to compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/typed_ports_active/TypedPortsActiveTopologyDefs.hpp
diff --git a/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/TypedPortsPassive/check b/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/typed_ports_active/check
similarity index 59%
rename from compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/TypedPortsPassive/check
rename to compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/typed_ports_active/check
index 473cd7227..8f8ae8e35 100755
--- a/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/TypedPortsPassive/check
+++ b/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/typed_ports_active/check
@@ -2,4 +2,4 @@
 
 . `dirname $0`/../check_topology.sh
 
-check_topology typed_ports_passive
+check_topology
diff --git a/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/TypedPortsActive/clean b/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/typed_ports_active/clean
similarity index 100%
rename from compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/TypedPortsActive/clean
rename to compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/typed_ports_active/clean
diff --git a/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/TypedPortsPassive/.gitignore b/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/typed_ports_passive/.gitignore
similarity index 100%
rename from compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/TypedPortsPassive/.gitignore
rename to compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/typed_ports_passive/.gitignore
diff --git a/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/TypedPortsPassive/Receiver.hpp b/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/typed_ports_passive/Receiver.hpp
similarity index 100%
rename from compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/TypedPortsPassive/Receiver.hpp
rename to compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/typed_ports_passive/Receiver.hpp
diff --git a/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/TypedPortsPassive/Sender.hpp b/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/typed_ports_passive/Sender.hpp
similarity index 100%
rename from compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/TypedPortsPassive/Sender.hpp
rename to compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/typed_ports_passive/Sender.hpp
diff --git a/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/TypedPortsPassive/TypedPortsPassiveTopologyDefs.hpp b/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/typed_ports_passive/TypedPortsPassiveTopologyDefs.hpp
similarity index 100%
rename from compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/TypedPortsPassive/TypedPortsPassiveTopologyDefs.hpp
rename to compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/typed_ports_passive/TypedPortsPassiveTopologyDefs.hpp
diff --git a/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/typed_ports_passive/check b/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/typed_ports_passive/check
new file mode 100755
index 000000000..8f8ae8e35
--- /dev/null
+++ b/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/typed_ports_passive/check
@@ -0,0 +1,5 @@
+#!/bin/sh -e
+
+. `dirname $0`/../check_topology.sh
+
+check_topology
diff --git a/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/TypedPortsPassive/clean b/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/typed_ports_passive/clean
similarity index 100%
rename from compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/TypedPortsPassive/clean
rename to compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/typed_ports_passive/clean
diff --git a/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/TypedPortsQueued/.gitignore b/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/typed_ports_queued/.gitignore
similarity index 100%
rename from compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/TypedPortsQueued/.gitignore
rename to compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/typed_ports_queued/.gitignore
diff --git a/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/TypedPortsQueued/Receiver.hpp b/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/typed_ports_queued/Receiver.hpp
similarity index 100%
rename from compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/TypedPortsQueued/Receiver.hpp
rename to compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/typed_ports_queued/Receiver.hpp
diff --git a/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/TypedPortsQueued/Sender.hpp b/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/typed_ports_queued/Sender.hpp
similarity index 100%
rename from compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/TypedPortsQueued/Sender.hpp
rename to compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/typed_ports_queued/Sender.hpp
diff --git a/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/TypedPortsQueued/TypedPortsQueuedTopologyDefs.hpp b/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/typed_ports_queued/TypedPortsQueuedTopologyDefs.hpp
similarity index 100%
rename from compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/TypedPortsQueued/TypedPortsQueuedTopologyDefs.hpp
rename to compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/typed_ports_queued/TypedPortsQueuedTopologyDefs.hpp
diff --git a/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/typed_ports_queued/check b/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/typed_ports_queued/check
new file mode 100755
index 000000000..8f8ae8e35
--- /dev/null
+++ b/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/typed_ports_queued/check
@@ -0,0 +1,5 @@
+#!/bin/sh -e
+
+. `dirname $0`/../check_topology.sh
+
+check_topology
diff --git a/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/TypedPortsQueued/clean b/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/typed_ports_queued/clean
similarity index 100%
rename from compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/TypedPortsQueued/clean
rename to compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/typed_ports_queued/clean