diff --git a/CHANGES b/CHANGES
index edcdbba3e..37868d8fe 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1021,13 +1021,13 @@ Version 2.0.9 (16 December 2012)
 
 2012-10-11: wsfulton
             Most of the special variables available for use in %exception are now also available for expansion in
-            %extend blocks. These are: $name $symname $overname $decl $fulldecl $parentname $parentsymname, see docs
+            %extend blocks. These are: $name $symname $overname $decl $fulldecl $parentclassname $parentclasssymname, see docs
             on "Class extension" in SWIGPlus.html. Patch based on submission from Kris Thielemans.
 
 2012-10-10: wsfulton
             Additional new special variables in %exception are expanded as follows:
-              $parentname - The parent class name (if any) for a method.
-              $parentsymname - The target language parent class name (if any) for a method.
+              $parentclassname - The parent class name (if any) for a method.
+              $parentclasssymname - The target language parent class name (if any) for a method.
 
 2012-10-08: iant
 	    [Go] Generating Go code now requires using the -intgosize option to
diff --git a/Doc/Manual/Customization.html b/Doc/Manual/Customization.html
index a0a89c042..880b64c90 100644
--- a/Doc/Manual/Customization.html
+++ b/Doc/Manual/Customization.html
@@ -485,12 +485,12 @@ variables are replaced with.
 </tr>
 
 <tr>
-<td>$parentname</td>
+<td>$parentclassname</td>
 <td>The parent class name (if any) for a method.</td>
 </tr>
 
 <tr>
-<td>$parentsymname</td>
+<td>$parentclasssymname</td>
 <td>The target language parent class name (if any) for a method.</td>
 </tr>
 
diff --git a/Doc/Manual/SWIGPlus.html b/Doc/Manual/SWIGPlus.html
index f9558994b..9589bf16c 100644
--- a/Doc/Manual/SWIGPlus.html
+++ b/Doc/Manual/SWIGPlus.html
@@ -2847,7 +2847,7 @@ struct Derived : Base {
 
 <p>
 The following special variables are expanded if used within a %extend block: 
-$name, $symname, $overname, $decl, $fulldecl, $parentname and $parentsymname.
+$name, $symname, $overname, $decl, $fulldecl, $parentclassname and $parentclasssymname.
 The <a href="Customization.html#Customization_exception_special_variables">Special variables</a> section provides more information each of these special variables.
 </p>