diff --git a/json_rpc/clients/httpclient.nim b/json_rpc/clients/httpclient.nim
index cf4eedd..2c5b7d2 100644
--- a/json_rpc/clients/httpclient.nim
+++ b/json_rpc/clients/httpclient.nim
@@ -15,10 +15,10 @@ type
     options: HttpClientOptions
 
 const
-  MaxHttpHeadersSize = 8192       # maximum size of HTTP headers in octets
-  MaxHttpRequestSize = 128 * 1024 # maximum size of HTTP body in octets
-  HttpHeadersTimeout = 120000     # timeout for receiving headers (120 sec)
-  HttpBodyTimeout = 12000         # timeout for receiving body (12 sec)
+  MaxHttpHeadersSize = 8192        # maximum size of HTTP headers in octets
+  MaxHttpRequestSize = 128 * 1024  # maximum size of HTTP body in octets
+  HttpHeadersTimeout = 120.seconds # timeout for receiving headers (120 sec)
+  HttpBodyTimeout = 12.seconds     # timeout for receiving body (12 sec)
   HeadersMark = @[byte(0x0D), byte(0x0A), byte(0x0D), byte(0x0A)]
 
 proc sendRequest(transp: StreamTransport,
diff --git a/json_rpc/servers/httpserver.nim b/json_rpc/servers/httpserver.nim
index 7b01d95..2dfaa34 100644
--- a/json_rpc/servers/httpserver.nim
+++ b/json_rpc/servers/httpserver.nim
@@ -6,10 +6,10 @@ logScope:
   topic = "JSONRPC-HTTP-SERVER"
 
 const
-  MaxHttpHeadersSize = 8192       # maximum size of HTTP headers in octets
-  MaxHttpRequestSize = 128 * 1024 # maximum size of HTTP body in octets
-  HttpHeadersTimeout = 120000     # timeout for receiving headers (120 sec)
-  HttpBodyTimeout = 12000         # timeout for receiving body (12 sec)
+  MaxHttpHeadersSize = 8192        # maximum size of HTTP headers in octets
+  MaxHttpRequestSize = 128 * 1024  # maximum size of HTTP body in octets
+  HttpHeadersTimeout = 120.seconds # timeout for receiving headers (120 sec)
+  HttpBodyTimeout = 12.seconds     # timeout for receiving body (12 sec)
   HeadersMark = @[byte(0x0D), byte(0x0A), byte(0x0D), byte(0x0A)]
 
 type
@@ -231,13 +231,13 @@ proc addStreamServer*(server: RpcHttpServer, address: string) =
 
   # Attempt to resolve `address` for IPv4 address space.
   try:
-    tas4 = resolveTAddress(address, IpAddressFamily.IPv4)
+    tas4 = resolveTAddress(address, AddressFamily.IPv4)
   except:
     discard
 
   # Attempt to resolve `address` for IPv6 address space.
   try:
-    tas6 = resolveTAddress(address, IpAddressFamily.IPv6)
+    tas6 = resolveTAddress(address, AddressFamily.IPv6)
   except:
     discard
 
@@ -264,13 +264,13 @@ proc addStreamServer*(server: RpcHttpServer, address: string, port: Port) =
 
   # Attempt to resolve `address` for IPv4 address space.
   try:
-    tas4 = resolveTAddress(address, port, IpAddressFamily.IPv4)
+    tas4 = resolveTAddress(address, port, AddressFamily.IPv4)
   except:
     discard
 
   # Attempt to resolve `address` for IPv6 address space.
   try:
-    tas6 = resolveTAddress(address, port, IpAddressFamily.IPv6)
+    tas6 = resolveTAddress(address, port, AddressFamily.IPv6)
   except:
     discard
 
diff --git a/json_rpc/servers/socketserver.nim b/json_rpc/servers/socketserver.nim
index 65869a1..1151205 100644
--- a/json_rpc/servers/socketserver.nim
+++ b/json_rpc/servers/socketserver.nim
@@ -47,7 +47,7 @@ proc addStreamServers*(server: RpcSocketServer, addresses: openarray[TransportAd
     server.addStreamServer(item)
 
 proc addStreamServer*(server: RpcSocketServer, address: string) =
-  ## Create new server and assign it to addresses ``addresses``.  
+  ## Create new server and assign it to addresses ``addresses``.
   var
     tas4: seq[TransportAddress]
     tas6: seq[TransportAddress]
@@ -55,13 +55,13 @@ proc addStreamServer*(server: RpcSocketServer, address: string) =
 
   # Attempt to resolve `address` for IPv4 address space.
   try:
-    tas4 = resolveTAddress(address, IpAddressFamily.IPv4)
+    tas4 = resolveTAddress(address, AddressFamily.IPv4)
   except:
     discard
 
   # Attempt to resolve `address` for IPv6 address space.
   try:
-    tas6 = resolveTAddress(address, IpAddressFamily.IPv6)
+    tas6 = resolveTAddress(address, AddressFamily.IPv6)
   except:
     discard
 
@@ -88,13 +88,13 @@ proc addStreamServer*(server: RpcSocketServer, address: string, port: Port) =
 
   # Attempt to resolve `address` for IPv4 address space.
   try:
-    tas4 = resolveTAddress(address, port, IpAddressFamily.IPv4)
+    tas4 = resolveTAddress(address, port, AddressFamily.IPv4)
   except:
     discard
 
   # Attempt to resolve `address` for IPv6 address space.
   try:
-    tas6 = resolveTAddress(address, port, IpAddressFamily.IPv6)
+    tas6 = resolveTAddress(address, port, AddressFamily.IPv6)
   except:
     discard
 
@@ -118,13 +118,13 @@ proc addStreamServer*(server: RpcSocketServer, address: string, port: Port) =
 proc newRpcSocketServer*: RpcSocketServer =
   RpcSocketServer(router: newRpcRouter(), servers: @[])
 
-proc newRpcSocketServer*(addresses: openarray[TransportAddress]): RpcSocketServer = 
+proc newRpcSocketServer*(addresses: openarray[TransportAddress]): RpcSocketServer =
   ## Create new server and assign it to addresses ``addresses``.
   result = newRpcSocketServer()
   result.addStreamServers(addresses)
 
 proc newRpcSocketServer*(addresses: openarray[string]): RpcSocketServer =
-  ## Create new server and assign it to addresses ``addresses``.  
+  ## Create new server and assign it to addresses ``addresses``.
   result = newRpcSocketServer()
   result.addStreamServers(addresses)