diff --git a/Examples/csharp/reference/example.i b/Examples/csharp/reference/example.i
index e71f297bf..6daa3b1f4 100644
--- a/Examples/csharp/reference/example.i
+++ b/Examples/csharp/reference/example.i
@@ -33,10 +33,10 @@ public:
   /* This wrapper provides an alternative to the [] operator */
   %extend {
     Vector &get(int index) {
-      return (*self)[index];
+      return (*$self)[index];
     }
     void set(int index, Vector &a) {
-      (*self)[index] = a;
+      (*$self)[index] = a;
     }
   }
 };
diff --git a/Examples/csharp/template/example.h b/Examples/csharp/template/example.h
index 4d9a58c54..7401df650 100644
--- a/Examples/csharp/template/example.h
+++ b/Examples/csharp/template/example.h
@@ -21,10 +21,10 @@ template<class T> class vector {
 #ifdef SWIG
   %extend {
     T getitem(int index) {
-      return self->get(index);
+      return $self->get(index);
     }
     void setitem(int index, T val) {
-      self->set(index,val);
+      $self->set(index,val);
     }
   }
 #endif
diff --git a/Examples/java/reference/example.i b/Examples/java/reference/example.i
index e71f297bf..6daa3b1f4 100644
--- a/Examples/java/reference/example.i
+++ b/Examples/java/reference/example.i
@@ -33,10 +33,10 @@ public:
   /* This wrapper provides an alternative to the [] operator */
   %extend {
     Vector &get(int index) {
-      return (*self)[index];
+      return (*$self)[index];
     }
     void set(int index, Vector &a) {
-      (*self)[index] = a;
+      (*$self)[index] = a;
     }
   }
 };
diff --git a/Examples/java/template/example.h b/Examples/java/template/example.h
index 4d9a58c54..7401df650 100644
--- a/Examples/java/template/example.h
+++ b/Examples/java/template/example.h
@@ -21,10 +21,10 @@ template<class T> class vector {
 #ifdef SWIG
   %extend {
     T getitem(int index) {
-      return self->get(index);
+      return $self->get(index);
     }
     void setitem(int index, T val) {
-      self->set(index,val);
+      $self->set(index,val);
     }
   }
 #endif
diff --git a/Examples/perl5/reference/example.i b/Examples/perl5/reference/example.i
index e71f297bf..6daa3b1f4 100644
--- a/Examples/perl5/reference/example.i
+++ b/Examples/perl5/reference/example.i
@@ -33,10 +33,10 @@ public:
   /* This wrapper provides an alternative to the [] operator */
   %extend {
     Vector &get(int index) {
-      return (*self)[index];
+      return (*$self)[index];
     }
     void set(int index, Vector &a) {
-      (*self)[index] = a;
+      (*$self)[index] = a;
     }
   }
 };
diff --git a/Examples/php4/reference/example.i b/Examples/php4/reference/example.i
index 0a7212d1d..55d1828a8 100644
--- a/Examples/php4/reference/example.i
+++ b/Examples/php4/reference/example.i
@@ -33,11 +33,11 @@ public:
  /*  This wrapper provides an alternative to the [] operator */
   %extend {
     Vector &get(int index) {
-      printf("VectorArray extended get: %p %d\n",self,index);
-      return (*self)[index];
+      printf("VectorArray extended get: %p %d\n",$self,index);
+      return (*$self)[index];
     }
     void set(int index, Vector &a) {
-      (*self)[index] = a;
+      (*$self)[index] = a;
     }
   }
 };
diff --git a/Examples/pike/template/example.h b/Examples/pike/template/example.h
index 4d9a58c54..7401df650 100755
--- a/Examples/pike/template/example.h
+++ b/Examples/pike/template/example.h
@@ -21,10 +21,10 @@ template<class T> class vector {
 #ifdef SWIG
   %extend {
     T getitem(int index) {
-      return self->get(index);
+      return $self->get(index);
     }
     void setitem(int index, T val) {
-      self->set(index,val);
+      $self->set(index,val);
     }
   }
 #endif
diff --git a/Examples/python/operator/example.i b/Examples/python/operator/example.i
index 9c6221b8d..e37e76b3e 100644
--- a/Examples/python/operator/example.i
+++ b/Examples/python/operator/example.i
@@ -20,7 +20,7 @@
 %extend Complex {
    char *__str__() {
        static char temp[512];
-       sprintf(temp,"(%g,%g)", self->re(), self->im());
+       sprintf(temp,"(%g,%g)", $self->re(), $self->im());
        return temp;
    }
 };
diff --git a/Examples/python/reference/example.i b/Examples/python/reference/example.i
index 5be92914f..8c95b3213 100644
--- a/Examples/python/reference/example.i
+++ b/Examples/python/reference/example.i
@@ -35,10 +35,10 @@ public:
   /* This wrapper provides an alternative to the [] operator */
   %extend {
     Vector &get(int index) {
-      return (*self)[index];
+      return (*$self)[index];
     }
     void set(int index, Vector &a) {
-      (*self)[index] = a;
+      (*$self)[index] = a;
     }
   }
 };
