diff --git a/compiler/src/main/pascal/blaise.testing.pas b/compiler/src/main/pascal/blaise.testing.pas
index f2f8008..c00369c 100644
--- a/compiler/src/main/pascal/blaise.testing.pas
+++ b/compiler/src/main/pascal/blaise.testing.pas
@@ -522,25 +522,25 @@ begin
       try
         Self.RunTest();
       except
-        on EAF: EAssertionFailed do
+        on E: EAssertionFailed do
         begin
           Outcome := 'FAIL';
-          AResult.AddFailure(Self.FName, EAF.ToString());
+          AResult.AddFailure(Self.FName, E.ToString());
         end;
-        on EIT: EIgnoredTest do
+        on E: EIgnoredTest do
         begin
           Outcome := 'IGNORED';
-          AResult.AddIgnored(Self.FName, EIT.FMessage);
+          AResult.AddIgnored(Self.FName, E.FMessage);
         end;
         on E: Exception do
         begin
           Outcome := 'ERROR';
           AResult.AddError(Self.FName, E.ClassName + ': ' + E.Message);
         end;
-        on ETO: TObject do
+        on E: TObject do
         begin
           Outcome := 'ERROR';
-          AResult.AddError(Self.FName, 'Unhandled exception: ' + ETO.ClassName);
+          AResult.AddError(Self.FName, 'Unhandled exception: ' + E.ClassName);
         end;
       end;
     finally
diff --git a/compiler/src/test/pascal/cp.test.attributes.pas b/compiler/src/test/pascal/cp.test.attributes.pas
index 101ea0f..016832d 100644
--- a/compiler/src/test/pascal/cp.test.attributes.pas
+++ b/compiler/src/test/pascal/cp.test.attributes.pas
@@ -405,8 +405,8 @@ begin
     on E: Exception do
       if Pos('Unknown attribute', E.Message) >= 0 then
         OK := True;
-    on ETO: TObject do
-      if Pos('Unknown attribute', ETO.ClassName) >= 0 then
+    on E: TObject do
+      if Pos('Unknown attribute', E.ClassName) >= 0 then
         OK := True;
   end;
   AssertTrue('unknown attribute raises semantic error', OK);
diff --git a/compiler/src/test/pascal/cp.test.sets.pas b/compiler/src/test/pascal/cp.test.sets.pas
index 976cd90..dfbf5fe 100644
--- a/compiler/src/test/pascal/cp.test.sets.pas
+++ b/compiler/src/test/pascal/cp.test.sets.pas
@@ -720,11 +720,11 @@ begin
     Prog.Free();
     Fail('Expected ESemanticError but none was raised');
   except
-    on ESE: ESemanticError do
+    on E: ESemanticError do
     begin
       Prog.Free();
     end;
-    on EEx: Exception do
+    on E: Exception do
     begin
       Prog.Free();
       raise;