diff --git a/SCCP_Test/regen_makefile.sh b/SCCP_Test/regen_makefile.sh
index f5d13b727..ee2cdb39a 100755
--- a/SCCP_Test/regen_makefile.sh
+++ b/SCCP_Test/regen_makefile.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-MAIN=SCCP_Testcases.ttcn
+NAME=SCCP_Testcases
 
 FILES="
 	*.ttcn
@@ -10,4 +10,4 @@ FILES="
 export CPPFLAGS_TTCN3="
 "
 
-../regen-makefile.sh $MAIN $FILES
+../regen-makefile.sh -e $NAME $FILES
diff --git a/bsc-nat/regen_makefile.sh b/bsc-nat/regen_makefile.sh
index 33b557c3e..470d10907 100755
--- a/bsc-nat/regen_makefile.sh
+++ b/bsc-nat/regen_makefile.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-MAIN=BSCNAT_Tests.ttcn
+NAME=BSCNAT_Tests
 
 FILES="
 	*.c
@@ -29,4 +29,4 @@ export CPPFLAGS_TTCN3="
 	-DUSE_MTP3_DISTRIBUTOR
 "
 
-../regen-makefile.sh $MAIN $FILES
+../regen-makefile.sh -e $NAME $FILES
diff --git a/bsc/regen_makefile.sh b/bsc/regen_makefile.sh
index 53f8e8262..9e69befa2 100755
--- a/bsc/regen_makefile.sh
+++ b/bsc/regen_makefile.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-MAIN=BSC_Tests.ttcn
+NAME=BSC_Tests
 
 FILES="
 	*.c
@@ -34,4 +34,4 @@ export CPPFLAGS_TTCN3="
 	-DUSE_MTP3_DISTRIBUTOR
 "
 
-../regen-makefile.sh $MAIN $FILES
+../regen-makefile.sh -e $NAME $FILES
diff --git a/bts/regen_makefile.sh b/bts/regen_makefile.sh
index 850e0bf47..147d64fe8 100755
--- a/bts/regen_makefile.sh
+++ b/bts/regen_makefile.sh
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+NAME=BTS_Tests
+
 FILES="
 	*.ttcn
 	*.ttcnpp
@@ -26,4 +28,4 @@ export CPPFLAGS_TTCN3="
 	-DIPA_EMULATION_RSL
 "
 
-../regen-makefile.sh BTS_Tests.ttcn $FILES
+../regen-makefile.sh -e $NAME $FILES
diff --git a/cbc/regen_makefile.sh b/cbc/regen_makefile.sh
index d2c3b1288..11a93c463 100755
--- a/cbc/regen_makefile.sh
+++ b/cbc/regen_makefile.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+NAME=CBC_Tests
+
 FILES="
 	*.asn
 	*.ttcn
@@ -23,6 +25,6 @@ FILES="
 export CPPFLAGS_TTCN3="
 "
 
-../regen-makefile.sh CBC_Tests.ttcn $FILES
+../regen-makefile.sh -e $NAME $FILES
 
 sed -i -e 's/^LINUX_LIBS = -lxml2/LINUX_LIBS = -lxml2 -lfftranscode/' Makefile
diff --git a/ccid/regen_makefile.sh b/ccid/regen_makefile.sh
index 092565412..bbb7f33b0 100755
--- a/ccid/regen_makefile.sh
+++ b/ccid/regen_makefile.sh
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+NAME=CCID_Tests
+
 FILES="
 	*.ttcn
 	Native_FunctionDefs.cc
@@ -9,7 +11,7 @@ FILES="
 export CPPFLAGS_TTCN3="
 "
 
-../regen-makefile.sh CCID_Tests.ttcn $FILES
+../regen-makefile.sh -e $NAME $FILES
 
 #sed -i -e 's/^LINUX_LIBS = -lxml2/LINUX_LIBS = -lxml2 -lusb/' Makefile
 sed -i -e '/^LINUX_LIBS/ s/$/ `pkg-config --libs libusb-1.0`/' Makefile
diff --git a/fr-net/regen_makefile.sh b/fr-net/regen_makefile.sh
index 6488015fc..89eccd336 100755
--- a/fr-net/regen_makefile.sh
+++ b/fr-net/regen_makefile.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+NAME=FRNET_Tests
+
 FILES="
 	*.ttcn
 	*.ttcnpp
@@ -18,4 +20,4 @@ export CPPFLAGS_TTCN3="
 	-DNS_EMULATION_FR
 "
 
