diff --git a/Examples/test-suite/compactdefaultargs.i b/Examples/test-suite/compactdefaultargs.i
index a4462245d..54ad22a45 100644
--- a/Examples/test-suite/compactdefaultargs.i
+++ b/Examples/test-suite/compactdefaultargs.i
@@ -5,11 +5,11 @@
 // The following should compile with compactdefaultargs off
 %inline %{
 class Defaults1 {
-  static const int private_default = -1;
+  static const int PRIVATE_DEFAULT = -1;
 public:
-  static const double public_default = -1.0;
-  Defaults1(int a = private_default) {}
-  double ret(double d = public_default) { return d; }
+  static const double PUBLIC_DEFAULT = -1.0;
+  Defaults1(int a = PRIVATE_DEFAULT) {}
+  double ret(double d = PUBLIC_DEFAULT) { return d; }
 };
 %}
 
@@ -17,16 +17,16 @@ public:
 // compactdefaultargs now on by default
 %feature("compactdefaultargs");
 
-// Turn compactdefaultargs off for the ret method which can't work with this feature
-%feature("compactdefaultargs", "0") Defaults2(int a = private_default);
+// Turn compactdefaultargs off for the constructor which can't work with this feature
+%feature("compactdefaultargs", "0") Defaults2(int a = PRIVATE_DEFAULT);
 
 %inline %{
 class Defaults2 {
-  static const int private_default = -1;
+  static const int PRIVATE_DEFAULT = -1;
 public:
-  static const double public_default = -1.0;
-  Defaults2(int a = private_default) {}
-  double ret(double d = public_default) { return d; }
+  static const double PUBLIC_DEFAULT = -1.0;
+  Defaults2(int a = PRIVATE_DEFAULT) {}
+  double ret(double d = PUBLIC_DEFAULT) { return d; }
 };
 %}