diff --git a/src/GToolkit-GemStone-Lepiter/GtGemStoneSnippetCoderEvaluationContext.class.st b/src/GToolkit-GemStone-Lepiter/GtGemStoneSnippetCoderEvaluationContext.class.st
index 80514bf1..172a5c64 100644
--- a/src/GToolkit-GemStone-Lepiter/GtGemStoneSnippetCoderEvaluationContext.class.st
+++ b/src/GToolkit-GemStone-Lepiter/GtGemStoneSnippetCoderEvaluationContext.class.st
@@ -6,25 +6,25 @@ Class {
 		'session',
 		'serializationStrategy',
 		'pharoBindings',
-		'classSlotNames'
+		'instanceVariableNames'
 	],
 	#category : #'GToolkit-GemStone-Lepiter-Coder'
 }
 
 { #category : #accessing }
-GtGemStoneSnippetCoderEvaluationContext >> classSlotNames [
-	^ classSlotNames
+GtGemStoneSnippetCoderEvaluationContext >> executionStrategy [
+	^ executionStrategy ifNil: [ 
+		GtGemStoneSnippetSynchronousExecutionStrategy new ]
 ]
 
 { #category : #accessing }
-GtGemStoneSnippetCoderEvaluationContext >> classSlotNames: anObject [
-	classSlotNames := anObject
+GtGemStoneSnippetCoderEvaluationContext >> instanceVariableNames [
+	^ instanceVariableNames
 ]
 
 { #category : #accessing }
-GtGemStoneSnippetCoderEvaluationContext >> executionStrategy [
-	^ executionStrategy ifNil: [ 
-		GtGemStoneSnippetSynchronousExecutionStrategy new ]
+GtGemStoneSnippetCoderEvaluationContext >> instanceVariableNames: anObject [
+	instanceVariableNames := anObject
 ]
 
 { #category : #accessing }
diff --git a/src/GToolkit-GemStone-Lepiter/GtGemStoneSnippetCoderModel.class.st b/src/GToolkit-GemStone-Lepiter/GtGemStoneSnippetCoderModel.class.st
index 5593d668..79619bfc 100644
--- a/src/GToolkit-GemStone-Lepiter/GtGemStoneSnippetCoderModel.class.st
+++ b/src/GToolkit-GemStone-Lepiter/GtGemStoneSnippetCoderModel.class.st
@@ -176,7 +176,7 @@ GtGemStoneSnippetCoderModel >> newEvaluationContext [
 		aClassSpecification slotNames ].
 	
 	^ GtGemStoneSnippetCoderEvaluationContext new
-		classSlotNames: slotNames
+		instanceVariableNames: slotNames
 ]
 
 { #category : #'private - notifying' }
diff --git a/src/GToolkit-GemStone-Lepiter/GtGemStoneSnippetRemoteExecutionBuilder.class.st b/src/GToolkit-GemStone-Lepiter/GtGemStoneSnippetRemoteExecutionBuilder.class.st
index e952f3b4..4060a26c 100644
--- a/src/GToolkit-GemStone-Lepiter/GtGemStoneSnippetRemoteExecutionBuilder.class.st
+++ b/src/GToolkit-GemStone-Lepiter/GtGemStoneSnippetRemoteExecutionBuilder.class.st
@@ -36,11 +36,6 @@ GtGemStoneSnippetRemoteExecutionBuilder >> assignFirstUndeclaredVariablesName [
 	^ visitor assignFirstUndeclaredVariablesName
 ]
 
-{ #category : #accessing }
-GtGemStoneSnippetRemoteExecutionBuilder >> classSlotNames: anArrayOfSlotNames [
-	 classSlotNames := anArrayOfSlotNames
-]
-
 { #category : #'gt - extensions' }
 GtGemStoneSnippetRemoteExecutionBuilder >> convertBindingToGemstone: aBinding [
 	"Use only in views"
@@ -302,6 +297,11 @@ GtGemStoneSnippetRemoteExecutionBuilder >> insert: varNames asTemporariesIn: tri
 	trimmedSource insert: temporaries at: index.
 ]
 
+{ #category : #accessing }
+GtGemStoneSnippetRemoteExecutionBuilder >> instanceVariableNames: anArrayOfSlotNames [
+	 classSlotNames := anArrayOfSlotNames
+]
+
 { #category : #testing }
 GtGemStoneSnippetRemoteExecutionBuilder >> isBindingValid: aBinding [
 	^ self isBindingValueValid: aBinding value
diff --git a/src/GToolkit-GemStone-Lepiter/GtGemStoneSnippetRemoteExecutionBuilderExamples.class.st b/src/GToolkit-GemStone-Lepiter/GtGemStoneSnippetRemoteExecutionBuilderExamples.class.st
index c3bf33e0..b7375a17 100644
--- a/src/GToolkit-GemStone-Lepiter/GtGemStoneSnippetRemoteExecutionBuilderExamples.class.st
+++ b/src/GToolkit-GemStone-Lepiter/GtGemStoneSnippetRemoteExecutionBuilderExamples.class.st
@@ -120,7 +120,7 @@ a := 1.'.
 	
 	executionBuilder := GtGemStoneSnippetRemoteExecutionBuilder new 
 		localBindings: pharoBindings;
-		classSlotNames: #(f a b e);
+		instanceVariableNames: #(f a b e);
 		sourceString: source.
 	
 	remoteBindings := executionBuilder extractRemoteBindings.
@@ -328,7 +328,7 @@ a := 1.'.
 	
 	executionBuilder := GtGemStoneSnippetRemoteExecutionBuilder new 
 		localBindings: pharoBindings;
-		classSlotNames: #(f);
+		instanceVariableNames: #(f);
 		sourceString: source.
 	
 	remoteBindings := executionBuilder extractRemoteBindings.
@@ -561,7 +561,7 @@ GtGemStoneSnippetRemoteExecutionBuilderExamples >> expressionWithGlobal_accessFi
 a := 4'.
 	executionBuilder := GtGemStoneSnippetRemoteExecutionBuilder new 
 		localBindings: GtSharedVariablesBindings new;
-		classSlotNames: #(a);
+		instanceVariableNames: #(a);
 		sourceString: source.
 	
 	remoteBindings := executionBuilder extractRemoteBindings.
@@ -646,7 +646,7 @@ a := 4'.
 	executionBuilder := GtGemStoneSnippetRemoteExecutionBuilder new 
 		localBindings: (GtLocalVariablesBindings new
 			localAt: #a put: 40);
-		classSlotNames: #(a);
+		instanceVariableNames: #(a);
 		sourceString: source.
 	
 	remoteBindings := executionBuilder extractRemoteBindings.
@@ -765,7 +765,7 @@ GtGemStoneSnippetRemoteExecutionBuilderExamples >> expressionWithGlobal_accessGl
 	source := 'a + 3'.
 	executionBuilder := GtGemStoneSnippetRemoteExecutionBuilder new 
 		localBindings: GtSharedVariablesBindings new;
-		classSlotNames: #(a);
+		instanceVariableNames: #(a);
 		sourceString: source.
 	
 	remoteBindings := executionBuilder extractRemoteBindings.
@@ -946,7 +946,7 @@ GtGemStoneSnippetRemoteExecutionBuilderExamples >> expressionWithGlobal_writeFir
 a + 3'.
 	executionBuilder := GtGemStoneSnippetRemoteExecutionBuilder new 
 		localBindings: GtSharedVariablesBindings new;
-		classSlotNames: #(a);
+		instanceVariableNames: #(a);
 		sourceString: source.
 	
 	remoteBindings := executionBuilder extractRemoteBindings.
@@ -1114,7 +1114,7 @@ GtGemStoneSnippetRemoteExecutionBuilderExamples >> expressionWithGlobal_writeGlo
 	source := 'a := 3'.
 	executionBuilder := GtGemStoneSnippetRemoteExecutionBuilder new 
 		localBindings: GtSharedVariablesBindings new;
-		classSlotNames: #(a);
+		instanceVariableNames: #(a);
 		sourceString: source.
 	
 	remoteBindings := executionBuilder extractRemoteBindings.
@@ -1195,7 +1195,7 @@ GtGemStoneSnippetRemoteExecutionBuilderExamples >> expressionWithGlobal_writeGlo
 	source := 'a := 3'.
 	executionBuilder := GtGemStoneSnippetRemoteExecutionBuilder new 
 		localBindings: GtLocalVariablesBindings new;
-		classSlotNames: #(a);
+		instanceVariableNames: #(a);
 		sourceString: source.
 	
 	remoteBindings := executionBuilder extractRemoteBindings.