-../regen-makefile.sh FRNET_Tests.ttcn $FILES
+../regen-makefile.sh -e $NAME $FILES
diff --git a/fr/regen_makefile.sh b/fr/regen_makefile.sh
index 9c473ef0f..1b37cb68f 100755
--- a/fr/regen_makefile.sh
+++ b/fr/regen_makefile.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+NAME=FR_Tests
+
 FILES="
 	*.ttcn
 	*.ttcnpp
@@ -19,4 +21,4 @@ export CPPFLAGS_TTCN3="
 	-DNS_EMULATION_FR
 "
 
-../regen-makefile.sh FR_Tests.ttcn $FILES
+../regen-makefile.sh -e $NAME $FILES
diff --git a/gbproxy/regen_makefile.sh b/gbproxy/regen_makefile.sh
index 5ec668961..78910a4c0 100755
--- a/gbproxy/regen_makefile.sh
+++ b/gbproxy/regen_makefile.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+NAME=GBProxy_Tests
+
 FILES="
 	*.ttcn
 	*.ttcnpp
@@ -30,6 +32,6 @@ export CPPFLAGS_TTCN3="
 	-DUSE_MTP3_DISTRIBUTOR
 "
 
-../regen-makefile.sh GBProxy_Tests.ttcn $FILES
+../regen-makefile.sh -e $NAME $FILES
 
 sed -i -i 's/^LINUX_LIBS = -lxml2/LINUX_LIBS = -lxml2 -lsctp/' Makefile
diff --git a/ggsn_tests/regen_makefile.sh b/ggsn_tests/regen_makefile.sh
index 5e6b08d74..7adbd0b5c 100755
--- a/ggsn_tests/regen_makefile.sh
+++ b/ggsn_tests/regen_makefile.sh
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+NAME=GGSN_Tests
+
 FILES="
 	*.ttcn
 	BSSGP_EncDec.cc
@@ -21,4 +23,4 @@ FILES="
 export CPPFLAGS_TTCN3="
 "
 
-../regen-makefile.sh GGSN_Tests.ttcn $FILES
+../regen-makefile.sh -e $NAME $FILES
diff --git a/hlr/regen_makefile.sh b/hlr/regen_makefile.sh
index 9ab40cef4..7cd6cf4dc 100755
--- a/hlr/regen_makefile.sh
+++ b/hlr/regen_makefile.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-MAIN="HLR_Tests.ttcn"
+NAME=HLR_Tests
 
 FILES="
 	*.asn
@@ -24,4 +24,4 @@ export CPPFLAGS_TTCN3="
 	-DIPA_EMULATION_CTRL
 "
 
-../regen-makefile.sh $MAIN $FILES
+../regen-makefile.sh -e $NAME $FILES
diff --git a/lapdm/regen_makefile.sh b/lapdm/regen_makefile.sh
index 2eb1366de..f354e873d 100755
--- a/lapdm/regen_makefile.sh
+++ b/lapdm/regen_makefile.sh
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+NAME=L1CTL_Test
+
 FILES="
 	*.ttcn
 	L1CTL_PortType_CtrlFunctDef.cc
@@ -11,4 +13,4 @@ FILES="
 export CPPFLAGS_TTCN3="
 "
 
-../regen-makefile.sh L1CTL_Test.ttcn $FILES
+../regen-makefile.sh -e $NAME $FILES
diff --git a/mgw/regen_makefile.sh b/mgw/regen_makefile.sh
index a47f7baf7..921956caf 100755
--- a/mgw/regen_makefile.sh
+++ b/mgw/regen_makefile.sh
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+NAME=MGCP_Test
+
 FILES="
 	*.c
 	*.ttcn
@@ -25,4 +27,4 @@ export CPPFLAGS_TTCN3="
 	-DIPA_EMULATION_CTRL
 "
 
-../regen-makefile.sh MGCP_Test.ttcn $FILES
+../regen-makefile.sh -e $NAME $FILES
diff --git a/mme/regen_makefile.sh b/mme/regen_makefile.sh
index 560687906..62956d8a9 100755
--- a/mme/regen_makefile.sh
+++ b/mme/regen_makefile.sh
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+NAME=MME_Tests
+
 FILES="
 	*.asn
 	*.c
@@ -24,6 +26,6 @@ FILES="
 export CPPFLAGS_TTCN3="
 "
 
-../regen-makefile.sh MME_Tests.ttcn $FILES
+../regen-makefile.sh -e $NAME $FILES
 
 sed -i -e 's/^LINUX_LIBS = -lxml2 -lsctp/LINUX_LIBS = -lxml2 -lsctp -lfftranscode -lgnutls/' Makefile
