Making the client namespace consistent