diff --git a/Examples/python/template/example.h b/Examples/python/template/example.h
index 4d9a58c54..7401df650 100644
--- a/Examples/python/template/example.h
+++ b/Examples/python/template/example.h
@@ -21,10 +21,10 @@ template<class T> class vector {
 #ifdef SWIG
   %extend {
     T getitem(int index) {
-      return self->get(index);
+      return $self->get(index);
     }
     void setitem(int index, T val) {
-      self->set(index,val);
+      $self->set(index,val);
     }
   }
 #endif
diff --git a/Examples/ruby/operator/example.i b/Examples/ruby/operator/example.i
index d0325b8bc..b7e013ffd 100644
--- a/Examples/ruby/operator/example.i
+++ b/Examples/ruby/operator/example.i
@@ -18,7 +18,7 @@
 %extend Complex {
    char *__str__() {
        static char temp[512];
-       sprintf(temp,"(%g,%g)", self->re(), self->im());
+       sprintf(temp,"(%g,%g)", $self->re(), $self->im());
        return temp;
    }
 };
diff --git a/Examples/ruby/reference/example.i b/Examples/ruby/reference/example.i
index e71f297bf..6daa3b1f4 100644
--- a/Examples/ruby/reference/example.i
+++ b/Examples/ruby/reference/example.i
@@ -33,10 +33,10 @@ public:
   /* This wrapper provides an alternative to the [] operator */
   %extend {
     Vector &get(int index) {
-      return (*self)[index];
+      return (*$self)[index];
     }
     void set(int index, Vector &a) {
-      (*self)[index] = a;
+      (*$self)[index] = a;
     }
   }
 };
diff --git a/Examples/ruby/template/example.h b/Examples/ruby/template/example.h
index 4d9a58c54..7401df650 100644
--- a/Examples/ruby/template/example.h
+++ b/Examples/ruby/template/example.h
@@ -21,10 +21,10 @@ template<class T> class vector {
 #ifdef SWIG
   %extend {
     T getitem(int index) {
-      return self->get(index);
+      return $self->get(index);
     }
     void setitem(int index, T val) {
-      self->set(index,val);
+      $self->set(index,val);
     }
   }
 #endif
diff --git a/Examples/tcl/operator/example.i b/Examples/tcl/operator/example.i
index f108edb4b..fa5bccd06 100644
--- a/Examples/tcl/operator/example.i
+++ b/Examples/tcl/operator/example.i
@@ -20,7 +20,7 @@
 %extend Complex {
    char *str() {
        static char temp[512];
-       sprintf(temp,"(%g,%g)", self->re(), self->im());
+       sprintf(temp,"(%g,%g)", $self->re(), $self->im());
        return temp;
    }
 };
diff --git a/Examples/tcl/reference/example.i b/Examples/tcl/reference/example.i
index e71f297bf..6daa3b1f4 100644
--- a/Examples/tcl/reference/example.i
+++ b/Examples/tcl/reference/example.i
@@ -33,10 +33,10 @@ public:
   /* This wrapper provides an alternative to the [] operator */
   %extend {
     Vector &get(int index) {
-      return (*self)[index];
+      return (*$self)[index];
     }
     void set(int index, Vector &a) {
-      (*self)[index] = a;
+      (*$self)[index] = a;
     }
   }
 };
diff --git a/Examples/test-suite/director_extend.i b/Examples/test-suite/director_extend.i
index 6706e2f65..515866ac6 100644
--- a/Examples/test-suite/director_extend.i
+++ b/Examples/test-suite/director_extend.i
@@ -5,7 +5,7 @@
 {
    virtual int dummy()          // Had to remove virtual to work
    {
-      return self->getFooBar();
+      return $self->getFooBar();
    }
 };
 
