Fixed naming fro clients