Better names for demo server and client programs