diff --git a/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/TlmPackets/check b/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/TlmPackets/check
deleted file mode 100755
index 5325dce64..000000000
--- a/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/TlmPackets/check
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh -e
-
-fpp_to_cpp=../../../../../../bin/fpp-to-cpp
-. `dirname $0`/../check_topology.sh
-
-check_topology tlm_packets
-
diff --git a/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/Commands/.gitignore b/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/commands/.gitignore
similarity index 100%
rename from compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/Commands/.gitignore
rename to compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/commands/.gitignore
diff --git a/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/Commands/C.hpp b/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/commands/C.hpp
similarity index 100%
rename from compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/Commands/C.hpp
rename to compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/commands/C.hpp
diff --git a/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/Commands/CommandsTopologyDefs.hpp b/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/commands/CommandsTopologyDefs.hpp
similarity index 100%
rename from compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/Commands/CommandsTopologyDefs.hpp
rename to compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/commands/CommandsTopologyDefs.hpp
diff --git a/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/Commands/NoCommands.hpp b/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/commands/NoCommands.hpp
similarity index 100%
rename from compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/Commands/NoCommands.hpp
rename to compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/commands/NoCommands.hpp
diff --git a/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/Health/check b/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/commands/check
similarity index 69%
rename from compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/Health/check
rename to compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/commands/check
index f75a3bca3..8f8ae8e35 100755
--- a/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/Health/check
+++ b/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/commands/check
@@ -2,4 +2,4 @@
 
 . `dirname $0`/../check_topology.sh
 
-check_topology health
+check_topology
diff --git a/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/Commands/clean b/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/commands/clean
similarity index 100%
rename from compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/Commands/clean
rename to compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/commands/clean
diff --git a/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/Health/.gitignore b/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/health/.gitignore
similarity index 100%
rename from compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/Health/.gitignore
rename to compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/health/.gitignore
diff --git a/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/Health/C.hpp b/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/health/C.hpp
similarity index 100%
rename from compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/Health/C.hpp
rename to compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/health/C.hpp
diff --git a/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/Health/Health.hpp b/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/health/Health.hpp
similarity index 100%
rename from compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/Health/Health.hpp
rename to compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/health/Health.hpp
diff --git a/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/Health/HealthTopologyDefs.hpp b/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/health/HealthTopologyDefs.hpp
similarity index 100%
rename from compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/Health/HealthTopologyDefs.hpp
rename to compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/health/HealthTopologyDefs.hpp
diff --git a/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/Commands/check b/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/health/check
similarity index 68%
rename from compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/Commands/check
rename to compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/health/check
index 3eeb1288f..8f8ae8e35 100755
--- a/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/Commands/check
+++ b/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/health/check
@@ -2,4 +2,4 @@
 
 . `dirname $0`/../check_topology.sh
 
-check_topology commands
+check_topology
diff --git a/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/Health/clean b/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/health/clean
similarity index 100%
rename from compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/Health/clean
rename to compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/health/clean
diff --git a/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/Params/.gitignore b/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/params/.gitignore
similarity index 100%
rename from compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/Params/.gitignore
rename to compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/params/.gitignore
diff --git a/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/Params/C.hpp b/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/params/C.hpp
similarity index 100%
rename from compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/Params/C.hpp
rename to compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/params/C.hpp
diff --git a/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/Params/ParamsTopologyDefs.hpp b/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/params/ParamsTopologyDefs.hpp
similarity index 100%
rename from compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/Params/ParamsTopologyDefs.hpp
rename to compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/params/ParamsTopologyDefs.hpp
diff --git a/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/Params/check b/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/params/check
similarity index 63%
rename from compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/Params/check
rename to compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/params/check
index 1050ef245..8f8ae8e35 100755
--- a/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/Params/check
+++ b/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/params/check
@@ -2,4 +2,4 @@
 
 . `dirname $0`/../check_topology.sh
 
-check_topology params Params
+check_topology
diff --git a/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/Params/clean b/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/params/clean
similarity index 100%
rename from compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/Params/clean
rename to compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/params/clean
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 e36106708..b45f8bd83 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
@@ -1,8 +1,8 @@
 basic
-Commands
-Health
-Params
-TlmPackets
+commands
+health
+params
+tlm_packets
 TypedPortsActive
 TypedPortsPassive
 TypedPortsQueued
diff --git a/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/TlmPackets/.gitignore b/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/tlm_packets/.gitignore
similarity index 100%
rename from compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/TlmPackets/.gitignore
rename to compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/tlm_packets/.gitignore
diff --git a/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/TlmPackets/C.hpp b/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/tlm_packets/C.hpp
similarity index 100%
rename from compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/TlmPackets/C.hpp
rename to compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/tlm_packets/C.hpp
diff --git a/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/TlmPackets/NoInstancesTopologyDefs.hpp b/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/tlm_packets/NoInstancesTopologyDefs.hpp
similarity index 100%
rename from compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/TlmPackets/NoInstancesTopologyDefs.hpp
rename to compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/tlm_packets/NoInstancesTopologyDefs.hpp
diff --git a/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/TlmPackets/OneInstanceTopologyDefs.hpp b/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/tlm_packets/OneInstanceTopologyDefs.hpp
similarity index 100%
rename from compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/TlmPackets/OneInstanceTopologyDefs.hpp
rename to compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/tlm_packets/OneInstanceTopologyDefs.hpp
diff --git a/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/TlmPackets/TwoInstancesTopologyDefs.hpp b/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/tlm_packets/TwoInstancesTopologyDefs.hpp
similarity index 100%
rename from compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/TlmPackets/TwoInstancesTopologyDefs.hpp
rename to compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/tlm_packets/TwoInstancesTopologyDefs.hpp
diff --git a/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/tlm_packets/check b/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/tlm_packets/check
new file mode 100755
index 000000000..3573f8a65
--- /dev/null
+++ b/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/tlm_packets/check
@@ -0,0 +1,6 @@
+#!/bin/sh -e
+
+. `dirname $0`/../check_topology.sh
+
+check_topology
+
diff --git a/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/TlmPackets/clean b/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/tlm_packets/clean
similarity index 100%
rename from compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/TlmPackets/clean
rename to compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/tlm_packets/clean