diff --git a/spdl/carkey-broken-limited.spdl b/spdl/carkey-broken-limited.spdl
index c5f4305..346beaa 100644
--- a/spdl/carkey-broken-limited.spdl
+++ b/spdl/carkey-broken-limited.spdl
@@ -2,7 +2,7 @@ const pk: Function;
 secret sk: Function;
 inversekeys (pk,sk);
 
-protocol carkeybroken(I,R)
+protocol carkeybrokenlim(I,R)
 {
 	role I
 	{
@@ -26,7 +26,7 @@ untrusted Eve;
 const nc: Nonce;
 compromised sk(Eve);
 
-run carkeybroken.I(Alice,Bob);
-run carkeybroken.R(Alice,Bob);
-run carkeybroken.I(Alice,Bob);
-run carkeybroken.R(Alice,Bob);
+run carkeybrokenlim.I(Alice,Bob);
+run carkeybrokenlim.R(Alice,Bob);
+run carkeybrokenlim.I(Alice,Bob);
+run carkeybrokenlim.R(Alice,Bob);
diff --git a/spdl/multiprotocoltest.py b/spdl/multiprotocoltest.py
index 17c7c81..fabb9e5 100755
--- a/spdl/multiprotocoltest.py
+++ b/spdl/multiprotocoltest.py
@@ -36,8 +36,8 @@ ScytherProgram = "../src/scyther"
 
 # Scyther parameters
 ScytherDefaults	= "--summary"
-ScytherMethods	= "--match=0 --arachne"
-ScytherBounds	= "--timer=300 --max-runs=5 --max-depth=25 --max-length=30"
+ScytherMethods	= "--match=1 --arachne"
+ScytherBounds	= "--timer=10 --max-runs=5 --max-length=25"
 
 # Build a large part of the command line (for Scyther) already
 ScytherArgs = ScytherDefaults + " " + ScytherMethods + " " + ScytherBounds
diff --git a/spdl/ns-symmetric-amended.spdl b/spdl/ns-symmetric-amended.spdl
index 82c7421..534a886 100644
--- a/spdl/ns-symmetric-amended.spdl
+++ b/spdl/ns-symmetric-amended.spdl
@@ -32,7 +32,7 @@ const succ: PseudoFunction;
 
 usertype Ticket;
 
-protocol nssymmetric(A,S,B) 
+protocol nssymmetricamended(A,S,B) 
 {
 	role A
 	{
diff --git a/spdl/nsl3-nisynch-rep.spdl b/spdl/nsl3-nisynch-rep.spdl
index 2471e72..104c8b8 100644
--- a/spdl/nsl3-nisynch-rep.spdl
+++ b/spdl/nsl3-nisynch-rep.spdl
@@ -2,7 +2,7 @@ const pk: Function;
 secret sk: Function;
 inversekeys (pk,sk);
 
-protocol nsl3(I,R)
+protocol nsl3rep(I,R)
 {
 	role I
 	{
@@ -37,7 +37,7 @@ untrusted Eve;
 const nc: Nonce;
 compromised sk(Eve);
 
-run nsl3.I(Agent,Agent);
-run nsl3.R(Agent,Agent);
-run nsl3.I(Agent,Agent);
-run nsl3.R(Agent,Agent);
+run nsl3rep.I(Agent,Agent);
+run nsl3rep.R(Agent,Agent);
+run nsl3rep.I(Agent,Agent);
+run nsl3rep.R(Agent,Agent);
diff --git a/spdl/tls-paulson.spdl b/spdl/tls-paulson.cpp
similarity index 100%
rename from spdl/tls-paulson.spdl
rename to spdl/tls-paulson.cpp