Added 'client' and 'server' prefixes