diff --git a/msc/regen_makefile.sh b/msc/regen_makefile.sh
index 4ca955889..081d2cba4 100755
--- a/msc/regen_makefile.sh
+++ b/msc/regen_makefile.sh
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+NAME=MSC_Tests
+
 FILES="
 	*.asn
 	*.c
@@ -42,6 +44,6 @@ export CPPFLAGS_TTCN3="
 	-DUSE_MTP3_DISTRIBUTOR
 "
 
-../regen-makefile.sh MSC_Tests.ttcn $FILES
+../regen-makefile.sh -e $NAME $FILES
 
 sed -i -e 's/^LINUX_LIBS = -lxml2 -lsctp/LINUX_LIBS = -lxml2 -lsctp -lfftranscode -lssl/' Makefile
diff --git a/ns/regen_makefile.sh b/ns/regen_makefile.sh
index 1958dee71..88360d89b 100755
--- a/ns/regen_makefile.sh
+++ b/ns/regen_makefile.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+NAME=NS_Tests
+
 FILES="
 	*.ttcn
 	*.ttcnpp
@@ -23,4 +25,4 @@ export CPPFLAGS_TTCN3="
 	-DNS_EMULATION_FR
 "
 
-../regen-makefile.sh NS_Tests.ttcn $FILES
+../regen-makefile.sh -e $NAME $FILES
diff --git a/pcap-client/regen_makefile.sh b/pcap-client/regen_makefile.sh
index 88c062d5a..81dd1eb72 100755
--- a/pcap-client/regen_makefile.sh
+++ b/pcap-client/regen_makefile.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+NAME=OPCAP_CLIENT_Tests
+
 FILES="
 	*.ttcn
 	IPL4asp_PT.cc
@@ -14,4 +16,4 @@ FILES="
 
 export CPPFLAGS_TTCN3=""
 
-../regen-makefile.sh OPCAP_CLIENT_Tests.ttcn $FILES
+../regen-makefile.sh -e $NAME $FILES
diff --git a/pcu/regen_makefile.sh b/pcu/regen_makefile.sh
index d4404d032..006c6baa3 100755
--- a/pcu/regen_makefile.sh
+++ b/pcu/regen_makefile.sh
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+NAME=PCU_Tests
+
 FILES="
 	*.ttcn
 	*.ttcnpp
@@ -22,4 +24,4 @@ export CPPFLAGS_TTCN3="
 	-DIPA_EMULATION_CTRL
 "
 
-../regen-makefile.sh PCU_Tests.ttcn $FILES
+../regen-makefile.sh -e $NAME $FILES
diff --git a/pgw/regen_makefile.sh b/pgw/regen_makefile.sh
index 21f03ba1a..ce59dfb7b 100755
--- a/pgw/regen_makefile.sh
+++ b/pgw/regen_makefile.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+NAME=PGW_Tests
+
 FILES="
 	*.ttcn
 	BSSGP_EncDec.cc
@@ -24,4 +26,4 @@ FILES="
 export CPPFLAGS_TTCN3="
 "
 
-../regen-makefile.sh PGW_Tests.ttcn $FILES
+../regen-makefile.sh -e $NAME $FILES
diff --git a/remsim/regen_makefile.sh b/remsim/regen_makefile.sh
index edfb0733a..fb04cce8e 100755
--- a/remsim/regen_makefile.sh
+++ b/remsim/regen_makefile.sh
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+NAME=REMSIM_Tests
+
 FILES="
 	*.asn
 	*.ttcn
@@ -25,7 +27,7 @@ export CPPFLAGS_TTCN3="
 	-DIPA_EMULATION_CTRL
 "
 
-../regen-makefile.sh REMSIM_Tests.ttcn $FILES
+../regen-makefile.sh -e $NAME $FILES
 
 # required for forkpty(3) used by PIPEasp
 sed -i -e '/^LINUX_LIBS/ s/$/ -lutil/' Makefile
diff --git a/sccp/regen_makefile.sh b/sccp/regen_makefile.sh
index 175c10b34..7cd809d17 100755
--- a/sccp/regen_makefile.sh
+++ b/sccp/regen_makefile.sh
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+NAME=SCCP_Tests
+
 FILES="
 	*.ttcn
 	*.ttcnpp
@@ -22,4 +24,4 @@ export CPPFLAGS_TTCN3="
 	-DUSE_MTP3_DISTRIBUTOR
 "
 
