--- a/JavaField.st	Thu Oct 27 13:50:38 2016 +0200
+++ b/JavaField.st	Thu Oct 27 13:50:52 2016 +0200
@@ -20,6 +20,8 @@
 "
 "{ Package: 'stx:libjava' }"
 
+"{ NameSpace: Smalltalk }"
+
 Object subclass:#JavaField
 	instanceVariableNames:'accessFlags class name descriptor signature index constantValue
 		annotations'
@@ -186,9 +188,9 @@
 index
     index isNil ifTrue:[
         self isStatic ifTrue:[
-            index := class class instVarOffsetOf:name
+            index := class class instVarIndexFor:name
         ] ifFalse:[
-            index := class instVarOffsetOf:name
+            index := class instVarIndexFor:name
         ].
     ].
     ^ index
@@ -366,11 +368,11 @@
 !JavaField class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libjava/JavaField.st,v 1.25 2015-03-20 12:08:00 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/JavaField.st,v 1.25 2015-03-20 12:08:00 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_HG
@@ -379,7 +381,7 @@
 !
 
 version_SVN
-    ^ 'Id'
+    ^ '$Id$'
 ! !