diff -ur pgf-2.10.orig/tex/generic/pgf/libraries/shapes/pgflibraryshapes.callouts.code.tex pgf-2.10/tex/generic/pgf/libraries/shapes/pgflibraryshapes.callouts.code.tex
--- pgf-2.10.orig/tex/generic/pgf/libraries/shapes/pgflibraryshapes.callouts.code.tex	2010-10-25 19:00:21.000000000 -0200
+++ pgf-2.10/tex/generic/pgf/libraries/shapes/pgflibraryshapes.callouts.code.tex	2012-03-03 11:19:22.000000000 -0300
@@ -247,9 +247,9 @@
 			\pgf@lib@callouts@shortenpointer%
 			\pgf@lib@ellipsecallout@getpoints%	
 			\calloutpointeranchor%	
-			\ifx\pgf@test\pgfutil@empty%
+			\ifx\pgf@node@name\pgfutil@empty%
 			\else%
-				\edef\pgf@sh@@temp{\noexpand\expandafter\noexpand\pgfutil@g@addto@macro\noexpand\csname pgf@sh@np@\pgf@test\noexpand\endcsname}%
+				\edef\pgf@sh@@temp{\noexpand\expandafter\noexpand\pgfutil@g@addto@macro\noexpand\csname pgf@sh@np@\pgf@node@name\noexpand\endcsname}%
 				\edef\pgf@sh@@@temp{%
 					\noexpand\def\noexpand\calloutpointeranchor{%
 						\noexpand\pgf@x\the\pgf@x%
@@ -568,15 +568,15 @@
 			\pgfmathsetlengthmacro\pointerwidth{\pgfkeysvalueof{/pgf/callout pointer width}}%
 			\pgf@lib@rectanglecallout@pointer%
 			%
-			% \pgf@test = the shape name (from \pgfmultipartnode)
+			% \pgf@node@name = the shape name (from \pgfmultipartnode)
 			%
-			\ifx\pgf@test\pgfutil@empty%
+			\ifx\pgf@node@name\pgfutil@empty%
 			\else%
 				%
 				% Now hack an extra saved anchor \calloutpointeranchor,
 				% with the new anchor for the callout pointer.
 				%
-				\edef\pgf@sh@@temp{\noexpand\expandafter\noexpand\pgfutil@g@addto@macro\noexpand\csname pgf@sh@np@\pgf@test\noexpand\endcsname}%
+				\edef\pgf@sh@@temp{\noexpand\expandafter\noexpand\pgfutil@g@addto@macro\noexpand\csname pgf@sh@np@\pgf@node@name\noexpand\endcsname}%
 				\edef\pgf@sh@@@temp{%
 					\noexpand\def\noexpand\calloutpointeranchor{%
 						\noexpand\pgf@x\the\pgf@x%
@@ -862,9 +862,9 @@
    		\pgfextract@process\calloutpointer{%
 				\pgfpointanchor{pgf@lib@callout@pointer}{center}%
 			}%
-			\ifx\pgf@test\pgfutil@empty%
+			\ifx\pgf@node@name\pgfutil@empty%
 			\else%
-				\edef\pgf@sh@@temp{\noexpand\expandafter\noexpand\pgfutil@g@addto@macro\noexpand\csname pgf@sh@np@\pgf@test\noexpand\endcsname}%
+				\edef\pgf@sh@@temp{\noexpand\expandafter\noexpand\pgfutil@g@addto@macro\noexpand\csname pgf@sh@np@\pgf@node@name\noexpand\endcsname}%
 				\edef\pgf@sh@@@temp{%
 					\noexpand\def\noexpand\calloutpointeranchor{%
 						\noexpand\pgf@x\the\pgf@x%