rename client and server to base names