diff --git a/src/libraries/OS-Independent/System/Socket/Ipv4.dcl b/src/libraries/OS-Independent/System/Socket/Ipv4.dcl
index 9f4d9b3bd49594d5b6177dae835cc07c4eafbb7b..23a622577abfceb9dad270607a674e08241747ba 100644
--- a/src/libraries/OS-Independent/System/Socket/Ipv4.dcl
+++ b/src/libraries/OS-Independent/System/Socket/Ipv4.dcl
@@ -5,9 +5,9 @@ from Network.IP import :: IPAddress
 from StdMaybe import :: Maybe
 from System.Socket import class SocketAddress
 
-:: SaInet =
+:: Ipv4SocketAddress =
 	{ sin_port :: !Int
 	, sin_addr :: !Maybe IPAddress
 	}
-instance SocketAddress SaInet
-instance toString SaInet
+instance SocketAddress Ipv4SocketAddress
+instance toString Ipv4SocketAddress
diff --git a/src/libraries/OS-Independent/System/Socket/Ipv4.icl b/src/libraries/OS-Independent/System/Socket/Ipv4.icl
index e2483fa9e6a651d5c210089d11cfbd5cec65246c..70876ec6f5491b85475356fc24ec9d24262e8cac 100644
--- a/src/libraries/OS-Independent/System/Socket/Ipv4.icl
+++ b/src/libraries/OS-Independent/System/Socket/Ipv4.icl
@@ -7,7 +7,7 @@ import System.Socket
 import System._Pointer
 import Text.GenPrint
 
-instance SocketAddress SaInet where
+instance SocketAddress Ipv4SocketAddress where
 	sa_serialize sa p w
 		# p = writeInt2 p 0 (sa_domain sa)
 		# p = writeInt2 p 2 (hostToNetworkByteOrderShort sa.sin_port)
@@ -20,5 +20,5 @@ instance SocketAddress SaInet where
 	sa_null = {sin_port=0, sin_addr=Nothing}
 
 gPrint{|IPAddress|} a s = gPrint{|*|} (toString a) s
-derive gPrint SaInet, Maybe
-instance toString SaInet where toString s = printToString s
+derive gPrint Ipv4SocketAddress, Maybe
+instance toString Ipv4SocketAddress where toString s = printToString s
diff --git a/src/libraries/OS-Independent/System/Socket/Ipv6.dcl b/src/libraries/OS-Independent/System/Socket/Ipv6.dcl
index eab264ba0e184a45745e2854f21542a80964a871..ea16f6f13807b49d417943db536b05e2ae72bfda 100644
--- a/src/libraries/OS-Independent/System/Socket/Ipv6.dcl
+++ b/src/libraries/OS-Independent/System/Socket/Ipv6.dcl
@@ -5,11 +5,11 @@ from Network.IP import :: IPAddress
 from StdMaybe import :: Maybe
 from System.Socket import class SocketAddress
 
-:: SaInet6 =
+:: Ipv6SocketAddress =
 	{ sin6_port     :: !Int
 	, sin6_flowinfo :: !Int
 	, sin6_addr     :: !Maybe String
 	, sin6_scope_id :: !Int
 	}
-instance SocketAddress SaInet6
-instance toString SaInet6
+instance SocketAddress Ipv6SocketAddress
+instance toString Ipv6SocketAddress
diff --git a/src/libraries/OS-Independent/System/Socket/Ipv6.icl b/src/libraries/OS-Independent/System/Socket/Ipv6.icl
index f4e24c7e144582873ccbfac392cf88d1da8f118c..9d4b19d582e9f1f9e9b56d991f4e23f64da9773b 100644
--- a/src/libraries/OS-Independent/System/Socket/Ipv6.icl
+++ b/src/libraries/OS-Independent/System/Socket/Ipv6.icl
@@ -8,7 +8,7 @@ import System._Pointer
 import Text.GenPrint
 from System._Socket import AF_INET6
 
-instance SocketAddress SaInet6 where
+instance SocketAddress Ipv6SocketAddress where
 	sa_serialize sa p w
 		# p = writeInt2 p 0 (sa_domain sa)
 		# p = writeInt2 p 2 (hostToNetworkByteOrderShort sa.sin6_port)
@@ -28,5 +28,5 @@ instance SocketAddress SaInet6 where
 	sa_domain _ = AF_INET6
 	sa_null = {sin6_port=0,sin6_flowinfo=0,sin6_addr=Nothing,sin6_scope_id=0}
 
-derive gPrint SaInet6, Maybe
-instance toString SaInet6 where toString s = printToString s
+derive gPrint Ipv6SocketAddress, Maybe
+instance toString Ipv6SocketAddress where toString s = printToString s
diff --git a/src/libraries/OS-Posix/System/Socket/Unix.dcl b/src/libraries/OS-Posix/System/Socket/Unix.dcl
index 6f92841652a03d8b1406e90081035127fc2866b7..5c41153015885193f35d9cc4fc355ef63353e14f 100644
--- a/src/libraries/OS-Posix/System/Socket/Unix.dcl
+++ b/src/libraries/OS-Posix/System/Socket/Unix.dcl
@@ -4,8 +4,8 @@ from System.FilePath import :: FilePath(..)
 from StdOverloaded import class toString
 from System.Socket import class SocketAddress
 
-:: SaUnix =
+:: UnixSocketAddress =
 	{ sun_path :: !FilePath
 	}
-instance SocketAddress SaUnix
-instance toString SaUnix
+instance SocketAddress UnixSocketAddress
+instance toString UnixSocketAddress
diff --git a/src/libraries/OS-Posix/System/Socket/Unix.icl b/src/libraries/OS-Posix/System/Socket/Unix.icl
index 15fcf32da81bc19cc572ad4d7d550a1da4012133..a6f89513b6deaddb9a4b631783ecef82efdc08f1 100644
--- a/src/libraries/OS-Posix/System/Socket/Unix.icl
+++ b/src/libraries/OS-Posix/System/Socket/Unix.icl
@@ -7,7 +7,7 @@ import System.Socket
 import System._Pointer
 from System._Socket import AF_UNIX
 
-instance SocketAddress SaUnix where
+instance SocketAddress UnixSocketAddress where
 	sa_serialize sa p w
 		# p = writeInt2 p 0 (sa_domain sa)
 		# p = writeCharArray (p+2) (packString sa.sun_path)
@@ -18,4 +18,4 @@ instance SocketAddress SaUnix where
 	sa_domain _ = AF_UNIX
 	sa_null = {sun_path="/"}
 
-instance toString SaUnix where toString s = s.sun_path
+instance toString UnixSocketAddress where toString s = s.sun_path