diff --git a/Examples/test-suite/extend_placement.i b/Examples/test-suite/extend_placement.i
index 04be8973d..b95e82145 100644
--- a/Examples/test-suite/extend_placement.i
+++ b/Examples/test-suite/extend_placement.i
@@ -6,7 +6,7 @@
 
 %extend Foo {
   Foo(int a) { return new Foo(); }
-  ~Foo() { delete self;}
+  ~Foo() { delete $self;}
   int spam(int x) { return x; }
   int spam(int x, int y) { return x + y ; }
   int spam(int x, int y,int z) { return x + y ; }
@@ -41,7 +41,7 @@ public:
 
 %extend Bar {
   Bar(int a) { return new Bar(); }
-  ~Bar() { delete self;}
+  ~Bar() { delete $self;}
   int spam() { return 1}
   int spam(int x) { return x; }
   int spam(int x, int y) { return x + y ; }
@@ -56,7 +56,7 @@ public:
 
 %extend FooT {
   FooT(int a) { return new FooT<T>(); }
-  ~FooT() { delete self;}
+  ~FooT() { delete $self;}
   int spam(int x) { return x; }
   int spam(int x, int y) { return x + y ; }
   int spam(int x, int y,int z) { return x + y ; }
@@ -96,7 +96,7 @@ public:
 
 %extend BarT {
   BarT(int a) { return new BarT<T>(); }
-  ~BarT() { delete self;}
+  ~BarT() { delete $self;}
   int spam() { return 1}
   int spam(int x) { return x; }
   int spam(int x, int y) { return x + y ; }
diff --git a/Examples/test-suite/newobject2.i b/Examples/test-suite/newobject2.i
index 92b997e5d..bc7394d4a 100644
--- a/Examples/test-suite/newobject2.i
+++ b/Examples/test-suite/newobject2.i
@@ -41,7 +41,7 @@ void do_stuff(Foo *f) {
 
 %extend Foo {
     ~Foo() {
-        free((void *) self);
+        free((void *) $self);
 	g_fooCount--;
     }
 }
diff --git a/Examples/test-suite/operator_overload.i b/Examples/test-suite/operator_overload.i
index 7ece150ea..d618fa6b2 100644
--- a/Examples/test-suite/operator_overload.i
+++ b/Examples/test-suite/operator_overload.i
@@ -167,36 +167,36 @@ inline bool operator>=(const Op& a,const Op& b){return a.i>=b.i;}
 // we need to extend the class
 // to make the friends & non members part of the class
 %extend Op{
-        Op operator &&(const Op& b){return Op(self->i&&b.i);}
-        Op operator or(const Op& b){return Op(self->i||b.i);}
+        Op operator &&(const Op& b){return Op($self->i&&b.i);}
+        Op operator or(const Op& b){return Op($self->i||b.i);}
 
-	Op operator+(const Op& b){return Op(self->i+b.i);}
-	Op operator-(const Op& b){return Op(self->i-b.i);}
-	Op operator*(const Op& b){return Op(self->i*b.i);}
-	Op operator/(const Op& b){return Op(self->i/b.i);}
-	Op operator%(const Op& b){return Op(self->i%b.i);}
+	Op operator+(const Op& b){return Op($self->i+b.i);}
+	Op operator-(const Op& b){return Op($self->i-b.i);}
+	Op operator*(const Op& b){return Op($self->i*b.i);}
+	Op operator/(const Op& b){return Op($self->i/b.i);}
+	Op operator%(const Op& b){return Op($self->i%b.i);}
 
-	bool operator==(const Op& b){return self->i==b.i;}
-	bool operator!=(const Op& b){return self->i!=b.i;}
-	bool operator< (const Op& b){return self->i<b.i;}
-	bool operator<=(const Op& b){return self->i<=b.i;}
-	bool operator> (const Op& b){return self->i>b.i;}
-	bool operator>=(const Op& b){return self->i>=b.i;}
+	bool operator==(const Op& b){return $self->i==b.i;}
+	bool operator!=(const Op& b){return $self->i!=b.i;}
+	bool operator< (const Op& b){return $self->i<b.i;}
+	bool operator<=(const Op& b){return $self->i<=b.i;}
+	bool operator> (const Op& b){return $self->i>b.i;}
+	bool operator>=(const Op& b){return $self->i>=b.i;}
 
 	// we also add the __str__() fn to the class
 	// this allows it to be converted to a string (so it can be printed)
 	const char* __str__()
 	{
 		static char buffer[255];
-		sprintf(buffer,"Op(%d)",self->i);
+		sprintf(buffer,"Op(%d)",$self->i);
 		return buffer;
 	}
 	// to get the [] operator working correctly we need to extend with two function
 	// __getitem__ & __setitem__
 	int __getitem__(unsigned i)
-	{	return (*self)[i];	}
+	{	return (*$self)[i];	}
 	void __setitem__(unsigned i,int v)
-	{	(*self)[i]=v;	}
+	{	(*$self)[i]=v;	}
 }
 
 /*
diff --git a/Examples/test-suite/overload_extend.i b/Examples/test-suite/overload_extend.i
index 6199d9be3..4fd1b4bd0 100644
--- a/Examples/test-suite/overload_extend.i
+++ b/Examples/test-suite/overload_extend.i
@@ -40,14 +40,14 @@ struct Foo {
     return new Bar();
   }
   ~Bar() {
-    if (self) delete self;
+    delete $self;
   }
 #else
   Bar() {
     return (Bar *) malloc(sizeof(Bar));
   }
   ~Bar() {
-    if (self) free(self);
+    free($self);
   }
 #endif
 }