--- a/ImageReader.st	Sat Feb 13 21:23:57 2016 +0100
+++ b/ImageReader.st	Sun Feb 14 00:14:52 2016 +0100
@@ -11,6 +11,8 @@
 "
 "{ Package: 'stx:libview' }"
 
+"{ NameSpace: Smalltalk }"
+
 Object subclass:#ImageReader
 	instanceVariableNames:'width height data byteOrder inStream outStream photometric
 		samplesPerPixel bitsPerSample colorMap mask maskPixel
@@ -1904,13 +1906,13 @@
 readLong
     "return the next 4-byte long, honoring the byte-order"
 
-    ^ inStream nextLongMSB:(byteOrder ~~ #lsb)
+    ^ inStream nextInt32MSB:(byteOrder ~~ #lsb)
 !
 
 readShort
     "return the next 2-byte short, honoring the byte-order"
 
-    ^ inStream nextUnsignedShortMSB:(byteOrder ~~ #lsb)
+    ^ inStream nextUnsignedInt16MSB:(byteOrder ~~ #lsb)
 !
 
 readShortLong
@@ -1934,19 +1936,19 @@
 readUnsignedLong
     "return the next 4-byte long, honoring the byte-order"
 
-    ^ inStream nextUnsignedLongMSB:(byteOrder ~~ #lsb)
+    ^ inStream nextUnsignedInt32MSB:(byteOrder ~~ #lsb)
 !
 
 writeLong:anInteger
     "write a 4-byte long, honoring the byte-order."
 
-    outStream nextPutLong:anInteger MSB:(byteOrder ~~ #lsb)
+    outStream nextPutInt32:anInteger MSB:(byteOrder ~~ #lsb)
 !
 
 writeShort:anInteger
     "write a 2-byte short, honoring the byte-order."
 
-    outStream nextPutShort:anInteger MSB:(byteOrder ~~ #lsb)
+    outStream nextPutInt16:anInteger MSB:(byteOrder ~~ #lsb)
 ! !
 
 !ImageReader methodsFor:'image reading'!
@@ -2117,3 +2119,4 @@
 version_CVS
     ^ '$Header$'
 ! !
+