-../regen-makefile.sh SCCP_Tests.ttcn $FILES
+../regen-makefile.sh -e $NAME $FILES
diff --git a/selftest/regen_makefile.sh b/selftest/regen_makefile.sh
index 17854ce33..383e2db71 100755
--- a/selftest/regen_makefile.sh
+++ b/selftest/regen_makefile.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-MAIN=Selftest.ttcn
+NAME=Selftest
 
 FILES="
 	*.ttcn
@@ -19,4 +19,4 @@ export CPPFLAGS_TTCN3="
 	-DUSE_MTP3_DISTRIBUTOR
 "
 
-../regen-makefile.sh $MAIN $FILES
+../regen-makefile.sh -e $NAME $FILES
diff --git a/sgsn/regen_makefile.sh b/sgsn/regen_makefile.sh
index 2a5cb922a..a1f702a35 100755
--- a/sgsn/regen_makefile.sh
+++ b/sgsn/regen_makefile.sh
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+NAME=SGSN_Tests
+
 FILES="
 	*.asn
 	*.ttcn
@@ -30,6 +32,6 @@ export CPPFLAGS_TTCN3="
 	-DUSE_MTP3_DISTRIBUTOR
 "
 
-../regen-makefile.sh SGSN_Tests.ttcn $FILES
+../regen-makefile.sh -e $NAME $FILES
 
 sed -i -e 's/^LINUX_LIBS = -lxml2 -lsctp/LINUX_LIBS = -lxml2 -lsctp -lfftranscode/' Makefile
diff --git a/simtrace/regen_makefile.sh b/simtrace/regen_makefile.sh
index 509699e95..baecf7de6 100755
--- a/simtrace/regen_makefile.sh
+++ b/simtrace/regen_makefile.sh
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+NAME=SIMTRACE_Tests
+
 FILES="
 	*.ttcn
 	Native_FunctionDefs.cc
@@ -9,7 +11,7 @@ FILES="
 export CPPFLAGS_TTCN3="
 "
 
-../regen-makefile.sh SIMTRACE_Tests.ttcn $FILES
+../regen-makefile.sh -e $NAME $FILES
 
 #sed -i -e 's/^LINUX_LIBS = -lxml2/LINUX_LIBS = -lxml2 -lusb/' Makefile
 sed -i -e '/^LINUX_LIBS/ s/$/ `pkg-config --libs libusb-1.0`/' Makefile
diff --git a/sip/regen_makefile.sh b/sip/regen_makefile.sh
index caf657c7e..c7a645da4 100755
--- a/sip/regen_makefile.sh
+++ b/sip/regen_makefile.sh
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+NAME=SIP_Tests
+
 FILES="
 	*.c
 	*.ttcn
@@ -24,4 +26,4 @@ export CPPFLAGS_TTCN3="
 	-DRAN_EMULATION_CTRL
 "
 
-../regen-makefile.sh SIP_Tests.ttcn $FILES
+../regen-makefile.sh -e $NAME $FILES
diff --git a/smlc/regen_makefile.sh b/smlc/regen_makefile.sh
index 24e3407b0..180486c00 100755
--- a/smlc/regen_makefile.sh
+++ b/smlc/regen_makefile.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-MAIN=SMLC_Tests.ttcn
+NAME=SMLC_Tests
 
 FILES="
 	*.c
@@ -32,4 +32,4 @@ export CPPFLAGS_TTCN3="
 	-DUSE_MTP3_DISTRIBUTOR
 "
 
-../regen-makefile.sh $MAIN $FILES
+../regen-makefile.sh -e $NAME $FILES
diff --git a/stp/regen_makefile.sh b/stp/regen_makefile.sh
index 0b90687b9..032be0d00 100755
--- a/stp/regen_makefile.sh
+++ b/stp/regen_makefile.sh
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+NAME=STP_Tests
+
 FILES="
 	*.ttcn
 	*.ttcnpp
@@ -22,4 +24,4 @@ export CPPFLAGS_TTCN3="
 	-DUSE_MTP3_DISTRIBUTOR
 "
 
-../regen-makefile.sh STP_Tests.ttcn $FILES
+../regen-makefile.sh -e $NAME $FILES
diff --git a/sysinfo/regen_makefile.sh b/sysinfo/regen_makefile.sh
index 4a3dfcc58..569f40695 100755
--- a/sysinfo/regen_makefile.sh
+++ b/sysinfo/regen_makefile.sh
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+NAME=Test
+
 FILES="
 	*.ttcn
 	IPL4_GSMTAP_CtrlFunctDef.cc
@@ -13,4 +15,4 @@ FILES="
 export CPPFLAGS_TTCN3="
 "
 
-../regen-makefile.sh Test.ttcn $FILES
+../regen-makefile.sh -e $NAME $FILES